Mercurial > dwindows

annotate gtk3/dw.c @ 2998:4861e9f49907

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GTK4: Here we go down this rabbit hole again. GTK 4.10 is deprecating tons of functionality with deficient replacement APIs. GtkComboBox is deprecated now suggesting GtkDropDown as a replacement, however GtkDropDown is just a list selection and does not have an editable entryfield version. I haven't completely gone through the changes, but I will attempt to switch to the new APIs where possible to reduce the number of deprecation warnings. This is the first set switching gtk_widget_hide/show() to use gtk_widget_set_visible() instead. This removes about 50 warnings.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 17 May 2023 05:49:25 +0000
parents 8450b87e960c
children a464a74505f7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2 * Dynamic Windows:
1386
fd1de4e9e542 Updated the readme and comments in the source files
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1384
diff changeset
3 * A GTK like cross-platform GUI
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4 * GTK3 forwarder module for portabilty.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5 *
2947
edb4307ac7ce Update copyright date, readme, license and changelog for upcoming release.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2909
diff changeset
6 * (C) 2000-2023 Brian Smith <brian@dbsoft.org>
2751
ee1cfa7d645e Update copyright dates for the new year 2022.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2750
diff changeset
7 * (C) 2003-2022 Mark Hessling <mark@rexx.org>
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8 * (C) 2002 Nickolay V. Shmyrev <shmyrev@yandex.ru>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9 */
2160
07f1366a724c Rename config.h(.in) to dwconfig.h and install it with dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2159
diff changeset
10 #include "dwconfig.h"
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11 #include "dw.h"
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
12 #include <glib/gi18n.h>
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
13 #include <string.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
14 #include <stdlib.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
15 #if !defined(GDK_WINDOWING_WIN32)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
16 # include <sys/utsname.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
17 # include <sys/socket.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
18 # include <sys/un.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
19 # include <sys/mman.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
20 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
21 #include <stdarg.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
22 #include <stdio.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
23 #include <unistd.h>
1001
4ef0e878fe06 Added support for Dynamic Windows style font names for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 998
diff changeset
24 #include <ctype.h>
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
25 #include <errno.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
26 #include <sys/time.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
27 #include <dirent.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
28 #include <sys/stat.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
29 #include <signal.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
30 #include <fcntl.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
31 #include <unistd.h>
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
32 #include <math.h>
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
33 #include <gdk/gdkkeysyms.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
34
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
35
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
36 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
37 #include <webkit2/webkit2.h>
2028
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
38 #if !WEBKIT_CHECK_VERSION(2, 22, 0)
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
39 #include <JavaScriptCore/JavaScript.h>
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
40 #endif
2056
29305f8abae3 GTK3: Fix building with no webkit libraries installed at all.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2053
diff changeset
41 #elif defined(USE_WEBKIT)
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
42 #include <webkit/webkit.h>
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
43 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
44
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
45 #include <gdk-pixbuf/gdk-pixbuf.h>
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
46
2857
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
47 #ifdef __FreeBSD__
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
48 #include <sys/param.h>
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
49 #include <sys/sysctl.h>
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
50 #endif
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
51
1576
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
52 #if !GTK_CHECK_VERSION(3,1,0)
1577
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
53 #error GTK 3.0 is no longer supported, please use 3.2 or later.
1576
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
54 #endif
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
55
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
56 #if __STDC_VERSION__ < 199901L
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
57 # if __GNUC__ >= 2
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
58 # define __func__ __FUNCTION__
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
59 # else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
60 # define __func__ "<unknown>"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
61 # endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
62 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
63
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
64 /* These are used for legacy resource management
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
65 * Starting with Dynamic Windows 3.1 the default
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
66 * compiled in resource management is GResource.
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
67 */
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
68 #ifdef DW_INCLUDE_DEPRECATED_RESOURCES
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
69 #if defined(DW_RESOURCES) && !defined(BUILD_DLL)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
70 extern DWResources _resources;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
71 #endif
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
72 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
73
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
74 /* ff = 255 = 1.0000
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
75 * ee = 238 = 0.9333
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
76 * cc = 204 = 0.8000
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
77 * bb = 187 = 0.7333
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
78 * aa = 170 = 0.6667
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
79 * 77 = 119 = 0.4667
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
80 * 00 = 0 = 0.0000
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
81 */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
82 GdkRGBA _dw_colors[] =
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
83 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
84 { 0.0000, 0.0000, 0.0000, 1.0 }, /* 0 black */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
85 { 0.7333, 0.0000, 0.0000, 1.0 }, /* 1 red */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
86 { 0.0000, 0.7333, 0.0000, 1.0 }, /* 2 green */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
87 { 0.6667, 0.6667, 0.0000, 1.0 }, /* 3 yellow */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
88 { 0.0000, 0.0000, 0.8000, 1.0 }, /* 4 blue */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
89 { 0.7333, 0.0000, 0.7333, 1.0 }, /* 5 magenta */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
90 { 0.0000, 0.7333, 0.7333, 1.0 }, /* 6 cyan */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
91 { 0.7333, 0.7333, 0.7333, 1.0 }, /* 7 white */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
92 { 0.4667, 0.4667, 0.4667, 1.0 }, /* 8 grey */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
93 { 1.0000, 0.0000, 0.0000, 1.0 }, /* 9 bright red */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
94 { 0.0000, 1.0000, 0.0000, 1.0 }, /* 10 bright green */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
95 { 0.9333, 0.9333, 0.0000, 1.0 }, /* 11 bright yellow */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
96 { 0.0000, 0.0000, 1.0000, 1.0 }, /* 12 bright blue */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
97 { 1.0000, 0.0000, 1.0000, 1.0 }, /* 13 bright magenta */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
98 { 0.0000, 0.9333, 0.9333, 1.0 }, /* 14 bright cyan */
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
99 { 1.0000, 1.0000, 1.0000, 1.0 }, /* 15 bright white */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
100 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
101
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
102 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
103 * List those icons that have transparency first
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
104 */
1258
3df86772b625 Updated the list of supported image formats for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1245
diff changeset
105 #define NUM_EXTS 9
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
106 char *_dw_image_exts[NUM_EXTS] =
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
107 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
108 ".xpm",
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
109 ".png",
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
110 ".ico",
1258
3df86772b625 Updated the list of supported image formats for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1245
diff changeset
111 ".icns",
3df86772b625 Updated the list of supported image formats for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1245
diff changeset
112 ".gif",
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
113 ".jpg",
1258
3df86772b625 Updated the list of supported image formats for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1245
diff changeset
114 ".jpeg",
3df86772b625 Updated the list of supported image formats for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1245
diff changeset
115 ".tiff",
3df86772b625 Updated the list of supported image formats for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1245
diff changeset
116 ".bmp"
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
117 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
118
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
119 #ifndef max
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
120 # define max(a,b) (((a) > (b)) ? (a) : (b))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
121 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
122
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
123 #ifndef min
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
124 # define min(a,b) (((a) < (b)) ? (a) : (b))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
125 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
126
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
127 static pthread_key_t _dw_fg_color_key;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
128 static pthread_key_t _dw_bg_color_key;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
129 static pthread_key_t _dw_mutex_key;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
130
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
131 static GList *_dw_dirty_list = NULL;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
132
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
133 static GtkWidget *_dw_popup = NULL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
134
1597
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
135 static int _dw_ignore_click = 0, _dw_ignore_expand = 0;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
136 static pthread_t _dw_thread = (pthread_t)-1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
137
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
138 void (*_dw_gdk_threads_init)(void) = NULL;
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
139 void (*_dw_gdk_threads_enter)(void) = NULL;
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
140 void (*_dw_gdk_threads_leave)(void) = NULL;
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
141
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
142 #define DW_MUTEX_LOCK { if(pthread_self() != _dw_thread && !pthread_getspecific(_dw_mutex_key)) { _dw_gdk_threads_enter(); pthread_setspecific(_dw_mutex_key, (void *)&_dw_locked_by_me); _dw_locked_by_me = TRUE; } }
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
143 #define DW_MUTEX_UNLOCK { if(pthread_self() != _dw_thread && _dw_locked_by_me == TRUE) { _dw_gdk_threads_leave(); pthread_setspecific(_dw_mutex_key, NULL); _dw_locked_by_me = FALSE; } }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
144
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
145 #define DEFAULT_SIZE_WIDTH 12
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
146 #define DEFAULT_SIZE_HEIGHT 6
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
147 #define DEFAULT_TITLEBAR_HEIGHT 22
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
148
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
149 #define _DW_TREE_TYPE_CONTAINER 1
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
150 #define _DW_TREE_TYPE_TREE 2
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
151 #define _DW_TREE_TYPE_LISTBOX 3
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
152 #define _DW_TREE_TYPE_COMBOBOX 4
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
153
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
154 /* Signal forwarder prototypes */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
155 static gint _dw_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
156 static gint _dw_button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
157 static gint _dw_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
158 static gint _dw_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
159 static gint _dw_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
160 static gint _dw_generic_event(GtkWidget *widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
161 static gint _dw_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
162 static gint _dw_activate_event(GtkWidget *widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
163 static gint _dw_container_enter_event(GtkWidget *widget, GdkEventAny *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
164 static gint _dw_combobox_select_event(GtkWidget *widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
165 static gint _dw_expose_event(GtkWidget *widget, cairo_t *cr, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
166 static gint _dw_set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
167 static gint _dw_tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
168 static gint _dw_value_changed_event(GtkWidget *widget, gpointer user_data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
169 static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
170 static gint _dw_tree_expand_event(GtkTreeView *treeview, GtkTreeIter *arg1, GtkTreePath *arg2, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
171 static gint _dw_switch_page_event(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
172 static gint _dw_column_click_event(GtkWidget *widget, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
173 static void _dw_html_result_event(GObject *object, GAsyncResult *result, gpointer script_data);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
174 #ifdef USE_WEBKIT
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
175 #ifdef USE_WEBKIT2
2986
0c5abc2ad5c5 GTK3: Fix building without WebKit2GTK development installed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2980
diff changeset
176 static void _dw_html_message_event(WebKitUserContentManager *manager, WebKitJavascriptResult *result, gpointer *data);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
177 static void _dw_html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
178 #else
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
179 static void _dw_html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
180 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
181 #endif
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
182 static void _dw_signal_disconnect(gpointer data, GClosure *closure);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
183
874
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
184 GObject *_DWObject = NULL;
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
185 #if GLIB_CHECK_VERSION(2,28,0)
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
186 GApplication *_DWApp = NULL;
2211
9395c1efa98b GTK: _dw_app_id[] is not used with glib prior to 2.28 so move it into #ifdef
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2210
diff changeset
187 static char _dw_app_id[_DW_APP_ID_SIZE+1] = { 0 };
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
188 #endif
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
189 char *_DWDefaultFont = NULL;
1384
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
190 static char _dw_share_path[PATH_MAX+1] = { 0 };
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
191 static int _dw_render_safe_mode = DW_FEATURE_UNSUPPORTED;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
192
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
193 /* Return TRUE if it is safe to draw on the window handle.
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
194 * Either we are in unsafe mode, or we are in an EXPOSE
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
195 * event for the requested render window handle.
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
196 */
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
197 int _dw_render_safe_check(GtkWidget *handle)
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
198 {
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
199 if(_dw_render_safe_mode == DW_FEATURE_DISABLED ||
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
200 (handle && g_object_get_data(G_OBJECT(handle), "_dw_expose")))
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
201 return TRUE;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
202 return FALSE;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
203 }
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
204
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
205 int _dw_is_render(GtkWidget *handle)
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
206 {
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
207 if(GTK_IS_DRAWING_AREA(handle))
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
208 return TRUE;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
209 return FALSE;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
210 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
211
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
212 typedef struct
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
213 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
214 void *func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
215 char name[30];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
216
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
217 } DWSignalList;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
218
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
219 typedef struct
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
220 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
221 HWND window;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
222 void *func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
223 gpointer data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
224 gint cid;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
225 void *intfunc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
226
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
227 } DWSignalHandler;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
228
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
229 /* A list of signal forwarders, to account for parameter differences. */
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
230 static DWSignalList DWSignalTranslate[] = {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
231 { _dw_configure_event, DW_SIGNAL_CONFIGURE },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
232 { _dw_key_press_event, DW_SIGNAL_KEY_PRESS },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
233 { _dw_button_press_event, DW_SIGNAL_BUTTON_PRESS },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
234 { _dw_button_release_event, DW_SIGNAL_BUTTON_RELEASE },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
235 { _dw_motion_notify_event, DW_SIGNAL_MOTION_NOTIFY },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
236 { _dw_delete_event, DW_SIGNAL_DELETE },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
237 { _dw_expose_event, DW_SIGNAL_EXPOSE },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
238 { _dw_activate_event, "activate" },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
239 { _dw_generic_event, DW_SIGNAL_CLICKED },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
240 { _dw_container_enter_event, DW_SIGNAL_ITEM_ENTER },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
241 { _dw_tree_context_event, DW_SIGNAL_ITEM_CONTEXT },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
242 { _dw_combobox_select_event, DW_SIGNAL_LIST_SELECT },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
243 { _dw_tree_select_event, DW_SIGNAL_ITEM_SELECT },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
244 { _dw_set_focus_event, DW_SIGNAL_SET_FOCUS },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
245 { _dw_value_changed_event, DW_SIGNAL_VALUE_CHANGED },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
246 { _dw_switch_page_event, DW_SIGNAL_SWITCH_PAGE },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
247 { _dw_column_click_event, DW_SIGNAL_COLUMN_CLICK },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
248 { _dw_tree_expand_event, DW_SIGNAL_TREE_EXPAND },
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
249 #ifdef USE_WEBKIT
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
250 { _dw_html_changed_event, DW_SIGNAL_HTML_CHANGED },
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
251 #else
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
252 { _dw_generic_event, DW_SIGNAL_HTML_CHANGED },
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
253 #endif
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
254 { _dw_html_result_event, DW_SIGNAL_HTML_RESULT },
2986
0c5abc2ad5c5 GTK3: Fix building without WebKit2GTK development installed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2980
diff changeset
255 #ifdef USE_WEBKIT2
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
256 { _dw_html_message_event, DW_SIGNAL_HTML_MESSAGE },
2986
0c5abc2ad5c5 GTK3: Fix building without WebKit2GTK development installed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2980
diff changeset
257 #endif
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
258 { NULL, "" }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
259 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
260
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
261 /* Alignment flags */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
262 #define DW_CENTER 0.5f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
263 #define DW_LEFT 0.0f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
264 #define DW_RIGHT 1.0f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
265 #define DW_TOP 0.0f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
266 #define DW_BOTTOM 1.0f
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
267
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
268 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
269 /* MDI Support Code */
1918
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
270 static void _dw_override_color(GtkWidget *widget, const char *element, GdkRGBA *color);
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
271 static void _dw_override_font(GtkWidget *widget, const char *font);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
272 #define GTK_MDI(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_mdi_get_type (), GtkMdi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
273 #define GTK_MDI_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_mdi_get_type (), GtkMdiClass)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
274 #define GTK_IS_MDI(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_mdi_get_type ())
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
275
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
276 typedef struct _GtkMdi GtkMdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
277 typedef struct _GtkMdiClass GtkMdiClass;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
278 typedef struct _GtkMdiDragInfo GtkMdiDragInfo;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
279 typedef enum _GtkMdiChildState GtkMdiChildState;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
280
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
281 enum _GtkMdiChildState
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
282 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
283 CHILD_NORMAL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
284 CHILD_MAXIMIZED,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
285 CHILD_ICONIFIED
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
286 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
287
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
288 struct _GtkMdi
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
289 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
290 GtkContainer container;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
291 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
292
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
293 GdkPoint drag_start;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
294 gint drag_button;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
295 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
296
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
297 struct _GtkMdiClass
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
298 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
299 GtkContainerClass parent_class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
300
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
301 void (*mdi) (GtkMdi * mdi);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
302 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
303
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
304 #include "gtk/maximize.xpm"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
305 #include "gtk/minimize.xpm"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
306 #include "gtk/kill.xpm"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
307
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
308 #define GTK_MDI_BACKGROUND "Grey70"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
309 #define GTK_MDI_LABEL_BACKGROUND "RoyalBlue4"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
310 #define GTK_MDI_LABEL_FOREGROUND "white"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
311 #define GTK_MDI_DEFAULT_WIDTH 0
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
312 #define GTK_MDI_DEFAULT_HEIGHT 0
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
313 #define GTK_MDI_MIN_HEIGHT 22
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
314 #define GTK_MDI_MIN_WIDTH 55
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
315
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
316 typedef struct _GtkMdiChild GtkMdiChild;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
317
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
318 struct _GtkMdiChild
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
319 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
320 GtkWidget *widget;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
321
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
322 GtkWidget *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
323 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
324
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
325 gint x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
326 gint y;
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
327 gint width;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
328 gint height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
329
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
330 GtkMdiChildState state;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
331 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
332
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
333 static void gtk_mdi_class_init(GtkMdiClass *klass);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
334 static void gtk_mdi_init(GtkMdi *mdi);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
335
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
336 static void gtk_mdi_realize(GtkWidget *widget);
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
337 static void gtk_mdi_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
338 static gboolean gtk_mdi_draw(GtkWidget *widget, cairo_t *cr);
836
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
339 static void gtk_mdi_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint *natural_width);
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
340 static void gtk_mdi_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *natural_height);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
341
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
342 /* Callbacks */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
343 static gboolean _dw_mdi_move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
344 static gboolean _dw_mdi_resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
345 static gboolean _dw_mdi_iconify_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
346 static gboolean _dw_mdi_maximize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
347 static gboolean _dw_mdi_kill_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
348
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
349 static void gtk_mdi_add(GtkContainer *container, GtkWidget *widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
350 static void gtk_mdi_remove_true(GtkContainer *container, GtkWidget *widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
351 static void gtk_mdi_forall(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
352
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
353 static GtkMdiChild *_dw_mdi_get_child(GtkMdi *mdi, GtkWidget * widget);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
354
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
355 static GType gtk_mdi_get_type(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
356 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
357 static GType mdi_type = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
358
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
359 if (!mdi_type)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
360 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
361
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
362 static const GTypeInfo mdi_info =
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
363 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
364 sizeof (GtkMdiClass),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
365 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
366 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
367 (GClassInitFunc) gtk_mdi_class_init,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
368 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
369 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
370 sizeof (GtkMdi),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
371 0,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
372 (GInstanceInitFunc) gtk_mdi_init,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
373 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
374
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
375 mdi_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkMdi", &mdi_info, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
376 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
377 return mdi_type;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
378 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
379
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
380 /* Local data */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
381 static GtkWidgetClass *parent_class = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
382
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
383 static void gtk_mdi_class_init(GtkMdiClass *class)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
384 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
385 GtkWidgetClass *widget_class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
386 GtkContainerClass *container_class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
387
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
388 widget_class = (GtkWidgetClass *) class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
389 container_class = (GtkContainerClass *) class;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
390
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
391 parent_class = g_type_class_ref (GTK_TYPE_CONTAINER);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
392
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
393 widget_class->realize = gtk_mdi_realize;
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
394 widget_class->draw = gtk_mdi_draw;
836
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
395 widget_class->get_preferred_height = gtk_mdi_get_preferred_height;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
396 widget_class->get_preferred_width = gtk_mdi_get_preferred_width;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
397 widget_class->size_allocate = gtk_mdi_size_allocate;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
398
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
399 container_class->add = gtk_mdi_add;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
400 container_class->remove = gtk_mdi_remove_true;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
401 container_class->forall = gtk_mdi_forall;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
402 class->mdi = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
403 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
404
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
405 static void gtk_mdi_init(GtkMdi *mdi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
406 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
407 mdi->drag_button = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
408 mdi->children = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
409 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
410
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
411 static GtkWidget *gtk_mdi_new(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
412 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
413 GtkWidget *mdi;
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
414 GdkRGBA background;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
415
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
416 mdi = GTK_WIDGET (g_object_new (gtk_mdi_get_type (), NULL));
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
417 gdk_rgba_parse (&background, GTK_MDI_BACKGROUND);
1918
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
418 _dw_override_color (mdi, "background-color", &background);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
419
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
420 return mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
421 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
422
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
423 static void gtk_mdi_put(GtkMdi *mdi, GtkWidget *child_widget, gint x, gint y, GtkWidget *label)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
424 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
425 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
426
1577
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
427 GtkWidget *grid;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
428 GtkWidget *button[3];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
429
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
430 GtkWidget *child_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
431 GtkWidget *top_event_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
432 GtkWidget *bottom_event_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
433 GtkWidget *child_widget_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
434 GtkWidget *image;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
435
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
436 GdkRGBA color;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
437 gint i, j;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
438 GdkCursor *cursor;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
439 GdkPixbuf *pixbuf;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
440
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
441 child_box = gtk_event_box_new ();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
442 child_widget_box = gtk_event_box_new ();
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
443 #if GTK_CHECK_VERSION(3,12,0)
1912
5035750bcc65 Fix some deprecation warnings in recent GTK3 versions...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1900
diff changeset
444 gtk_widget_set_margin_start(child_widget_box, 2);
1921
bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1919
diff changeset
445 #else
bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1919
diff changeset
446 gtk_widget_set_margin_left(child_widget_box, 2);
bc70b3e9dbb1 Fix building with MDI on earlier than GTK 3.12.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1919
diff changeset
447 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
448 top_event_box = gtk_event_box_new ();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
449 bottom_event_box = gtk_event_box_new ();
1577
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
450 grid = gtk_grid_new ();
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
451 gtk_grid_set_row_spacing(GTK_GRID(grid), 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
452 gtk_grid_set_column_spacing(GTK_GRID(grid), 1);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
453
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
454 for (i = 0; i < 3; i++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
455 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
456 button[i] = gtk_event_box_new ();
1577
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
457 gtk_widget_set_events (button[i], GDK_BUTTON_PRESS_MASK);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
458 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
459
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
460 gdk_rgba_parse (&color, GTK_MDI_LABEL_BACKGROUND);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
461
1918
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
462 _dw_override_color (top_event_box, "background-color", &color);
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
463 _dw_override_color (bottom_event_box, "background-color", &color);
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
464 _dw_override_color (child_box, "background-color", &color);
1894
ed377fd16360 Fix some warnings reported by clang on FreeBSD in the GTK modules.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1892
diff changeset
465 for (j = 0; j < 3; j++)
ed377fd16360 Fix some warnings reported by clang on FreeBSD in the GTK modules.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1892
diff changeset
466 {
1918
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
467 _dw_override_color (button[j], "background-color", &color);
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
468 }
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
469 gdk_rgba_parse (&color, GTK_MDI_LABEL_FOREGROUND);
1918
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
470 _dw_override_color (label, "color", &color);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
471 #if GTK_CHECK_VERSION(3,16,0)
1918
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
472 gtk_label_set_xalign(GTK_LABEL(label), 0.0f);
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
473 gtk_label_set_yalign(GTK_LABEL(label), 0.5f);
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
474 #else
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
475 gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
1814a6577a5f Import the same changes into the GTK3 MDI code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1917
diff changeset
476 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
477
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
478 gtk_container_add (GTK_CONTAINER (top_event_box), label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
479 gtk_container_add (GTK_CONTAINER (child_widget_box), child_widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
480 gtk_widget_set_size_request (bottom_event_box, 2, 2);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
481
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
482
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
483 pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **)minimize_xpm);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
484 image = gtk_image_new_from_pixbuf(pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
485 gtk_widget_show(image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
486 gtk_container_add (GTK_CONTAINER (button[0]), image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
487 pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **) maximize_xpm);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
488 image = gtk_image_new_from_pixbuf(pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
489 gtk_widget_show(image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
490 gtk_container_add (GTK_CONTAINER (button[1]), image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
491 pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **) kill_xpm);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
492 image = gtk_image_new_from_pixbuf(pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
493 gtk_widget_show(image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
494 gtk_container_add (GTK_CONTAINER (button[2]), image);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
495
1577
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
496
1579
245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1578
diff changeset
497 /* Titlebar and buttons */
245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1578
diff changeset
498 gtk_widget_set_hexpand(top_event_box, TRUE);
1577
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
499 gtk_grid_attach (GTK_GRID (grid), top_event_box, 0, 0, 1, 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
500 gtk_grid_attach (GTK_GRID (grid), button[0], 1, 0, 1, 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
501 gtk_grid_attach (GTK_GRID (grid), button[1], 2, 0, 1, 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
502 gtk_grid_attach (GTK_GRID (grid), button[2], 3, 0, 1, 1);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
503
1579
245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1578
diff changeset
504 /* Window contents */
245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1578
diff changeset
505 gtk_widget_set_hexpand(child_widget_box, TRUE);
245e6bf51317 Fix GTK3 MDI titlebar buttons expanding... or really the label not expanding.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1578
diff changeset
506 gtk_widget_set_vexpand(child_widget_box, TRUE);
1577
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
507 gtk_grid_attach (GTK_GRID (grid), child_widget_box, 0, 1, 4, 1);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
508
1577
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
509 /* Bottom border */
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
510 gtk_grid_attach (GTK_GRID (grid), bottom_event_box, 4, 2, 1, 1);
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
511
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
512 gtk_container_add (GTK_CONTAINER (child_box), grid);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
513
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
514 child = g_new (GtkMdiChild, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
515 child->widget = child_box;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
516 child->x = x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
517 child->y = y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
518 child->width = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
519 child->height = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
520 child->child = child_widget;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
521 child->mdi = mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
522 child->state = CHILD_NORMAL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
523
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
524 gtk_widget_set_parent (child_box, GTK_WIDGET (mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
525 mdi->children = g_list_append (mdi->children, child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
526
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
527 gtk_widget_show (child_box);
1577
fdafbc654e9d Switch to using GtkGrid instead of GtkTable in the MDI code for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1576
diff changeset
528 gtk_widget_show (grid);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
529 gtk_widget_show (top_event_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
530 gtk_widget_show (bottom_event_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
531 gtk_widget_show (child_widget_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
532 for (i = 0; i < 3; i++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
533 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
534 gtk_widget_show (button[i]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
535 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
536
1912
5035750bcc65 Fix some deprecation warnings in recent GTK3 versions...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1900
diff changeset
537 cursor = gdk_cursor_new_for_display (gdk_display_get_default(), GDK_HAND1);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
538 gtk_widget_realize (top_event_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
539 gdk_window_set_cursor (gtk_widget_get_window(top_event_box), cursor);
1912
5035750bcc65 Fix some deprecation warnings in recent GTK3 versions...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1900
diff changeset
540 cursor = gdk_cursor_new_for_display (gdk_display_get_default(), GDK_BOTTOM_RIGHT_CORNER);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
541 gtk_widget_realize (bottom_event_box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
542 gdk_window_set_cursor (gtk_widget_get_window(bottom_event_box), cursor);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
543
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
544 g_signal_connect (G_OBJECT (top_event_box), "event",
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
545 G_CALLBACK (_dw_mdi_move_child_callback),
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
546 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
547 g_signal_connect (G_OBJECT (bottom_event_box), "event",
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
548 G_CALLBACK (_dw_mdi_resize_child_callback),
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
549 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
550 g_signal_connect (G_OBJECT (button[0]), "button_press_event",
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
551 G_CALLBACK (_dw_mdi_iconify_child_callback),
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
552 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
553 g_signal_connect (G_OBJECT (button[1]), "button_press_event",
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
554 G_CALLBACK (_dw_mdi_maximize_child_callback),
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
555 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
556 g_signal_connect (G_OBJECT (button[2]), "button_press_event",
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
557 G_CALLBACK (_dw_mdi_kill_child_callback),
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
558 child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
559 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
560
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
561 static void gtk_mdi_move(GtkMdi *mdi, GtkWidget *widget, gint x, gint y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
562 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
563 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
564
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
565 g_return_if_fail(GTK_IS_MDI(mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
566 g_return_if_fail(GTK_IS_WIDGET(widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
567
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
568 child = _dw_mdi_get_child(mdi, widget);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
569 g_return_if_fail(child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
570
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
571 child->x = x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
572 child->y = y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
573 if (gtk_widget_get_visible(widget) && gtk_widget_get_visible(GTK_WIDGET(mdi)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
574 gtk_widget_queue_resize(GTK_WIDGET(widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
575 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
576
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
577 static void gtk_mdi_get_pos(GtkMdi *mdi, GtkWidget *widget, gint *x, gint *y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
578 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
579 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
580
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
581 g_return_if_fail(GTK_IS_MDI (mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
582 g_return_if_fail(GTK_IS_WIDGET (widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
583
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
584 child = _dw_mdi_get_child(mdi, widget);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
585 g_return_if_fail(child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
586
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
587 *x = child->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
588 *y = child->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
589 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
590
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
591 static void gtk_mdi_set_state(GtkMdi *mdi, GtkWidget *widget, GtkMdiChildState state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
592 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
593 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
594
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
595 g_return_if_fail (GTK_IS_MDI (mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
596 g_return_if_fail (GTK_IS_WIDGET (widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
597
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
598 child = _dw_mdi_get_child (mdi, widget);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
599 g_return_if_fail (child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
600
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
601 child->state = state;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
602 if (gtk_widget_get_visible(child->widget) && gtk_widget_get_visible(GTK_WIDGET(mdi)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
603 gtk_widget_queue_resize(GTK_WIDGET(child->widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
604 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
605
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
606 static void gtk_mdi_remove(GtkMdi *mdi, GtkWidget *widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
607 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
608 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
609
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
610 g_return_if_fail (GTK_IS_MDI (mdi));
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
611 child = _dw_mdi_get_child (mdi, widget);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
612 g_return_if_fail (child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
613 gtk_mdi_remove_true (GTK_CONTAINER (mdi), child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
614 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
615
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
616 static void gtk_mdi_realize(GtkWidget *widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
617 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
618 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
619 GdkWindowAttr attributes;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
620 gint attributes_mask;
1185
415c25f87d57 Fix for MDI support for GTK3. Haven't tested completely...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1177
diff changeset
621 GdkWindow *thiswindow;
1919
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
622 GtkAllocation allocation;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
623
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
624 mdi = GTK_MDI (widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
625
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
626 g_return_if_fail (widget != NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
627 g_return_if_fail (GTK_IS_MDI (mdi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
628
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
629 gtk_widget_set_realized(widget, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
630
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
631 gtk_widget_get_allocation(widget, &allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
632 attributes.x = allocation.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
633 attributes.y = allocation.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
634 attributes.width = allocation.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
635 attributes.height = allocation.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
636 attributes.wclass = GDK_INPUT_OUTPUT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
637 attributes.window_type = GDK_WINDOW_CHILD;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
638 attributes.event_mask = gtk_widget_get_events (widget) |
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
639 GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK |
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
640 GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
641 GDK_POINTER_MOTION_HINT_MASK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
642 attributes.visual = gtk_widget_get_visual (widget);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
643
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
644 attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
1185
415c25f87d57 Fix for MDI support for GTK3. Haven't tested completely...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1177
diff changeset
645 thiswindow = gdk_window_new (gtk_widget_get_parent_window(widget), &attributes, attributes_mask);
415c25f87d57 Fix for MDI support for GTK3. Haven't tested completely...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1177
diff changeset
646 gtk_widget_set_window(widget, thiswindow);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
647
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
648 gdk_window_set_user_data (gtk_widget_get_window(widget), widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
649 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
650
836
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
651 static void gtk_mdi_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint *natural_width)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
652 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
653 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
654 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
655 GList *children;
836
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
656 gint child_minimum_width, child_natural_width;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
657
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
658 mdi = GTK_MDI (widget);
836
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
659 *natural_width = *minimum_width = GTK_MDI_DEFAULT_WIDTH;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
660
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
661 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
662 while(children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
663 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
664 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
665 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
666
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
667 if(gtk_widget_get_visible(child->widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
668 {
836
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
669 gtk_widget_get_preferred_width(child->widget, &child_minimum_width, &child_natural_width);
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
670 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
671 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
672 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
673
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
674 static void gtk_mdi_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *natural_height)
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
675 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
676 GtkMdi *mdi;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
677 GtkMdiChild *child;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
678 GList *children;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
679 gint child_minimum_height, child_natural_height;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
680
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
681 mdi = GTK_MDI (widget);
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
682 *natural_height = *minimum_height = GTK_MDI_DEFAULT_HEIGHT;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
683
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
684 children = mdi->children;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
685 while(children)
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
686 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
687 child = children->data;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
688 children = children->next;
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
689
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
690 if(gtk_widget_get_visible(child->widget))
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
691 {
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
692 gtk_widget_get_preferred_height(child->widget, &child_minimum_height, &child_natural_height);
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
693 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
694 }
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
695 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
696
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
697 static void gtk_mdi_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
698 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
699 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
700 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
701 GtkAllocation child_allocation;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
702 GtkRequisition child_requisition;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
703 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
704
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
705 mdi = GTK_MDI (widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
706
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
707 gtk_widget_set_allocation(widget, allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
708
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
709 if(gtk_widget_get_realized(widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
710 gdk_window_move_resize (gtk_widget_get_window(widget),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
711 allocation->x,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
712 allocation->y,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
713 allocation->width,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
714 allocation->height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
715
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
716
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
717 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
718 while(children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
719 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
720 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
721 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
722
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
723 if(gtk_widget_get_visible(child->widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
724 {
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
725 gtk_widget_get_preferred_size (child->widget, NULL, &child_requisition);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
726 child_allocation.x = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
727 child_allocation.y = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
728 switch (child->state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
729 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
730 case CHILD_NORMAL:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
731 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
732 if ((child->width < 0) && (child->height < 0))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
733 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
734 child_allocation.width = child_requisition.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
735 child_allocation.height = child_requisition.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
736 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
737 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
738 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
739 child_allocation.width = child->width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
740 child_allocation.height = child->height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
741 child->width = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
742 child->height = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
743 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
744 child_allocation.x += child->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
745 child_allocation.y += child->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
746 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
747 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
748 case CHILD_MAXIMIZED:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
749 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
750 if ((child->width < 0) && (child->height < 0))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
751 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
752 child->width = child_requisition.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
753 child->height = child_requisition.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
754 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
755 child_allocation.width = allocation->width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
756 child_allocation.height = allocation->height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
757 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
758 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
759 case CHILD_ICONIFIED:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
760 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
761 if ((child->width < 0) && (child->height < 0))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
762 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
763 child->width = child_requisition.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
764 child->height = child_requisition.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
765 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
766 child_allocation.x += child->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
767 child_allocation.y += child->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
768 child_allocation.width = child_requisition.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
769 child_allocation.height = GTK_MDI_MIN_HEIGHT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
770 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
771 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
772 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
773 gtk_widget_size_allocate (child->widget, &child_allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
774 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
775 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
776 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
777
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
778 static gboolean gtk_mdi_draw(GtkWidget *widget, cairo_t *cr)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
779 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
780 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
781 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
782 GtkMdi *mdi;
1919
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
783 GtkStyleContext *context;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
784
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
785 g_return_val_if_fail (widget != NULL, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
786 g_return_val_if_fail (GTK_IS_MDI (widget), FALSE);
836
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
787 g_return_val_if_fail (cr != NULL, FALSE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
788
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
789 mdi = GTK_MDI (widget);
1919
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
790
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
791 if((context = gtk_widget_get_style_context(widget)))
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
792 {
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
793 GtkAllocation allocation;
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
794
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
795 gtk_widget_get_allocation (widget, &allocation);
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
796 gtk_render_background (context, cr, 0, 0, allocation.x, allocation.y);
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
797 }
78a65391dbcb More GTK3 MDI fixes... remove duplicate code...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1918
diff changeset
798
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
799 for (children = mdi->children; children; children = children->next)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
800 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
801 child = (GtkMdiChild *) children->data;
836
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
802 gtk_container_propagate_draw (GTK_CONTAINER (mdi),
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
803 child->widget,
836
28f9810dfebc More work on getting MDI working again.... still doesn't work right unfortunately.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 835
diff changeset
804 cr);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
805 }
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
806 return FALSE;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
807 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
808
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
809 static void gtk_mdi_add(GtkContainer *container, GtkWidget *widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
810 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
811 GtkWidget *label;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
812 label = gtk_label_new ("");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
813 gtk_mdi_put (GTK_MDI (container), widget, 0, 0, label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
814 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
815
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
816 static void gtk_mdi_remove_true(GtkContainer *container, GtkWidget *widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
817 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
818 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
819 GtkMdiChild *child = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
820 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
821
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
822 mdi = GTK_MDI (container);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
823
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
824 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
825 while (children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
826 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
827 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
828 if (child->widget == widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
829 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
830
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
831 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
832 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
833
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
834 if(child)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
835 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
836 gtk_widget_unparent (child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
837 g_free (child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
838 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
839 mdi->children = g_list_remove_link (mdi->children, children);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
840 g_list_free (children);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
841 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
842
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
843 static void gtk_mdi_forall(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
844 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
845 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
846 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
847 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
848
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
849 g_return_if_fail (callback != NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
850
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
851 mdi = GTK_MDI (container);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
852
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
853 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
854 while (children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
855 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
856 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
857 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
858
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
859 (*callback) (child->widget, callback_data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
860 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
861 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
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 static gboolean _dw_mdi_move_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
864 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
865 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
866 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
867
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
868 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
869 mdi = child->mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
870
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
871 g_return_val_if_fail (GTK_IS_MDI (mdi), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
872 g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
873
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
874
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
875 switch (event->type)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
876 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
877 case GDK_2BUTTON_PRESS:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
878 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
879 gdk_window_raise (gtk_widget_get_window(child->widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
880 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
881 case GDK_BUTTON_PRESS:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
882 if (child->state == CHILD_MAXIMIZED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
883 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
884 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
885 {
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
886 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
887 if (gdk_seat_grab (gdk_event_get_seat(event),
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
888 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
889 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
890 FALSE, NULL, event, NULL, NULL) != GDK_GRAB_SUCCESS)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
891 #else
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
892 if (gdk_device_grab (gdk_event_get_device(event),
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
893 event->button.window,
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
894 GDK_OWNERSHIP_WINDOW,
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
895 FALSE,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
896 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
897 GDK_BUTTON_RELEASE_MASK,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
898 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
899 event->button.time) != GDK_GRAB_SUCCESS)
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
900 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
901 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
902
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
903 mdi->drag_button = event->button.button;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
904
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
905 mdi->drag_start.x = event->button.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
906 mdi->drag_start.y = event->button.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
907 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
908 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
909
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
910 case GDK_BUTTON_RELEASE:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
911 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
912 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
913
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
914 if (mdi->drag_button == event->button.button)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
915 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
916 int x, y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
917
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
918 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
919 gdk_seat_ungrab (gdk_event_get_seat(event));
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
920 #else
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
921 gdk_device_ungrab (gdk_event_get_device(event), event->button.time);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
922 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
923 mdi->drag_button = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
924
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
925 x = event->button.x + child->x - mdi->drag_start.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
926 y = event->button.y + child->y - mdi->drag_start.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
927
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
928 gtk_mdi_move (mdi, child->child, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
929 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
930 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
931
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
932 case GDK_MOTION_NOTIFY:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
933 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
934 int x, y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
935
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
936 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
937 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
938
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
939 gdk_window_get_device_position (gtk_widget_get_window(widget), gdk_event_get_device(event), &x, &y, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
940
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
941
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
942 x = x - mdi->drag_start.x + child->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
943 y = y - mdi->drag_start.y + child->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
944
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
945
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
946 gtk_mdi_move (mdi, child->child, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
947 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
948 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
949
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
950 default:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
951 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
952 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
953
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
954 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
955 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
956
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
957 static gboolean _dw_mdi_resize_child_callback(GtkWidget *widget, GdkEvent *event, gpointer data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
958 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
959 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
960 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
961
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
962 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
963 mdi = child->mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
964
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
965 g_return_val_if_fail (GTK_IS_MDI (mdi), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
966 g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
967
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
968 switch (event->type)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
969 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
970 case GDK_BUTTON_PRESS:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
971 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
972 {
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
973 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
974 if (gdk_seat_grab (gdk_event_get_seat(event),
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
975 event->button.window,
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
976 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
977 FALSE, NULL, event, NULL, NULL) != GDK_GRAB_SUCCESS)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
978 #else
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
979 if (gdk_device_grab (gdk_event_get_device(event),
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
980 event->button.window,
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
981 GDK_OWNERSHIP_WINDOW,
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
982 FALSE,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
983 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
984 GDK_BUTTON_RELEASE_MASK,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
985 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
986 event->button.time) != GDK_GRAB_SUCCESS)
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
987 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
988 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
989
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
990 mdi->drag_button = event->button.button;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
991 if ((child->state == CHILD_MAXIMIZED) || (child->state == CHILD_ICONIFIED))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
992 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
993 GtkAllocation allocation;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
994
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
995 child->state = CHILD_NORMAL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
996 gtk_widget_get_allocation(child->widget, &allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
997 child->x = allocation.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
998 child->y = allocation.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
999 child->width = allocation.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1000 child->height = allocation.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1001 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1002
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1003 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1004 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1005
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1006 case GDK_BUTTON_RELEASE:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1007 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1008 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1009
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1010 if (mdi->drag_button == event->button.button)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1011 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1012 int width, height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1013 GtkAllocation allocation;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1014
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
1015 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
1016 gdk_seat_ungrab (gdk_event_get_seat(event));
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
1017 #else
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
1018 gdk_device_ungrab (gdk_event_get_device(event), event->button.time);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
1019 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1020 mdi->drag_button = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1021
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1022 gtk_widget_get_allocation(widget, &allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1023 width = event->button.x + allocation.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1024 height = event->button.y + allocation.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1025
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1026 width = MAX (width, GTK_MDI_MIN_WIDTH);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1027 height = MAX (height, GTK_MDI_MIN_HEIGHT);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1028
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1029 gtk_widget_set_size_request (child->widget, width, height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1030 gtk_widget_queue_resize (child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1031 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1032 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1033
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1034 case GDK_MOTION_NOTIFY:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1035 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1036 int x, y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1037 int width, height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1038 GtkAllocation allocation;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1039
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1040 if (mdi->drag_button < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1041 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1042
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
1043 gdk_window_get_device_position (gtk_widget_get_window(widget), gdk_event_get_device(event), &x, &y, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1044
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1045 gtk_widget_get_allocation(widget, &allocation);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1046 width = x + allocation.x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1047 height = y + allocation.y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1048
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1049 width = MAX (width, GTK_MDI_MIN_WIDTH);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1050 height = MAX (height, GTK_MDI_MIN_HEIGHT);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1051
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1052 gtk_widget_set_size_request (child->widget, width, height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1053 gtk_widget_queue_resize (child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1054 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1055 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1056
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1057 default:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1058 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1059 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1060
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1061 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1062 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1063
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1064 static gboolean _dw_mdi_iconify_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1065 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1066 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1067 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1068 if(child->state == CHILD_ICONIFIED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1069 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1070 child->state = CHILD_NORMAL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1071 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1072 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1073 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1074 child->state = CHILD_ICONIFIED;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1075 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1076 if(gtk_widget_get_visible(child->widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1077 gtk_widget_queue_resize(GTK_WIDGET (child->widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1078 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1079 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1080
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1081 static gboolean _dw_mdi_maximize_child_callback (GtkWidget *widget, GdkEvent * event, gpointer data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1082 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1083 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1084 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1085 if (child->state == CHILD_MAXIMIZED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1086 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1087 child->state = CHILD_NORMAL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1088 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1089 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1090 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1091 child->state = CHILD_MAXIMIZED;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1092 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1093 if(gtk_widget_get_visible(child->widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1094 gtk_widget_queue_resize(GTK_WIDGET (child->widget));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1095 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1096 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1097
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1098 static gboolean _dw_mdi_kill_child_callback (GtkWidget *widget, GdkEvent *event, gpointer data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1099 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1100 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1101 GtkMdi *mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1102
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1103 child = (GtkMdiChild *) data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1104 mdi = child->mdi;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1105
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1106 g_return_val_if_fail (GTK_IS_MDI (mdi), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1107
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1108 gtk_mdi_remove_true (GTK_CONTAINER (mdi), child->widget);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1109 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1110 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1111
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1112 static GtkMdiChild *_dw_mdi_get_child (GtkMdi *mdi, GtkWidget *widget)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1113 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1114 GList *children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1115
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1116 children = mdi->children;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1117 while (children)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1118 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1119 GtkMdiChild *child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1120
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1121 child = children->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1122 children = children->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1123
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1124 if (child->child == widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1125 return child;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1126 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1127
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1128 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1129 }
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
1130 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1131
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1132 static void _dw_msleep(long period)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1133 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1134 #ifdef __sun__
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1135 /* usleep() isn't threadsafe on Solaris */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1136 struct timespec req;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1137
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1138 req.tv_sec = 0;
1463
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1452
diff changeset
1139 if(period >= 1000)
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1452
diff changeset
1140 {
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1452
diff changeset
1141 req.tv_sec = (int)(period / 1000);
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1452
diff changeset
1142 period -= (req.tv_sec * 1000);
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1452
diff changeset
1143 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1144 req.tv_nsec = period * 10000000;
1463
77f530f95826 Fixed error in _dw_msleep on Solaris... fix was already in dwcompat.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1452
diff changeset
1145
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1146 nanosleep(&req, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1147 #else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1148 usleep(period * 1000);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1149 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1150 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1151
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1152 /* Finds the translation function for a given signal name */
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1153 static DWSignalList _dw_findsignal(const char *signame)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1154 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1155 int z=0;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1156 static DWSignalList empty = {0};
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1157
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1158 while(DWSignalTranslate[z].func)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1159 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1160 if(strcasecmp(signame, DWSignalTranslate[z].name) == 0)
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1161 return DWSignalTranslate[z];
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1162 z++;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1163 }
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1164 return empty;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1165 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1166
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1167 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
1168 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1169 DWSignalHandler sh = {0};
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
1170
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1171 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1172 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1173 void **params = (void **)data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1174 int counter = GPOINTER_TO_INT(params[0]);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1175 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
1176 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
1177
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
1178 snprintf(text, 100, "_dw_sigwindow%d", counter);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1179 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
1180 snprintf(text, 100, "_dw_sigfunc%d", counter);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1181 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
1182 snprintf(text, 100, "_dw_intfunc%d", counter);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1183 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
1184 snprintf(text, 100, "_dw_sigdata%d", counter);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1185 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
1186 snprintf(text, 100, "_dw_sigcid%d", counter);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1187 sh.cid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), text));
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1188 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1189 return sh;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1190 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1191
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1192 static void _dw_remove_signal_handler(GtkWidget *widget, int counter)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1193 {
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
1194 char text[101] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1195 gint cid;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1196
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
1197 snprintf(text, 100, "_dw_sigcid%d", counter);
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
1198 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: 2626
diff changeset
1199 if(cid > 0)
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2626
diff changeset
1200 g_signal_handler_disconnect(G_OBJECT(widget), cid);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1201 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
1202 snprintf(text, 100, "_dw_sigwindow%d", counter);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1203 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
1204 snprintf(text, 100, "_dw_sigfunc%d", counter);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1205 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
1206 snprintf(text, 100, "_dw_intfunc%d", counter);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1207 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
1208 snprintf(text, 100, "_dw_sigdata%d", counter);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1209 g_object_set_data(G_OBJECT(widget), text, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1210 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1211
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1212 static int _dw_set_signal_handler(GtkWidget *widget, HWND window, void *func, gpointer data, void *intfunc, void *discfunc)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1213 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
1214 int counter = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_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
1215 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
1216
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
1217 snprintf(text, 100, "_dw_sigwindow%d", counter);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1218 g_object_set_data(G_OBJECT(widget), 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
1219 snprintf(text, 100, "_dw_sigfunc%d", counter);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1220 g_object_set_data(G_OBJECT(widget), 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
1221 snprintf(text, 100, "_dw_intfunc%d", counter);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1222 g_object_set_data(G_OBJECT(widget), 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
1223 snprintf(text, 100, "_dw_discfunc%d", counter);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1224 g_object_set_data(G_OBJECT(widget), 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
1225 snprintf(text, 100, "_dw_sigdata%d", counter);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1226 g_object_set_data(G_OBJECT(widget), text, (gpointer)data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1227
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1228 counter++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1229 g_object_set_data(G_OBJECT(widget), "_dw_sigcounter", GINT_TO_POINTER(counter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1230
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1231 return counter - 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1232 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1233
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1234 static void _dw_set_signal_handler_id(GtkWidget *widget, int counter, gint cid)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1235 {
2660
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2626
diff changeset
1236 if(cid > 0)
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2626
diff changeset
1237 {
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
1238 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
1239
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
1240 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: 2626
diff changeset
1241 g_object_set_data(G_OBJECT(widget), text, GINT_TO_POINTER(cid));
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2626
diff changeset
1242 }
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2626
diff changeset
1243 else
650f8b062317 GTK: Check the Connection ID is positive non-zero before removing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2626
diff changeset
1244 dw_debug("WARNING: Dynamic Windows failed to connect signal.\n");
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1245 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1246
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1247 static void _dw_html_result_event(GObject *object, GAsyncResult *result, gpointer script_data)
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1248 {
2053
026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2051
diff changeset
1249 #if USE_WEBKIT2
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1250 pthread_t saved_thread = _dw_thread;
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1251 #if !WEBKIT_CHECK_VERSION(2, 40, 0)
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1252 WebKitJavascriptResult *js_result;
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1253 #endif
2348
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
1254 #if WEBKIT_CHECK_VERSION(2, 22, 0)
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1255 JSCValue *value;
2348
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
1256 #else
2028
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1257 JSValueRef value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1258 JSGlobalContextRef context;
2348
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
1259 #endif
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1260 GError *error = NULL;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1261 int (*htmlresultfunc)(HWND, int, char *, void *, void *) = NULL;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1262 gint handlerdata = GPOINTER_TO_INT(g_object_get_data(object, "_dw_html_result_id"));
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1263 void *user_data = NULL;
2030
2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2028
diff changeset
1264
2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2028
diff changeset
1265 _dw_thread = (pthread_t)-1;
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1266 if(handlerdata)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1267 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1268 DWSignalHandler work;
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1269 void *params[3] = { GINT_TO_POINTER(handlerdata-1), 0, object };
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1270
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1271 work = _dw_get_signal_handler(params);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1272
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1273 if(work.window)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1274 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1275 htmlresultfunc = work.func;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1276 user_data = work.data;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1277 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1278 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1279
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1280 #if WEBKIT_CHECK_VERSION(2, 40, 0)
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1281 if(!(value = webkit_web_view_evaluate_javascript_finish(WEBKIT_WEB_VIEW(object), result, &error)))
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1282 #else
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1283 if(!(js_result = webkit_web_view_run_javascript_finish(WEBKIT_WEB_VIEW(object), result, &error)))
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1284 #endif
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1285 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1286 if(htmlresultfunc)
2053
026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2051
diff changeset
1287 htmlresultfunc((HWND)object, DW_ERROR_UNKNOWN, error->message, script_data, user_data);
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1288 g_error_free(error);
2030
2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2028
diff changeset
1289 _dw_thread = saved_thread;
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1290 return;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1291 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1292
2028
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1293 #if WEBKIT_CHECK_VERSION(2, 22, 0)
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1294 #if !WEBKIT_CHECK_VERSION(2, 40, 0)
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1295 value = webkit_javascript_result_get_js_value(js_result);
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1296 #endif
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1297 if(jsc_value_is_string(value))
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1298 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1299 gchar *str_value = jsc_value_to_string(value);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1300 JSCException *exception = jsc_context_get_exception(jsc_value_get_context(value));
2028
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1301 #else
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1302 context = webkit_javascript_result_get_global_context(js_result);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1303 value = webkit_javascript_result_get_value(js_result);
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1304 if (JSValueIsString(context, value))
2028
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1305 {
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1306 JSStringRef js_str_value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1307 gchar *str_value;
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1308 gsize str_length;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1309
2028
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1310 js_str_value = JSValueToStringCopy(context, value, NULL);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1311 str_length = JSStringGetMaximumUTF8CStringSize(js_str_value);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1312 str_value = (gchar *)g_malloc (str_length);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1313 JSStringGetUTF8CString(js_str_value, str_value, str_length);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1314 JSStringRelease(js_str_value);
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1315 #endif
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1316
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1317 if(htmlresultfunc)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1318 {
2028
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1319 #if WEBKIT_CHECK_VERSION(2, 22, 0)
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1320 if(exception)
2053
026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2051
diff changeset
1321 htmlresultfunc((HWND)object, DW_ERROR_UNKNOWN, (char *)jsc_exception_get_message(exception), script_data, user_data);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1322 else
2028
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
1323 #endif
2053
026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2051
diff changeset
1324 htmlresultfunc((HWND)object, DW_ERROR_NONE, str_value, script_data, user_data);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1325 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1326 g_free (str_value);
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1327 }
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1328 else if(htmlresultfunc)
2053
026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2051
diff changeset
1329 htmlresultfunc((HWND)object, DW_ERROR_UNKNOWN, NULL, script_data, user_data);
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1330 #if !WEBKIT_CHECK_VERSION(2, 40, 0)
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1331 webkit_javascript_result_unref (js_result);
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1332 #endif
2030
2cbbbc850b8d GTK3: Fix deadlock when calling dw_messagebox() from HTML_RESULT event
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2028
diff changeset
1333 _dw_thread = saved_thread;
2053
026f033ac1c1 GTK3: User and Script data parameters to HTML_RESULT handler were swapped.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2051
diff changeset
1334 #endif
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1335 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1336
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1337 #ifdef USE_WEBKIT2
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1338 static void _dw_html_message_event(WebKitUserContentManager *manager, WebKitJavascriptResult *js_result, gpointer *data)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1339 {
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1340 pthread_t saved_thread = _dw_thread;
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1341 HWND window = (HWND)data[0];
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1342 int (*htmlmessagefunc)(HWND, char *, char *, void *) = NULL;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1343 void *user_data = NULL;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1344 gchar *name = (gchar *)data[1];
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1345 gint handlerdata;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1346 #if WEBKIT_CHECK_VERSION(2, 22, 0)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1347 JSCValue *value;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1348 #else
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1349 JSValueRef value;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1350 JSGlobalContextRef context;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1351 #endif
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1352
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1353 _dw_thread = (pthread_t)-1;
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1354 if(window && (handlerdata = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(window), "_dw_html_message_id"))))
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1355 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1356 void *params[3] = { GINT_TO_POINTER(handlerdata-1), 0, window };
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1357 DWSignalHandler work = _dw_get_signal_handler(params);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1358
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1359 if(work.window)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1360 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1361 htmlmessagefunc = work.func;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1362 user_data = work.data;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1363 }
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1364 }
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1365
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1366 #if WEBKIT_CHECK_VERSION(2, 22, 0)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1367 value = webkit_javascript_result_get_js_value(js_result);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1368 if(jsc_value_is_string(value))
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1369 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1370 gchar *str_value = jsc_value_to_string(value);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1371 JSCException *exception = jsc_context_get_exception(jsc_value_get_context(value));
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1372 #else
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1373 context = webkit_javascript_result_get_global_context(js_result);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1374 value = webkit_javascript_result_get_value(js_result);
2989
fed8a986d565 GTK3: Fix compiling with pre-2.22 WebKit2GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2986
diff changeset
1375 if(JSValueIsString(context, value))
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1376 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1377 JSStringRef js_str_value;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1378 gchar *str_value;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1379 gsize str_length;
2989
fed8a986d565 GTK3: Fix compiling with pre-2.22 WebKit2GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2986
diff changeset
1380 void *exception = NULL;
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1381
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1382 js_str_value = JSValueToStringCopy(context, value, NULL);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1383 str_length = JSStringGetMaximumUTF8CStringSize(js_str_value);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1384 str_value = (gchar *)g_malloc (str_length);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1385 JSStringGetUTF8CString(js_str_value, str_value, str_length);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1386 JSStringRelease(js_str_value);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1387 #endif
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1388
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1389 if(htmlmessagefunc && !exception)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1390 htmlmessagefunc(window, name, str_value, user_data);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1391
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1392 g_free(str_value);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1393
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1394 if(!exception)
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1395 {
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1396 _dw_thread = saved_thread;
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1397 return;
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1398 }
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1399 }
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1400
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1401 if(htmlmessagefunc)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1402 htmlmessagefunc(window, name, NULL, user_data);
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
1403 _dw_thread = saved_thread;
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1404 }
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1405 #endif
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
1406
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1407 #ifdef USE_WEBKIT
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1408 #ifdef USE_WEBKIT2
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1409 static void _dw_html_changed_event(WebKitWebView *web_view, WebKitLoadEvent load_event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1410 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1411 DWSignalHandler work = _dw_get_signal_handler(data);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1412 char *location = (char *)webkit_web_view_get_uri(web_view);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1413 int status = 0;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1414
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1415 switch (load_event) {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1416 case WEBKIT_LOAD_STARTED:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1417 status = DW_HTML_CHANGE_STARTED;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1418 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1419 case WEBKIT_LOAD_REDIRECTED:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1420 status = DW_HTML_CHANGE_REDIRECT;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1421 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1422 case WEBKIT_LOAD_COMMITTED:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1423 status = DW_HTML_CHANGE_LOADING;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1424 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1425 case WEBKIT_LOAD_FINISHED:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1426 status = DW_HTML_CHANGE_COMPLETE;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1427 break;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1428 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1429 if(status && location && work.window && work.func)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1430 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1431 int (*htmlchangedfunc)(HWND, int, char *, void *) = work.func;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1432
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1433 htmlchangedfunc(work.window, status, location, work.data);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1434 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1435 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1436 #else
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1437 static void _dw_html_changed_event(WebKitWebView *web_view, WebKitWebFrame *frame, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1438 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1439 DWSignalHandler work = _dw_get_signal_handler(data);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1440 char *location = (char *)webkit_web_view_get_uri(web_view);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1441 int status = 0;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1442 void **params = data;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1443
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1444 if(params)
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
1445 status = DW_POINTER_TO_INT(params[3]);
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1446
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1447 if(status && location && work.window && work.func)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1448 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1449 int (*htmlchangedfunc)(HWND, int, char *, void *) = work.func;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
1450
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1451 htmlchangedfunc(work.window, status, location, work.data);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1452 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1453 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1454 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1455 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
1456
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1457 static gint _dw_set_focus_event(GtkWindow *window, GtkWidget *widget, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1458 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1459 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1460 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1461
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1462 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1463 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1464 int (*setfocusfunc)(HWND, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1465
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1466 retval = setfocusfunc(work.window, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1467 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1468 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1469 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1470
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1471 static gint _dw_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1472 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1473 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1474 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1475
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1476 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1477 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1478 int (*buttonfunc)(HWND, int, int, int, void *) = work.func;
2618
156ad91481eb WARNING: Standardize button press and release button parameter values.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2584
diff changeset
1479 int mybutton = DW_BUTTON1_MASK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1480
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1481 if(event->button == 3)
2618
156ad91481eb WARNING: Standardize button press and release button parameter values.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2584
diff changeset
1482 mybutton = DW_BUTTON2_MASK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1483 else if(event->button == 2)
2618
156ad91481eb WARNING: Standardize button press and release button parameter values.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2584
diff changeset
1484 mybutton = DW_BUTTON3_MASK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1485
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1486 retval = buttonfunc(work.window, event->x, event->y, mybutton, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1487 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1488 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1489 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1490
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1491 static gint _dw_button_release_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1492 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1493 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1494 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1495
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1496 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1497 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1498 int (*buttonfunc)(HWND, int, int, int, void *) = work.func;
2618
156ad91481eb WARNING: Standardize button press and release button parameter values.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2584
diff changeset
1499 int mybutton = DW_BUTTON3_MASK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1500
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1501 if(event->button == 3)
2618
156ad91481eb WARNING: Standardize button press and release button parameter values.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2584
diff changeset
1502 mybutton = DW_BUTTON2_MASK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1503 else if(event->button == 2)
2618
156ad91481eb WARNING: Standardize button press and release button parameter values.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2584
diff changeset
1504 mybutton = DW_BUTTON3_MASK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1505
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1506 retval = buttonfunc(work.window, event->x, event->y, mybutton, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1507 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1508 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1509 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1510
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1511 static gint _dw_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1512 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1513 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1514 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1515
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1516 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1517 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1518 int (*motionfunc)(HWND, int, int, int, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1519 int keys = 0, x, y;
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
1520 GdkModifierType state = 0;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1521
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1522 if (event->is_hint)
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
1523 gdk_window_get_device_position (event->window, gdk_event_get_device((GdkEvent *)event), &x, &y, &state);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1524 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1525 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1526 x = event->x;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1527 y = event->y;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1528 state = event->state;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1529 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1530
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1531 if (state & GDK_BUTTON1_MASK)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1532 keys = DW_BUTTON1_MASK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1533 if (state & GDK_BUTTON3_MASK)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1534 keys |= DW_BUTTON2_MASK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1535 if (state & GDK_BUTTON2_MASK)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1536 keys |= DW_BUTTON3_MASK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1537
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1538 retval = motionfunc(work.window, x, y, keys, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1539 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1540 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1541 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1542
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1543 static gint _dw_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1544 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1545 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1546 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1547
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1548 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1549 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1550 int (*closefunc)(HWND, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1551
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1552 retval = closefunc(work.window, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1553 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1554 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1555 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1556
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1557 static gint _dw_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1558 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1559 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1560 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1561
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1562 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1563 {
1747
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1745
diff changeset
1564 int (*keypressfunc)(HWND, char, int, int, void *, char *) = work.func;
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1745
diff changeset
1565 guint32 unichar = gdk_keyval_to_unicode(event->keyval);
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1745
diff changeset
1566 char utf8[7] = { 0 };
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
1567
1747
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1745
diff changeset
1568 g_unichar_to_utf8(unichar, utf8);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
1569
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1570 retval = keypressfunc(work.window, *event->string, event->keyval,
1747
f297d8a63aed Added utf8 parameter to key press callback on GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1745
diff changeset
1571 event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK), work.data, utf8);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1572 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1573 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1574 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1575
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1576 static gint _dw_generic_event(GtkWidget *widget, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1577 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1578 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1579 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1580
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1581 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1582 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1583 int (*genericfunc)(HWND, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1584
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1585 retval = genericfunc(work.window, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1586 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1587 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1588 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1589
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1590 static gint _dw_activate_event(GtkWidget *widget, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1591 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1592 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1593 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1594
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1595 if(work.window && !_dw_ignore_click)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1596 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1597 int (*activatefunc)(HWND, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1598
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
1599 retval = activatefunc(_dw_popup ? _dw_popup : work.window, work.data);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
1600 _dw_popup = NULL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1601 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1602 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1603 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1604
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1605 static gint _dw_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1606 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1607 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1608 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1609
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1610 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1611 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1612 int (*sizefunc)(HWND, int, int, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1613
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1614 retval = sizefunc(work.window, event->width, event->height, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1615 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1616 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1617 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1618
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1619 static gint _dw_expose_event(GtkWidget *widget, cairo_t *cr, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1620 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1621 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1622 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1623
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1624 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1625 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1626 DWExpose exp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1627 int (*exposefunc)(HWND, DWExpose *, void *) = work.func;
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
1628 gpointer oldrender = NULL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1629
2365
77686ad495ba GTK3/4: Optimizing dirty list management. Keep list as short as possible.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2358
diff changeset
1630 /* 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: 2358
diff changeset
1631 _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: 2358
diff changeset
1632
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
1633 exp.x = exp.y = 0;
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
1634 exp.width = gtk_widget_get_allocated_width(widget);
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
1635 exp.height = gtk_widget_get_allocated_height(widget);
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
1636 g_object_set_data(G_OBJECT(work.window), "_dw_cr", (gpointer)cr);
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
1637 if(_dw_render_safe_mode == DW_FEATURE_ENABLED && _dw_is_render(work.window))
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
1638 {
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
1639 oldrender = g_object_get_data(G_OBJECT(work.window), "_dw_expose");
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
1640 g_object_set_data(G_OBJECT(work.window), "_dw_expose", (gpointer)1);
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
1641 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1642 retval = exposefunc(work.window, &exp, work.data);
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
1643 if(_dw_render_safe_mode == DW_FEATURE_ENABLED)
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
1644 g_object_set_data(G_OBJECT(work.window), "_dw_expose", oldrender);
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
1645 g_object_set_data(G_OBJECT(work.window), "_dw_cr", NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1646 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1647 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1648 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1649
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1650 static gint _dw_combobox_select_event(GtkWidget *widget, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1651 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1652 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1653 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1654
1742
cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1718
diff changeset
1655 if(g_object_get_data(G_OBJECT(widget), "_dw_recursing"))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1656 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1657
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1658 if(work.window && GTK_IS_COMBO_BOX(widget))
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1659 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1660 GtkTreeModel *store = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1661
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1662 if(store)
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1663 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1664 GtkTreeIter iter;
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1665 GtkTreePath *path;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1666
1742
cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1718
diff changeset
1667 g_object_set_data(G_OBJECT(widget), "_dw_recursing", GINT_TO_POINTER(1));
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1668
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1669 if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(widget), &iter))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1670 {
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1671 path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1672
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1673 if(path)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1674 {
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1675 gint *indices = gtk_tree_path_get_indices(path);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1676
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1677 if(indices)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1678 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1679 int (*selectfunc)(HWND, int, void *) = work.func;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1680
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1681 retval = selectfunc(work.window, indices[0], work.data);
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1682 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
1683 gtk_tree_path_free(path);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1684 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1685 }
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1686
1742
cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1718
diff changeset
1687 g_object_set_data(G_OBJECT(widget), "_dw_recursing", NULL);
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1688 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1689 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1690 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1691 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1692
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1693 #define _DW_DATA_TYPE_STRING 0
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1694 #define _DW_DATA_TYPE_POINTER 1
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1695
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1696 static gint _dw_tree_context_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1697 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1698 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1699 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1700
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1701 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1702 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1703 if(event->button == 3)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1704 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1705 int (*contextfunc)(HWND, char *, int, int, void *, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1706 char *text = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1707 void *itemdata = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1708
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1709 if(widget && GTK_IS_TREE_VIEW(widget))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1710 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1711 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1712 GtkTreeModel *store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1713 GtkTreeIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1714
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
1715 if(sel && gtk_tree_selection_get_mode(sel) != GTK_SELECTION_MULTIPLE &&
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
1716 gtk_tree_selection_get_selected(sel, NULL, &iter))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1717 {
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
1718 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
1719 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1720 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, -1);
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
1721 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
1722 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
1723 {
2471
ed955edc7204 GTK3: Fill in the row data for contatiner context.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2410
diff changeset
1724 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
1725 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1726 }
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1727 else
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1728 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1729 GtkTreePath *path;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1730
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1731 gtk_tree_view_get_cursor(GTK_TREE_VIEW(widget), &path, NULL);
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1732 if(path)
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1733 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1734 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1735
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1736 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1737 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1738 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1739 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1740 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, -1);
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1741 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1742 else
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1743 {
2471
ed955edc7204 GTK3: Fill in the row data for contatiner context.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2410
diff changeset
1744 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1745 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1746 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1747 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1748 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1749 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1750 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1751
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1752 retval = contextfunc(work.window, text, event->x, event->y, work.data, itemdata);
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1753 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1754 g_free(text);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1755 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1756 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1757 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1758 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1759
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1760 static gint _dw_tree_select_event(GtkTreeSelection *sel, gpointer data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1761 {
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
1762 GtkWidget *item = NULL, *widget = (GtkWidget *)gtk_tree_selection_get_tree_view(sel);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1763 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1764
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1765 if(widget)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1766 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1767 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1768
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1769 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1770 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1771 int (*treeselectfunc)(HWND, HTREEITEM, char *, void *, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1772 GtkTreeIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1773 char *text = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1774 void *itemdata = NULL;
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1775 GtkTreeModel *store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1776
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1777 if(g_object_get_data(G_OBJECT(widget), "_dw_double_click"))
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1778 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1779 g_object_set_data(G_OBJECT(widget), "_dw_double_click", GINT_TO_POINTER(0));
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1780 return TRUE;
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1781 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1782
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
1783 if(gtk_tree_selection_get_mode(sel) != GTK_SELECTION_MULTIPLE &&
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
1784 gtk_tree_selection_get_selected(sel, NULL, &iter))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1785 {
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
1786 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
1787 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1788 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, 3, &item, -1);
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1789 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1790 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1791 else if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1792 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1793 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1794 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
1795 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
1796 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
1797 {
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1798 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1799
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1800 if(path)
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1801 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1802 gint *indices = gtk_tree_path_get_indices(path);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1803
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1804 if(indices)
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1805 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1806 int (*selectfunc)(HWND, int, void *) = work.func;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1807
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1808 retval = selectfunc(work.window, indices[0], work.data);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1809 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1810 gtk_tree_path_free(path);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1811 }
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
1812 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1813 }
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1814 else
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1815 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1816 GtkTreePath *path;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1817
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1818 gtk_tree_view_get_cursor(GTK_TREE_VIEW(widget), &path, NULL);
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1819 if(path)
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1820 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1821 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1822
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1823 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1824 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1825 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1826 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1827 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, 2, &itemdata, 3, &item, -1);
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1828 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1829 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1830 else if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1831 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1832 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &itemdata, -1);
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1833 retval = treeselectfunc(work.window, (HTREEITEM)item, text, work.data, itemdata);
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1834 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1835 else
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1836 {
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1837 gint *indices = gtk_tree_path_get_indices(path);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1838
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1839 if(indices)
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1840 {
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1841 int (*selectfunc)(HWND, int, void *) = work.func;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1842
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1843 retval = selectfunc(work.window, indices[0], work.data);
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
1844 }
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1845 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1846 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1847 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1848 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1849 }
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1850 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1851 g_free(text);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1852 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1853 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1854 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1855 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1856
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1857 static gint _dw_tree_expand_event(GtkTreeView *widget, GtkTreeIter *iter, GtkTreePath *path, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1858 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1859 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1860 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1861
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1862 if(!_dw_ignore_expand && work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1863 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1864 int (*treeexpandfunc)(HWND, HTREEITEM, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1865 retval = treeexpandfunc(work.window, (HTREEITEM)iter, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1866 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1867 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1868 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1869
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1870 static gint _dw_container_enter_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1871 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1872 DWSignalHandler work = _dw_get_signal_handler(data);
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1873 GdkEventKey *keyevent = (GdkEventKey *)event;
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1874 GdkEventButton *buttonevent = (GdkEventButton *)event;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1875 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1876
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1877 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1878 {
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1879 /* Handle both key and button events together */
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1880 if((event->type == GDK_2BUTTON_PRESS && buttonevent->button == 1) ||
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1881 (event->type == GDK_KEY_PRESS && keyevent->keyval == VK_RETURN))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1882 {
1881
653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1875
diff changeset
1883 int (*contextfunc)(HWND, char *, void *, void *) = work.func;
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1884 char *text = NULL;
1881
653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1875
diff changeset
1885 void *data = NULL;
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1886
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1887 /* Prevent some double events from happening */
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1888 if(event->type == GDK_2BUTTON_PRESS)
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1889 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1890 g_object_set_data(G_OBJECT(widget), "_dw_double_click", GINT_TO_POINTER(1));
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1891 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1892
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1893 /* Sanity check */
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1894 if(GTK_IS_TREE_VIEW(widget))
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1895 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1896 GtkTreePath *path;
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1897 GtkTreeModel *store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1898
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1899 gtk_tree_view_get_cursor(GTK_TREE_VIEW(widget), &path, NULL);
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1900 if(path)
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1901 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1902 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
1903
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1904 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1905 {
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1906 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1907 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1908 gtk_tree_model_get(store, &iter, _DW_DATA_TYPE_STRING, &text, _DW_DATA_TYPE_POINTER, &data, -1);
1881
653ccb517aa1 Fix missing rowdata parameter in container enter callback on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1875
diff changeset
1909 retval = contextfunc(work.window, text, work.data, data);
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1910 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
1911 g_free(text);
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1912 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1913 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1914 gtk_tree_path_free(path);
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1915 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1916 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1917 }
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
1918 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1919 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1920 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1921
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1922 /* Return the logical page id from the physical page id */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1923 int _dw_get_logical_page(HWND handle, unsigned long pageid)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1924 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1925 int z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1926 GtkWidget **pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1927 GtkWidget *thispage = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), pageid);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1928
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1929 if(pagearray && thispage)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1930 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1931 for(z=0;z<256;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1932 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1933 if(thispage == pagearray[z])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1934 return z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1935 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1936 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1937 return 256;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1938 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1939
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1940
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1941 static gint _dw_switch_page_event(GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer data)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1942 {
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1943 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1944 int retval = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1945
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1946 if(work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1947 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1948 int (*switchpagefunc)(HWND, unsigned long, void *) = work.func;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1949 retval = switchpagefunc(work.window, _dw_get_logical_page(GTK_WIDGET(notebook), page_num), work.data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1950 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1951 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1952 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1953
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1954 static gint _dw_column_click_event(GtkWidget *widget, gpointer data)
786
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
1955 {
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1956 void **params = data;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1957 int retval = FALSE;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
1958
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1959 if(params && params[2])
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1960 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1961 GtkWidget *tree = (GtkWidget *)params[2];
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1962 gint handlerdata = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(tree), "_dw_column_click_id"));
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1963
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1964 if(handlerdata)
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1965 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1966 DWSignalHandler work;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
1967
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1968 params[0] = GINT_TO_POINTER(handlerdata-1);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1969 work = _dw_get_signal_handler(params);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1970
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1971 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1972 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1973 int column_num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_column"));
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1974 int (*clickcolumnfunc)(HWND, int, void *) = work.func;
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1975 retval = clickcolumnfunc(work.window, column_num, work.data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
1976 }
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
1977 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1978 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1979 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1980 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1981
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1982 static int _dw_round_value(gfloat val)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1983 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1984 int newval = (int)val;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1985
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1986 if(val >= 0.5 + (gfloat)newval)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1987 newval++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1988
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1989 return newval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1990 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
1991
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
1992 static gint _dw_value_changed_event(GtkWidget *widget, gpointer data)
1578
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1577
diff changeset
1993 {
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1577
diff changeset
1994 GtkWidget *slider, *spinbutton, *scrollbar;
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1577
diff changeset
1995 GtkAdjustment *adjustment = (GtkAdjustment *)widget;
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1577
diff changeset
1996 int max, val;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
1997
1578
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1577
diff changeset
1998 if(!GTK_IS_ADJUSTMENT(adjustment))
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1577
diff changeset
1999 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(widget), "_dw_adjustment");
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2000
1578
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1577
diff changeset
2001 slider = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_slider");
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1577
diff changeset
2002 spinbutton = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_spinbutton");
36f0cfda3be3 Fix value_changed code for GTK3... thought this used to work...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1577
diff changeset
2003 scrollbar = (GtkWidget *)g_object_get_data(G_OBJECT(adjustment), "_dw_scrollbar");
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2004
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
2005 max = _dw_round_value(gtk_adjustment_get_upper(adjustment));
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
2006 val = _dw_round_value(gtk_adjustment_get_value(adjustment));
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
2007
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
2008 if(g_object_get_data(G_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event"))
1486
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1482
diff changeset
2009 return FALSE;
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1482
diff changeset
2010
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1482
diff changeset
2011 if (slider || spinbutton || scrollbar)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2012 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
2013 DWSignalHandler work = _dw_get_signal_handler(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2014
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2015 if (work.window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2016 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2017 int (*valuechangedfunc)(HWND, int, void *) = work.func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2018
1583
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
2019 if(slider && gtk_orientable_get_orientation(GTK_ORIENTABLE(slider)) == GTK_ORIENTATION_VERTICAL)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2020 valuechangedfunc(work.window, (max - val) - 1, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2021 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2022 valuechangedfunc(work.window, val, work.data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2023 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2024 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2025 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2026 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2027
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
2028 static gint _dw_default_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2029 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2030 GtkWidget *next = (GtkWidget *)data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2031
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2032 if(next)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2033 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2034 if(event->keyval == GDK_KEY_Return)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2035 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2036 if(GTK_IS_BUTTON(next))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2037 g_signal_emit_by_name(G_OBJECT(next), "clicked");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2038 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2039 gtk_widget_grab_focus(next);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2040 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2041 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2042 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2043 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2044
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2045 #ifdef DW_INCLUDE_DEPRECATED_RESOURCES
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
2046 static GdkPixbuf *_dw_pixbuf_from_data(char *data)
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
2047 {
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
2048 if(data[0] == 'G' && data[1] == 'd' && data[2] == 'k' && data[3] == 'P')
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
2049 return gdk_pixbuf_new_from_inline(-1, (const guint8 *)data, FALSE, NULL);
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
2050 return gdk_pixbuf_new_from_xpm_data((const char **)data);
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
2051 }
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2052 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2053
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2054 static GdkPixbuf *_dw_pixbuf_from_resource(unsigned int rid)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2055 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2056 #if GLIB_CHECK_VERSION(2,32,0)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2057 char resource_path[201] = {0};
2205
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2204
diff changeset
2058 snprintf(resource_path, 200, "/org/dbsoft/dwindows/resources/%u.png", rid);
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2059 return gdk_pixbuf_new_from_resource(resource_path, NULL);
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2060 #else
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2061 return NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2062 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2063 }
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
2064
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
2065 static GdkPixbuf *_dw_find_pixbuf(HICN icon, unsigned long *userwidth, unsigned long *userheight)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2066 {
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2067 unsigned int id = GPOINTER_TO_INT(icon);
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2068 GdkPixbuf *icon_pixbuf = NULL;
976
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
2069
1289
5fb54aeba5e0 Allow removing icons from containers on GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1287
diff changeset
2070 /* Quick dropout for non-handle */
5fb54aeba5e0 Allow removing icons from containers on GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1287
diff changeset
2071 if(!icon)
5fb54aeba5e0 Allow removing icons from containers on GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1287
diff changeset
2072 return NULL;
5fb54aeba5e0 Allow removing icons from containers on GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1287
diff changeset
2073
976
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
2074 if(id > 65535)
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2075 icon_pixbuf = icon;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2076 else
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2077 icon_pixbuf = _dw_pixbuf_from_resource(id);
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2078
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2079 #ifdef DW_INCLUDE_DEPRECATED_RESOURCES
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2080 if(!icon_pixbuf)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2081 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2082 char *data = NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2083 int z;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2084
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2085 for(z=0;z<_resources.resource_max;z++)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2086 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2087 if(_resources.resource_id[z] == id)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2088 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2089 data = _resources.resource_data[z];
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2090 break;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2091 }
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2092 }
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2093
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2094 if(data)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2095 icon_pixbuf = _dw_pixbuf_from_data(data);
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2096 }
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2097 #endif
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2098 if(userwidth)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2099 *userwidth = icon_pixbuf ? gdk_pixbuf_get_width(icon_pixbuf) : 0;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2100 if(userheight)
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2101 *userheight = icon_pixbuf ? gdk_pixbuf_get_height(icon_pixbuf) : 0;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2102
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2103 return icon_pixbuf;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2104 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2105
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2106 #if GLIB_CHECK_VERSION(2,40,0)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2107 /* Handle system notification click callbacks */
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2108 static void _dw_notification_handler(GSimpleAction *action, GVariant *param, gpointer user_data)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2109 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2110 char textbuf[101] = {0};
2113
aaea278c2356 GTK: Fix variant warning, needed to specify parameter type on action.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2112
diff changeset
2111 int (*func)(HWND, void *);
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2112 void *data;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2113
2132
42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2127
diff changeset
2114 snprintf(textbuf, 100, "dw-notification-%llu-func", DW_POINTER_TO_ULONGLONG(g_variant_get_uint64(param)));
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2115 func = g_object_get_data(G_OBJECT(_DWApp), textbuf);
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2116 g_object_set_data(G_OBJECT(_DWApp), textbuf, NULL);
2132
42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2127
diff changeset
2117 snprintf(textbuf, 100, "dw-notification-%llu-data", DW_POINTER_TO_ULONGLONG(g_variant_get_uint64(param)));
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2118 data = g_object_get_data(G_OBJECT(_DWApp), textbuf);
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2119 g_object_set_data(G_OBJECT(_DWApp), textbuf, NULL);
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2120
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2121 if(func)
2133
2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2132
diff changeset
2122 func((HWND)DW_ULONGLONG_TO_POINTER(g_variant_get_uint64(param)), data);
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2123 }
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2124 #endif
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2125
2197
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2126 #if GLIB_CHECK_VERSION(2,28,0)
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2127 static void _dw_app_activate(GApplication *app, gpointer user_data)
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2128 {
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2129 /* Not sure why this signal is required, but GLib gives warnings
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2130 * when this signal is not connected, so putting this here to
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2131 * quell the warning and can be used at a later point if needed.
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2132 */
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2133 }
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2134 #endif
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2135
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2136 #ifdef DW_INCLUDE_DEPRECATED_RESOURCES
2205
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2204
diff changeset
2137 #undef dw_init
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2138 int dw_int_init(DWResources *res, int newthread, int *pargc, char **pargv[])
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2139 {
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2140 int argc = pargc ? *pargc : 0;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2141 char **argv = pargv ? *pargv : NULL;
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2142
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2143 if(res)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2144 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2145 _resources.resource_max = res->resource_max;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2146 _resources.resource_id = res->resource_id;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2147 _resources.resource_data = res->resource_data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2148 }
2205
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2204
diff changeset
2149 return dw_init(newthread, argc, argv);
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2204
diff changeset
2150 }
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2204
diff changeset
2151 #endif
a43a3f80ed32 GTK: Changes to include both dw_(int_)init() functions with deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2204
diff changeset
2152
2857
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2153 void _dw_init_path(char *arg)
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2154 {
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2155 char path[PATH_MAX+1] = {0};
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2156
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2157 #ifdef __linux__
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2158 if(readlink("/proc/self/exe", path, PATH_MAX) == -1)
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2159 #elif defined(__FreeBSD__)
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2160 int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2161 size_t length = PATH_MAX;
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2162
2858
ecfbc48e933a FreeBSD: Fix the executable path detection code on FreeBSD.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2857
diff changeset
2163 if(sysctl(name, 4, path, &length, NULL, 0) == -1 || length <= 1)
2859
b5cd3242b5e7 Solaris: Add platform specific executable path detection.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2858
diff changeset
2164 #elif defined(__sun__)
b5cd3242b5e7 Solaris: Add platform specific executable path detection.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2858
diff changeset
2165 char procpath[101] = {0};
b5cd3242b5e7 Solaris: Add platform specific executable path detection.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2858
diff changeset
2166
2904
2b7babf491e1 Solaris: Fix warning because getpid() returns a long int.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2901
diff changeset
2167 snprintf(procpath, 100, "/proc/%ld/path/a.out", (long)getpid());
2859
b5cd3242b5e7 Solaris: Add platform specific executable path detection.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2858
diff changeset
2168
b5cd3242b5e7 Solaris: Add platform specific executable path detection.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2858
diff changeset
2169 if(readlink(procpath, path, PATH_MAX) == -1)
2857
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2170 #endif
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2171 strncpy(path, arg ? arg : "", PATH_MAX);
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2172
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2173 if(path[0])
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2174 {
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2175 char *pos = strrchr(path, '/');
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2176 char *binname = path;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2177
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2178 /* If we have a / then...
1506
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2179 * the binary name should be at the end.
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2180 */
1384
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
2181 if(pos)
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
2182 {
1506
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2183 binname = pos + 1;
1384
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
2184 *pos = 0;
1506
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2185 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2186
1506
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2187 if(*binname)
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2188 {
2857
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2189 char *binpos = strstr(path, "/bin");
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2190
1506
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2191 if(binpos)
2857
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2192 strncpy(_dw_share_path, path, (size_t)(binpos - path));
1506
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2193 else
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2194 strcpy(_dw_share_path, "/usr/local");
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2195 strcat(_dw_share_path, "/share/");
308bfa8426db Rewrite application directory detection code for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1505
diff changeset
2196 strcat(_dw_share_path, binname);
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
2197 #if GLIB_CHECK_VERSION(2,28,0)
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2198 if(!_dw_app_id[0])
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2199 {
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2200 /* If we have a binary name, use that for the Application ID instead. */
2127
663467f6eee4 Code cleanup: Add constants to header for dark mode, buffer sizes and Unicode support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2118
diff changeset
2201 snprintf(_dw_app_id, _DW_APP_ID_SIZE, "%s.%s", DW_APP_DOMAIN_DEFAULT, binname);
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2202 }
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
2203 #endif
1384
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
2204 }
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
2205 }
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
2206 /* If that failed... just get the current directory */
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
2207 if(!_dw_share_path[0] && !getcwd(_dw_share_path, PATH_MAX))
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
2208 _dw_share_path[0] = '/';
2857
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2209 }
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2210
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2211 /*
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2212 * Initializes the Dynamic Windows engine.
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2213 * Parameters:
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2214 * newthread: True if this is the only thread.
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2215 * False if there is already a message loop running.
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2216 */
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2217 int dw_init(int newthread, int argc, char *argv[])
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2218 {
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2219 /* Setup the private data directory */
59106bf7f9f4 GTK2/3/4: Refactor dw_init(), splitting off path detection into _dw_init_path().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2855
diff changeset
2220 _dw_init_path(argc > 0 ? argv[0] : NULL);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2221
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
2222 #if !GLIB_CHECK_VERSION(2,31,0)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2223 g_thread_init(NULL);
1355
dd252596227b Removed a now unused variable on GTK in dw_html_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1354
diff changeset
2224 #endif
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2225
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2226 /* Load these functions via dlsym to avoid deprecation warnings */
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2227 _dw_gdk_threads_init = dlsym(RTLD_DEFAULT, "gdk_threads_init");
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2228 _dw_gdk_threads_enter = dlsym(RTLD_DEFAULT, "gdk_threads_enter");
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2229 _dw_gdk_threads_leave = dlsym(RTLD_DEFAULT, "gdk_threads_leave");
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2230
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2231 _dw_gdk_threads_init();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2232
2202
c677d728e143 GTK3: Switch to using GResource for compiled in image resources.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2201
diff changeset
2233 gtk_init(&argc, &argv);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2234
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
2235 pthread_key_create(&_dw_fg_color_key, NULL);
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
2236 pthread_key_create(&_dw_bg_color_key, NULL);
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
2237 pthread_key_create(&_dw_mutex_key, NULL);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
2238
1887
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
2239 _dw_init_thread();
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
2240
874
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
2241 /* Create a global object for glib activities */
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
2242 _DWObject = g_object_new(G_TYPE_OBJECT, NULL);
2081
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
2243
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
2244 #if GLIB_CHECK_VERSION(2,28,0)
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2245 if(!_dw_app_id[0])
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2246 {
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2247 /* Generate an Application ID based on the PID if all else fails. */
2133
2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2132
diff changeset
2248 snprintf(_dw_app_id, _DW_APP_ID_SIZE, "%s.pid.%d", DW_APP_DOMAIN_DEFAULT, (int)getpid());
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2249 }
2081
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
2250
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
2251 /* Initialize the application subsystem on supported versions...
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
2252 * we generate an application ID based on the binary name or PID
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
2253 * instead of passing NULL to enable full application support.
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
2254 */
2860
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2859
diff changeset
2255 #if GLIB_CHECK_VERSION(2,74,0)
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2859
diff changeset
2256 _DWApp = g_application_new(_dw_app_id, G_APPLICATION_DEFAULT_FLAGS);
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2859
diff changeset
2257 #else
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2258 _DWApp = g_application_new(_dw_app_id, G_APPLICATION_FLAGS_NONE);
2860
9daee9d58956 GTK2/3/4: Handle deprecations in GLIB 2.74 and GTK 4.8.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2859
diff changeset
2259 #endif
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
2260 if(_DWApp && g_application_register(_DWApp, NULL, NULL))
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2261 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2262 #if GLIB_CHECK_VERSION(2,40,0)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2263 /* Creat our notification handler for any notifications */
2117
37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2115
diff changeset
2264 GSimpleAction *action = g_simple_action_new("notification", G_VARIANT_TYPE_UINT64);
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2265
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2266 g_signal_connect(G_OBJECT(action), "activate", G_CALLBACK(_dw_notification_handler), NULL);
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2267 g_action_map_add_action(G_ACTION_MAP(_DWApp), G_ACTION(action));
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2268 #endif
2330
58700e9fcba3 GTK3/4: Add call to g_set_prgname() with the Application ID.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2284
diff changeset
2269 g_set_prgname(_dw_app_id);
2197
b818a32f7790 GTK3: Eliminate GLib warning due to missing 'activate' signal.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2160
diff changeset
2270 g_signal_connect(_DWApp, "activate", G_CALLBACK(_dw_app_activate), NULL);
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
2271 g_application_activate(_DWApp);
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
2272 }
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
2273 #endif
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2274 if(_dw_render_safe_mode == DW_FEATURE_UNSUPPORTED)
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2275 {
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2276 #ifdef GDK_WINDOWING_X11
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2277 GdkDisplay *display = gdk_display_get_default();
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2278
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2279 /* If we are in X11 mode safe mode should be disabled by default */
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2280 if(display && GDK_IS_X11_DISPLAY(display))
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2281 _dw_render_safe_mode = DW_FEATURE_DISABLED;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2282 else
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2283 #endif
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2284 _dw_render_safe_mode = DW_FEATURE_ENABLED;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2285 }
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
2286 return DW_ERROR_NONE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2287 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2288
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2289 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2290 * Runs a message loop for Dynamic Windows.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2291 */
1528
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2292 void API dw_main(void)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2293 {
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2294 _dw_gdk_threads_enter();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2295 _dw_thread = pthread_self();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2296 gtk_main();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2297 _dw_thread = (pthread_t)-1;
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2298 _dw_gdk_threads_leave();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2299 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2300
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2301 /*
1528
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2302 * Causes running dw_main() to return.
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2303 */
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2304 void API dw_main_quit(void)
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2305 {
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2306 gtk_main_quit();
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2307 }
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2308
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2309 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2310 * Runs a message loop for Dynamic Windows, for a period of milliseconds.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2311 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2312 * milliseconds: Number of milliseconds to run the loop for.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2313 */
1528
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2314 void API dw_main_sleep(int milliseconds)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2315 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2316 struct timeval tv, start;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2317 pthread_t curr = pthread_self();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2318
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2319 gettimeofday(&start, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2320
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2321 if(_dw_thread == (pthread_t)-1 || _dw_thread == curr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2322 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2323 pthread_t orig = _dw_thread;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2324
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2325 gettimeofday(&tv, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2326
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2327 while(((tv.tv_sec - start.tv_sec)*1000) + ((tv.tv_usec - start.tv_usec)/1000) <= milliseconds)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2328 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2329 int _dw_locked_by_me = FALSE;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2330
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2331 if(orig == (pthread_t)-1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2332 {
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2333 if(!pthread_getspecific(_dw_mutex_key))
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2334 {
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2335 _dw_gdk_threads_enter();
2750
c77974083ba1 GTK2/3: A few more pthread_setspecific() changes... gcc 11.2 reported the
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2749
diff changeset
2336 pthread_setspecific(_dw_mutex_key, (void *)&_dw_locked_by_me);
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2337 _dw_locked_by_me = TRUE;
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2338 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2339 _dw_thread = curr;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2340 }
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2341 if(curr == _dw_thread && gtk_events_pending())
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2342 gtk_main_iteration();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2343 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2344 _dw_msleep(1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2345 if(orig == (pthread_t)-1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2346 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2347 _dw_thread = orig;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2348 if(_dw_locked_by_me)
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2349 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2350 pthread_setspecific(_dw_mutex_key, NULL);
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2351 _dw_gdk_threads_leave();
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2352 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2353 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2354 gettimeofday(&tv, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2355 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2356 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2357 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2358 _dw_msleep(milliseconds);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2359 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2360
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2361 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2362 * Processes a single message iteration and returns.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2363 */
1528
5facb5380944 Added dw_main_quit() function for exiting the dw_main() loop.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1524
diff changeset
2364 void API dw_main_iteration(void)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2365 {
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2366 pthread_t orig = _dw_thread;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2367 pthread_t curr = pthread_self();
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2368 int _dw_locked_by_me = FALSE;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2369
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2370 if(_dw_thread == (pthread_t)-1)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2371 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2372 if(!pthread_getspecific(_dw_mutex_key))
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2373 {
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2374 _dw_gdk_threads_enter();
2750
c77974083ba1 GTK2/3: A few more pthread_setspecific() changes... gcc 11.2 reported the
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2749
diff changeset
2375 pthread_setspecific(_dw_mutex_key, (void *)&_dw_locked_by_me);
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2376 _dw_locked_by_me = TRUE;
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2377 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2378 _dw_thread = curr;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2379 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2380 if(curr == _dw_thread && gtk_events_pending())
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2381 gtk_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2382 else
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2383 sched_yield();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2384 if(orig == (pthread_t)-1)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2385 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2386 _dw_thread = orig;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2387 if(_dw_locked_by_me)
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2388 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2389 pthread_setspecific(_dw_mutex_key, NULL);
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2390 _dw_gdk_threads_leave();
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2391 }
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
2392 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2393 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2394
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2395 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2396 * Free's memory allocated by dynamic windows.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2397 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2398 * ptr: Pointer to dynamic windows allocated
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2399 * memory to be free()'d.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2400 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2401 void dw_free(void *ptr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2402 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2403 free(ptr);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2404 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2405
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2406 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2407 * Allocates and initializes a dialog struct.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2408 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2409 * data: User defined data to be passed to functions.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2410 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2411 DWDialog *dw_dialog_new(void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2412 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2413 DWDialog *tmp = malloc(sizeof(DWDialog));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2414
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2415 if ( tmp )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2416 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2417 tmp->eve = dw_event_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2418 dw_event_reset(tmp->eve);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2419 tmp->data = data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2420 tmp->done = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2421 tmp->method = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2422 tmp->result = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2423 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2424 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2425 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2426
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2427 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2428 * Accepts a dialog struct and returns the given data to the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2429 * initial called of dw_dialog_wait().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2430 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2431 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2432 * result: Data to be returned by dw_dialog_wait().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2433 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2434 int dw_dialog_dismiss(DWDialog *dialog, void *result)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2435 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2436 dialog->result = result;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2437 if(dialog->method)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2438 gtk_main_quit();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2439 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2440 dw_event_post(dialog->eve);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2441 dialog->done = TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2442 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2443 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2444
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2445 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2446 * Accepts a dialog struct waits for dw_dialog_dismiss() to be
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2447 * called by a signal handler with the given dialog struct.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2448 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2449 * dialog: Pointer to a dialog struct aquired by dw_dialog_new).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2450 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2451 void *dw_dialog_wait(DWDialog *dialog)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2452 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2453 void *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2454 int newprocess = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2455
1886
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1884
diff changeset
2456 if(!dialog)
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1884
diff changeset
2457 return NULL;
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1884
diff changeset
2458
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2459 /* _dw_thread will be -1 if dw_main hasn't been run yet. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2460 if(_dw_thread == (pthread_t)-1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2461 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2462 _dw_thread = pthread_self();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2463 newprocess = 1;
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2464 _dw_gdk_threads_enter();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2465 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2466
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2467 if(pthread_self() == _dw_thread)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2468 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2469 dialog->method = TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2470 gtk_main();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2471 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2472 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2473 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2474 dialog->method = FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2475 dw_event_wait(dialog->eve, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2476 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2477
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2478 if(newprocess)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2479 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2480 _dw_thread = (pthread_t)-1;
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
2481 _dw_gdk_threads_leave();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2482 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2483
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2484 dw_event_close(&dialog->eve);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2485 tmp = dialog->result;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2486 free(dialog);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2487 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2488 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2489
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2490 /*
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2491 * Displays a debug message on the console...
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2492 * Parameters:
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2493 * format: printf style format string.
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2494 * ...: Additional variables for use in the format.
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2495 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
2496 void API dw_debug(const char *format, ...)
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2497 {
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2498 va_list args;
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2499
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2500 va_start(args, format);
2901
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2501 vfprintf(stderr, format, args);
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2502 va_end(args);
2901
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2503 }
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2504
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2505 void API dw_vdebug(const char *format, va_list args)
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2506 {
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2507 vfprintf(stderr, format, args);
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2508 }
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2509
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2510 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2511 * Displays a Message Box with given text and title..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2512 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2513 * title: The title of the message box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2514 * flags: Defines buttons and icons to display
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2515 * format: printf style format string.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2516 * ...: Additional variables for use in the format.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2517 */
2901
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2518 int API dw_messagebox(const char *title, int flags, const char *format, ...)
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2519 {
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2520 va_list args;
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2521 int rc;
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2522
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2523 va_start(args, format);
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2524 rc = dw_vmessagebox(title, flags, format, args);
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2525 va_end(args);
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2526 return rc;
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2527 }
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2528
761b7a12b079 Add va_list versions of dw_debug() and dw_messagebox() for use in C++ bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2860
diff changeset
2529 int dw_vmessagebox(const char *title, int flags, const char *format, va_list args)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2530 {
2027
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2531 GtkMessageType gtkicon = GTK_MESSAGE_OTHER;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2532 GtkButtonsType gtkbuttons = GTK_BUTTONS_OK;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2533 GtkWidget *dialog;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2534 int response, _dw_locked_by_me = FALSE;
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2535 char outbuf[1025] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2536
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
2537 vsnprintf(outbuf, 1024, format, args);
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
2538
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2539 if(flags & DW_MB_ERROR)
2027
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2540 gtkicon = GTK_MESSAGE_ERROR;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2541 else if(flags & DW_MB_WARNING)
2027
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2542 gtkicon = GTK_MESSAGE_WARNING;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2543 else if(flags & DW_MB_INFORMATION)
2027
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2544 gtkicon = GTK_MESSAGE_INFO;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2545 else if(flags & DW_MB_QUESTION)
2027
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2546 gtkicon = GTK_MESSAGE_QUESTION;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
2547
2027
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2548 if(flags & DW_MB_OKCANCEL)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2549 gtkbuttons = GTK_BUTTONS_OK_CANCEL;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2550 else if(flags & (DW_MB_YESNO | DW_MB_YESNOCANCEL))
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2551 gtkbuttons = GTK_BUTTONS_YES_NO;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2552
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2553 DW_MUTEX_LOCK;
2208
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2205
diff changeset
2554 dialog = gtk_message_dialog_new(NULL,
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2205
diff changeset
2555 #if GTK_CHECK_VERSION(3,12,0)
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2205
diff changeset
2556 GTK_DIALOG_USE_HEADER_BAR |
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2205
diff changeset
2557 #endif
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2205
diff changeset
2558 GTK_DIALOG_MODAL, gtkicon, gtkbuttons, "%s", title);
2028
fb292c267f52 GTK3: Fixes for building on older webkit2gtk versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2027
diff changeset
2559 gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", outbuf);
2027
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2560 if(flags & DW_MB_YESNOCANCEL)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2561 gtk_dialog_add_button(GTK_DIALOG(dialog), "Cancel", GTK_RESPONSE_CANCEL);
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2562 response = gtk_dialog_run(GTK_DIALOG(dialog));
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2563 gtk_widget_destroy(dialog);
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2564 DW_MUTEX_UNLOCK;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2565 switch(response)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2566 {
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2567 case GTK_RESPONSE_OK:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2568 return DW_MB_RETURN_OK;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2569 case GTK_RESPONSE_CANCEL:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2570 return DW_MB_RETURN_CANCEL;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2571 case GTK_RESPONSE_YES:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2572 return DW_MB_RETURN_YES;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2573 case GTK_RESPONSE_NO:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2574 return DW_MB_RETURN_NO;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2575 default:
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2576 {
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2577 /* Handle the destruction of the dialog result */
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2578 if(flags & (DW_MB_OKCANCEL | DW_MB_YESNOCANCEL))
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2579 return DW_MB_RETURN_CANCEL;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2580 else if(flags & DW_MB_YESNO)
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2581 return DW_MB_RETURN_NO;
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2582 }
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2583 }
ed9217a95924 GTK3: Rewrite dw_messagebox() to use the GTK dialog system.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2010
diff changeset
2584 return DW_MB_RETURN_OK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2585 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2586
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2587 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2588 * Minimizes or Iconifies a top-level window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2589 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2590 * handle: The window handle to minimize.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2591 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2592 int dw_window_minimize(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2593 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2594 int _dw_locked_by_me = FALSE;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2595 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2596 GtkWidget *mdi = NULL;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2597 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2598
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2599 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2600 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2601
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2602 DW_MUTEX_LOCK;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2603 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2604 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2605 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2606 gtk_mdi_set_state(GTK_MDI(mdi), handle, CHILD_ICONIFIED);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2607 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2608 else
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2609 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2610 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2611 gtk_window_iconify( GTK_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2612 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2613 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2614 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2615 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2616
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2617 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2618 * Makes the window topmost.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2619 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2620 * handle: The window handle to make topmost.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2621 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2622 int dw_window_raise(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2623 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2624 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2625
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2626 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2627 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2628
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2629 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2630 gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(handle)));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2631 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2632 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2633 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2634
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2635 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2636 * Makes the window bottommost.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2637 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2638 * handle: The window handle to make bottommost.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2639 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2640 int dw_window_lower(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2641 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2642 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2643
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2644 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2645 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2646
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2647 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2648 gdk_window_lower(gtk_widget_get_window(GTK_WIDGET(handle)));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2649 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2650 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2651 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2652
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2653 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2654 * Makes the window visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2655 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2656 * handle: The window handle to make visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2657 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2658 int dw_window_show(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2659 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2660 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2661 GtkWidget *defaultitem;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2662 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2663 GtkWidget *mdi;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2664 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2665
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2666 if (!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2667 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2668
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2669 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2670 gtk_widget_show(handle);
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2671 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2672 if ((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2673 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2674 gtk_mdi_set_state(GTK_MDI(mdi), handle, CHILD_NORMAL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2675 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2676 else
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2677 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2678 {
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2679 GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(handle));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2680 if (window && gtk_widget_get_mapped(handle))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2681 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
2682 int width = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_width"));
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
2683 int height = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_height"));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2684
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2685 /* If we had a size request before shown */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2686 if (width || height)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2687 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2688 /* Call the size function again now that we are realized */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2689 dw_window_set_size(handle, width, height);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2690 /* Clear out the data so we don't do it again */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2691 g_object_set_data(G_OBJECT(handle), "_dw_width", NULL);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2692 g_object_set_data(G_OBJECT(handle), "_dw_height", NULL);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2693 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2694
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2695 /* If we had a position request before shown */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2696 if (g_object_get_data(G_OBJECT(handle), "_dw_pos"))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2697 {
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2698 int x = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_x"));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2699 int y = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_y"));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2700
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2701 /* Call the position function again now that we are realized */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2702 dw_window_set_pos(handle, x, y);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2703 /* Clear out the data so we don't do it again */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2704 g_object_set_data(G_OBJECT(handle), "_dw_pos", NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2705 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2706
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2707 gdk_window_raise(window);
1937
eb488c379969 Fixed a few deprecation warnings on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1933
diff changeset
2708 gdk_display_flush(gdk_display_get_default());
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
2709 gdk_window_show(window);
1937
eb488c379969 Fixed a few deprecation warnings on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1933
diff changeset
2710 gdk_display_flush(gdk_display_get_default());
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2711 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2712 defaultitem = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_defaultitem");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2713 if (defaultitem)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2714 gtk_widget_grab_focus(defaultitem);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2715 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2716 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2717 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2718 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2719
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2720 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2721 * Makes the window invisible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2722 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2723 * handle: The window handle to make visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2724 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2725 int dw_window_hide(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2726 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2727 int _dw_locked_by_me = FALSE;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2728 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2729 GtkWidget *mdi = NULL;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2730 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2731
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2732 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2733 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2734
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2735 DW_MUTEX_LOCK;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2736 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2737 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2738 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2739 gtk_mdi_set_state(GTK_MDI(mdi), handle, CHILD_ICONIFIED);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2740 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2741 else
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2742 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2743 gtk_widget_hide(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2744 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2745 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2746 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2747
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2748 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2749 * Destroys a window and all of it's children.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2750 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2751 * handle: The window handle to destroy.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2752 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2753 int dw_window_destroy(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2754 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2755 int _dw_locked_by_me = FALSE;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2756 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2757 GtkWidget *mdi = NULL;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2758 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2759
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2760 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2761 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2762
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2763 DW_MUTEX_LOCK;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2764 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2765 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2766 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2767 gtk_mdi_remove(GTK_MDI(mdi), handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2768 }
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
2769 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2770 if(GTK_IS_WIDGET(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2771 {
1656
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2772 GtkWidget *box, *handle2 = handle;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2773 GtkWidget *eventbox = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_eventbox");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2774
1656
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2775 /* Handle the invisible event box if it exists */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2776 if(eventbox && GTK_IS_WIDGET(eventbox))
1656
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2777 handle2 = eventbox;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2778
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2779 /* Check if we are removing a widget from a box */
1656
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2780 if((box = gtk_widget_get_parent(handle2)) && GTK_IS_GRID(box))
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2781 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2782 /* Get the number of items in the box... */
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2783 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2784 #if GTK_CHECK_VERSION(3,10,0)
1890
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2785 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2786 int z;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2787
1890
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2788 /* Figure out where in the grid this widget is and remove that row/column */
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2789 if(boxtype == DW_VERT)
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2790 {
1891
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
2791 for(z=0;z<boxcount;z++)
1890
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2792 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2793 if(gtk_grid_get_child_at(GTK_GRID(box), 0, z) == handle2)
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2794 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2795 gtk_grid_remove_row(GTK_GRID(box), z);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
2796 handle2 = NULL;
1890
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2797 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2798 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2799 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2800 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2801 else
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2802 {
1891
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
2803 for(z=0;z<boxcount;z++)
1890
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2804 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2805 if(gtk_grid_get_child_at(GTK_GRID(box), z, 0) == handle2)
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2806 {
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2807 gtk_grid_remove_column(GTK_GRID(box), z);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
2808 handle2 = NULL;
1890
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2809 break;
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2810 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2811 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2812 }
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
2813 #endif
1656
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2814
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2815 if(boxcount > 0)
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2816 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2817 /* Decrease the count by 1 */
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2818 boxcount--;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2819 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount));
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2820 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
2821 }
2057
9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2056
diff changeset
2822 /* Finally destroy the widget, make sure it is still
9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2056
diff changeset
2823 * a valid widget if it got removed from the grid.
9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2056
diff changeset
2824 */
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
2825 if(handle2 && GTK_IS_WIDGET(handle2))
2057
9c400365f269 GTK3: Eliminate warnings generated when calling dw_window_destroy() on
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2056
diff changeset
2826 gtk_widget_destroy(handle2);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2827 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2828 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2829 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2830 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2831
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2832 /* Causes entire window to be invalidated and redrawn.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2833 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2834 * handle: Toplevel window handle to be redrawn.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2835 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2836 void dw_window_redraw(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2837 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2838 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2839
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2840 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2841 * Changes a window's parent to newparent.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2842 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2843 * handle: The window handle to destroy.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2844 * newparent: The window's new parent window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2845 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2846 void dw_window_reparent(HWND handle, HWND newparent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2847 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2848 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2849
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2850 DW_MUTEX_LOCK;
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
2851 gdk_window_reparent(gtk_widget_get_window(GTK_WIDGET(handle)), newparent ? gtk_widget_get_window(GTK_WIDGET(newparent)) : gdk_get_default_root_window(), 0, 0);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2852 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2853 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2854
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2855 /*
1076
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1072
diff changeset
2856 * Sets the default font used on text based widgets.
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1072
diff changeset
2857 * Parameters:
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1072
diff changeset
2858 * fontname: Font name in Dynamic Windows format.
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1072
diff changeset
2859 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
2860 void API dw_font_set_default(const char *fontname)
1076
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1072
diff changeset
2861 {
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2862 char *oldfont = _DWDefaultFont;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2863
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2864 _DWDefaultFont = strdup(fontname);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
2865
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2866 if(oldfont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2867 free(oldfont);
1076
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1072
diff changeset
2868 }
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1072
diff changeset
2869
2259
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2248
diff changeset
2870 /* Convert DW style font to CSS syntax (or Pango for older versions):
2248
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2871 * font: font-style font-variant font-weight font-size/line-height font-family
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2872 */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
2873 char *_dw_convert_font(const char *font)
2248
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2874 {
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2875 char *newfont = NULL;
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2876
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2877 if(font)
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2878 {
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2879 char *name = strchr(font, '.');
2259
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2248
diff changeset
2880 #if GTK_CHECK_VERSION(3,20,0)
2248
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2881 char *Italic = strstr(font, " Italic");
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2882 char *Bold = strstr(font, " Bold");
2259
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2248
diff changeset
2883 #endif
2248
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2884
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2885 /* Detect Dynamic Windows style font name...
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2886 * Format: ##.Fontname
2259
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2248
diff changeset
2887 * and convert to CSS or Pango syntax
2248
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2888 */
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2889 if(name && (name++) && isdigit(*font))
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2890 {
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2891 int size = atoi(font);
2259
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2248
diff changeset
2892 #if GTK_CHECK_VERSION(3,20,0)
2260
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2259
diff changeset
2893 int len = (Italic ? (Bold ? (Italic > Bold ? (Bold - name) : (Italic - name)) : (Italic - name)) : (Bold ? (Bold - name) : strlen(name)));
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2259
diff changeset
2894 char *newname = alloca(len+1);
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2259
diff changeset
2895
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2259
diff changeset
2896 memset(newname, 0, len+1);
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2259
diff changeset
2897 strncpy(newname, name, len);
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2259
diff changeset
2898
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2259
diff changeset
2899 newfont = g_strdup_printf("%s normal %s %dpx \"%s\"", Italic ? "italic" : "normal",
cb24daa675a2 GTK3: Hopefully the last commit of the CSS font code changes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2259
diff changeset
2900 Bold ? "bold" : "normal", size, newname);
2259
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2248
diff changeset
2901 #else
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2248
diff changeset
2902 newfont = g_strdup_printf("%s %d", name, size);
5f1677cc32e9 GTK3: Switch back to Pango syntax for older GTK versions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2248
diff changeset
2903 #endif
2248
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2904 }
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2905 }
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
2906 return newfont;
1240
3bc6244279c0 Attempt at converting DW style font names on GTK for dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1232
diff changeset
2907 }
3bc6244279c0 Attempt at converting DW style font names on GTK for dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1232
diff changeset
2908
1915
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
2909 /* Internal functions to convert to GTK3 style CSS */
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
2910 static void _dw_override_color(GtkWidget *widget, const char *element, GdkRGBA *color)
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
2911 {
2242
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2912 gchar *dataname = g_strdup_printf ("_dw_color_%s", element);
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2913 GtkCssProvider *provider = g_object_get_data(G_OBJECT(widget), dataname);
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2914 GtkStyleContext *scontext = gtk_widget_get_style_context(widget);
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2915
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2916 /* If we have an old context from a previous override remove it */
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2917 if(provider)
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2918 {
2243
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2919 gtk_style_context_remove_provider(scontext, GTK_STYLE_PROVIDER(provider));
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2920 g_object_unref(provider);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2921 provider = NULL;
2242
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2922 }
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2923
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2924 /* If we have a new color, create a new provider and add it */
2243
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2925 if(color)
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2926 {
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2927 gchar *scolor = gdk_rgba_to_string(color);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2928 gchar *css = g_strdup_printf ("* { %s: %s; }", element, scolor);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2929
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2930 provider = gtk_css_provider_new();
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2931 g_free(scolor);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2932 gtk_css_provider_load_from_data(provider, css, -1, NULL);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2933 g_free(css);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2934 gtk_style_context_add_provider(scontext, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2935 }
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2936 g_object_set_data(G_OBJECT(widget), dataname, (gpointer)provider);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2937 g_free(dataname);
1915
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
2938 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
2939
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
2940 static void _dw_override_font(GtkWidget *widget, const char *font)
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
2941 {
2242
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2942 GtkCssProvider *provider = g_object_get_data(G_OBJECT(widget), "_dw_font");
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2943 GtkStyleContext *scontext = gtk_widget_get_style_context(widget);
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2944
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2945 /* If we have an old context from a previous override remove it */
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2946 if(provider)
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2947 {
2243
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2948 gtk_style_context_remove_provider(scontext, GTK_STYLE_PROVIDER(provider));
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2949 g_object_unref(provider);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2950 provider = NULL;
2242
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2951 }
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2952
0c0ad67aacb5 GTK3: Fix DW_CLR_DEFAULT support and fix a memory leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2237
diff changeset
2953 /* If we have a new font, create a new provider and add it */
2243
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2954 if(font)
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2955 {
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2956 gchar *css = g_strdup_printf ("* { font: %s; }", font);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2957
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2958 provider = gtk_css_provider_new();
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2959 gtk_css_provider_load_from_data(provider, css, -1, NULL);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2960 g_free(css);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2961 gtk_style_context_add_provider(scontext, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2962 }
8f9ffba67b7c Editor on Linux really screwed up the formatting. Purely a formatting fix commit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2242
diff changeset
2963 g_object_set_data(G_OBJECT(widget), "_dw_font", (gpointer)provider);
1915
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
2964 }
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
2965
1076
dbaf1b11c301 Added stub dw_font_set_default() functions for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1072
diff changeset
2966 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2967 * Sets the font used by a specified window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2968 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2969 * handle: The window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2970 * fontname: Name and size of the font in the form "size.fontname"
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2971 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
2972 int dw_window_set_font(HWND handle, const char *fontname)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2973 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2974 GtkWidget *handle2 = handle;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
2975 char *font = _dw_convert_font(fontname);
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
2976 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2977 gpointer data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2978
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2979 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2980 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2981 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2982 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2983 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2984 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
2985 }
1038
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
2986 /* If it is a groupox we want to operate on the frame label */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
2987 else if(GTK_IS_FRAME(handle))
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
2988 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
2989 GtkWidget *tmp = gtk_frame_get_label_widget(GTK_FRAME(handle));
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
2990 if(tmp)
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
2991 handle2 = tmp;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
2992 }
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2993 else if(GTK_IS_COMBO_BOX(handle) || GTK_IS_BUTTON(handle))
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2994 {
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2995 GtkWidget *tmp = gtk_bin_get_child(GTK_BIN(handle));
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2996 if(tmp)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2997 handle2 = tmp;
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
2998 }
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
2999
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3000 /* Free old font name if one is allocated */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3001 data = g_object_get_data(G_OBJECT(handle2), "_dw_fontname");
1240
3bc6244279c0 Attempt at converting DW style font names on GTK for dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1232
diff changeset
3002 g_object_set_data(G_OBJECT(handle2), "_dw_fontname", (gpointer)font);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3003 if(data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3004 free(data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3005
1915
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
3006 _dw_override_font(handle2, font);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3007
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3008 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3009 return TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3010 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3011
1053
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3012 /* Allows the user to choose a font using the system's font chooser dialog.
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3013 * Parameters:
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3014 * currfont: current font
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3015 * Returns:
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3016 * A malloced buffer with the selected font or NULL on error.
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3017 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
3018 char * API dw_font_choose(const char *currfont)
1053
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3019 {
1576
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3020 GtkFontChooser *fd;
1053
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3021 char *font = currfont ? strdup(currfont) : NULL;
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3022 char *name = font ? strchr(font, '.') : NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3023 int _dw_locked_by_me = FALSE;
1053
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3024 char *retfont = NULL;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
3025
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
3026 /* Detect Dynamic Windows style font name...
1053
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3027 * Format: ##.Fontname
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3028 * and convert to a Pango name
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3029 */
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3030 if(name && isdigit(*font))
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3031 {
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3032 int size = atoi(font);
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3033 *name = 0;
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3034 name++;
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3035 sprintf(font, "%s %d", name, size);
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3036 }
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3037
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3038 DW_MUTEX_LOCK;
1576
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3039 fd = (GtkFontChooser *)gtk_font_chooser_dialog_new("Choose font", NULL);
1057
0cd0089ee17d Fix issue with using/freeing the wrong variable in GTK3 font chooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1054
diff changeset
3040 if(font)
0cd0089ee17d Fix issue with using/freeing the wrong variable in GTK3 font chooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1054
diff changeset
3041 {
1576
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3042 gtk_font_chooser_set_font(fd, font);
1057
0cd0089ee17d Fix issue with using/freeing the wrong variable in GTK3 font chooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1054
diff changeset
3043 free(font);
1053
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3044 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3045
1053
0725114533fe Changes to the GTK3 font chooser... this version doesn't block the rest of the app.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1052
diff changeset
3046 gtk_widget_show(GTK_WIDGET(fd));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3047
1576
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3048 if(gtk_dialog_run(GTK_DIALOG(fd)) == GTK_RESPONSE_OK)
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3049 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3050 char *fontname = gtk_font_chooser_get_font(fd);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3051 if(fontname && (retfont = strdup(fontname)))
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3052 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3053 int len = strlen(fontname);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3054 /* Convert to Dynamic Windows format if we can... */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3055 if(len > 0 && isdigit(fontname[len-1]))
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3056 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3057 int size, x=len-1;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3058
1576
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3059 while(x > 0 && fontname[x] != ' ')
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3060 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3061 x--;
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3062 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3063 size = atoi(&fontname[x]);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3064 /* If we were able to find a valid size... */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3065 if(size > 0)
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3066 {
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3067 /* Null terminate after the name...
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3068 * and create the Dynamic Windows style font.
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3069 */
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3070 fontname[x] = 0;
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3071 snprintf(retfont, len+1, "%d.%s", size, fontname);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3072 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3073 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3074 g_free(fontname);
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3075 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3076 }
85fa989dc833 Switched to using new GtkFontChooserDialog for GTK3 since GtkFontSelectionDialog is deprecated.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1575
diff changeset
3077 gtk_widget_destroy(GTK_WIDGET(fd));
1052
c008a186b735 Added dw_font_choose() on GTK3 for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1046
diff changeset
3078 DW_MUTEX_UNLOCK;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1046
diff changeset
3079 return retfont;
c008a186b735 Added dw_font_choose() on GTK3 for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1046
diff changeset
3080 }
c008a186b735 Added dw_font_choose() on GTK3 for 2.1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1046
diff changeset
3081
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3082 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3083 * Gets the font used by a specified window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3084 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3085 * handle: The window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3086 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3087 char *dw_window_get_font(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3088 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3089 PangoFontDescription *pfont;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3090 PangoContext *pcontext;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3091 GtkWidget *handle2 = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3092 char *font;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3093 char *retfont=NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3094 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3095
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3096 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3097 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3098 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3099 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3100 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3101 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3102 }
1038
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3103 /* If it is a groupox we want to operate on the frame label */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3104 else if(GTK_IS_FRAME(handle))
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3105 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3106 GtkWidget *tmp = gtk_frame_get_label_widget(GTK_FRAME(handle));
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3107 if(tmp)
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3108 handle2 = tmp;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3109 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3110
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3111 pcontext = gtk_widget_get_pango_context( handle2 );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3112 if ( pcontext )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3113 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3114 pfont = pango_context_get_font_description( pcontext );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3115 if ( pfont )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3116 {
1038
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3117 int len, x;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
3118
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3119 font = pango_font_description_to_string( pfont );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3120 retfont = strdup(font);
1038
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3121 len = strlen(font);
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3122 /* Convert to Dynamic Windows format if we can... */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3123 if(len > 0 && isdigit(font[len-1]))
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3124 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3125 int size;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
3126
1038
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3127 x=len-1;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3128 while(x > 0 && font[x] != ' ')
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3129 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3130 x--;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3131 }
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3132 size = atoi(&font[x]);
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3133 /* If we were able to find a valid size... */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3134 if(size > 0)
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3135 {
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3136 /* Null terminate after the name...
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3137 * and create the Dynamic Windows style font.
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3138 */
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3139 font[x] = 0;
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3140 snprintf(retfont, len+1, "%d.%s", size, font);
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3141 }
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3142 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3143 g_free( font );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3144 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3145 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3146 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3147 return retfont;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3148 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3149
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3150 void _dw_free_gdk_colors(HWND handle)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3151 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3152 GdkRGBA *old = (GdkRGBA *)g_object_get_data(G_OBJECT(handle), "_dw_foregdk");
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3153
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3154 if(old)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3155 free(old);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3156
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3157 old = (GdkRGBA *)g_object_get_data(G_OBJECT(handle), "_dw_backgdk");
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3158
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3159 if(old)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3160 free(old);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3161 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3162
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3163 /* Free old color pointers and allocate new ones */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3164 static void _dw_save_gdk_colors(HWND handle, GdkRGBA fore, GdkRGBA back)
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3165 {
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3166 GdkRGBA *foregdk = malloc(sizeof(GdkRGBA));
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3167 GdkRGBA *backgdk = malloc(sizeof(GdkRGBA));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3168
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3169 _dw_free_gdk_colors(handle);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3170
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3171 *foregdk = fore;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3172 *backgdk = back;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3173
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3174 g_object_set_data(G_OBJECT(handle), "_dw_foregdk", (gpointer)foregdk);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3175 g_object_set_data(G_OBJECT(handle), "_dw_backgdk", (gpointer)backgdk);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3176 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3177
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3178 static int _dw_set_color(HWND handle, unsigned long fore, unsigned long back)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3179 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3180 /* Remember that each color component in X11 use 16 bit no matter
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3181 * what the destination display supports. (and thus GDK)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3182 */
1847
ff80ad40a5d6 Initial attempt at allowing DW_CLR_DEFAULT clear color style overrides on GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1832
diff changeset
3183 GdkRGBA forecolor = {0}, backcolor = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3184
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3185 if(fore & DW_RGB_COLOR)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3186 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3187 forecolor.alpha = 1.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3188 forecolor.red = (gdouble)DW_RED_VALUE(fore) / 255.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3189 forecolor.green = (gdouble)DW_GREEN_VALUE(fore) / 255.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3190 forecolor.blue = (gdouble)DW_BLUE_VALUE(fore) / 255.0;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3191 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3192 else if(fore != DW_CLR_DEFAULT)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3193 forecolor = _dw_colors[fore];
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3194
1915
98579be1198e Experimental change to use CSS to change widget colors on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1913
diff changeset
3195 _dw_override_color(handle, "color", fore != DW_CLR_DEFAULT ? &forecolor : NULL);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3196
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3197 if(back & DW_RGB_COLOR)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3198 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3199 backcolor.alpha = 1.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3200 backcolor.red = (gdouble)DW_RED_VALUE(back) / 255.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3201 backcolor.green = (gdouble)DW_GREEN_VALUE(back) / 255.0;
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
3202 backcolor.blue = (gdouble)DW_BLUE_VALUE(back) / 255.0;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3203 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3204 else if(back != DW_CLR_DEFAULT)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3205 backcolor = _dw_colors[back];
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3206
1916
eafaab13d0db Minor fix to that last commit, and remove call to gtk_tree_view_set_rules_hint()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1915
diff changeset
3207 _dw_override_color(handle, "background-color", back != DW_CLR_DEFAULT ? &backcolor : NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3208
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3209 _dw_save_gdk_colors(handle, forecolor, backcolor);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3210
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3211 return TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3212 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3213 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3214 * Sets the colors used by a specified window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3215 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3216 * handle: The window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3217 * fore: Foreground color in RGB format.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3218 * back: Background color in RGB format.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3219 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3220 int dw_window_set_color(HWND handle, unsigned long fore, unsigned long back)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3221 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3222 GtkWidget *handle2 = handle;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3223 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3224
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3225 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3226
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3227 if(GTK_IS_SCROLLED_WINDOW(handle) || GTK_IS_BOX(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3228 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3229 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3230 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3231 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3232 }
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
3233 else if(GTK_IS_GRID(handle))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3234 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3235 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_eventbox");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3236 if(tmp)
1637
c8a0daa53e49 In GTK 3.4 foreground colors are now inherited from the parent.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1634
diff changeset
3237 {
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3238 handle2 = tmp;
1637
c8a0daa53e49 In GTK 3.4 foreground colors are now inherited from the parent.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1634
diff changeset
3239 fore = DW_CLR_DEFAULT;
c8a0daa53e49 In GTK 3.4 foreground colors are now inherited from the parent.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1634
diff changeset
3240 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3241 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3242
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3243 _dw_set_color(handle2, fore, back);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3244
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3245 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3246 return TRUE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3247 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3248
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3249 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3250 * Sets the font used by a specified window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3251 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3252 * handle: The window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3253 * border: Size of the window border in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3254 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3255 int dw_window_set_border(HWND handle, int border)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3256 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3257 /* TODO */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3258 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3259 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3260
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3261 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3262 static GdkSeat *_dw_grab_seat = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3263 #else
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3264 static GdkDeviceManager *_dw_grab_manager = NULL;
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3265 #endif
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
3266
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3267 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3268 * Captures the mouse input to this window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3269 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3270 * handle: Handle to receive mouse input.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3271 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3272 void dw_window_capture(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3273 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3274 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3275
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3276 DW_MUTEX_LOCK;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3277 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3278 _dw_grab_seat = gdk_display_get_default_seat(gtk_widget_get_display(handle));
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3279 gdk_seat_grab (_dw_grab_seat,
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3280 gtk_widget_get_window(handle),
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3281 GDK_SEAT_CAPABILITY_ALL_POINTING,
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3282 FALSE, NULL, NULL, NULL, NULL);
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3283 #else
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3284 _dw_grab_manager = gdk_display_get_device_manager(gtk_widget_get_display(handle));
2208
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2205
diff changeset
3285 gdk_device_grab(gdk_device_manager_get_client_pointer(_dw_grab_manager),
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
3286 gtk_widget_get_window(handle),
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
3287 GDK_OWNERSHIP_WINDOW,
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3288 FALSE,
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3289 GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3290 NULL,
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
3291 GDK_CURRENT_TIME);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3292 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3293 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3294 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3295
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3296 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3297 * Changes the appearance of the mouse pointer.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3298 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3299 * handle: Handle to widget for which to change.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3300 * cursortype: ID of the pointer you want.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3301 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3302 void dw_window_set_pointer(HWND handle, int pointertype)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3303 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3304 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3305 GdkCursor *cursor;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3306
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3307 DW_MUTEX_LOCK;
976
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
3308 if(pointertype > 65535)
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
3309 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3310 GdkPixbuf *pixbuf = _dw_find_pixbuf(GINT_TO_POINTER(pointertype), NULL, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3311 cursor = gdk_cursor_new_from_pixbuf(gdk_display_get_default(), pixbuf, 8, 8);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3312 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3313 else if(!pointertype)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3314 cursor = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3315 else
1912
5035750bcc65 Fix some deprecation warnings in recent GTK3 versions...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1900
diff changeset
3316 cursor = gdk_cursor_new_for_display(gdk_display_get_default(), pointertype);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3317 if(handle && gtk_widget_get_window(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3318 gdk_window_set_cursor(gtk_widget_get_window(handle), cursor);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3319 if(cursor)
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
3320 g_object_unref(cursor);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3321 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3322 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3323
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3324 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3325 * Releases previous mouse capture.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3326 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3327 void dw_window_release(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3328 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3329 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3330
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3331 DW_MUTEX_LOCK;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3332 #if GTK_CHECK_VERSION(3,20,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3333 if(_dw_grab_seat)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3334 gdk_seat_ungrab(_dw_grab_seat);
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
3335 _dw_grab_seat = NULL;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3336 #else
2208
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2205
diff changeset
3337 gdk_device_ungrab(gdk_device_manager_get_client_pointer(_dw_grab_manager), GDK_CURRENT_TIME);
3343ae3ac327 GTK3: Fixes for building prior on GTK 3.20 and earlier.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2205
diff changeset
3338 _dw_grab_manager = NULL;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3339 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3340 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3341 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3342
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3343 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3344 * Create a new Window Frame.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3345 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3346 * owner: The Owner's window handle or HWND_DESKTOP.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3347 * title: The Window title.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3348 * flStyle: Style flags, see the PM reference.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3349 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
3350 HWND dw_window_new(HWND hwndOwner, const char *title, unsigned long flStyle)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3351 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3352 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3353 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3354 int flags = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3355
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3356 DW_MUTEX_LOCK;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
3357 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3358 if(hwndOwner && GTK_IS_MDI(hwndOwner))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3359 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3360 GtkWidget *label;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3361
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3362 tmp = dw_box_new(DW_VERT, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3363
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3364 label = gtk_label_new(title);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3365 gtk_widget_show(label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3366 g_object_set_data(G_OBJECT(tmp), "_dw_mdi_child", GINT_TO_POINTER(1));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3367 g_object_set_data(G_OBJECT(tmp), "_dw_mdi_title", (gpointer)label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3368 g_object_set_data(G_OBJECT(tmp), "_dw_mdi", (gpointer)hwndOwner);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3369
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3370 gtk_mdi_put(GTK_MDI(hwndOwner), tmp, 100, 75, label);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3371 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3372 else
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
3373 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3374 {
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3375 GtkWidget *box = dw_box_new(DW_VERT, 0);
1452
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3376 GtkWidget *grid = gtk_grid_new();
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3377
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3378 gtk_widget_show_all(grid);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3379
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
3380 tmp = gtk_window_new(GTK_WINDOW_TOPLEVEL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3381
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3382 gtk_window_set_title(GTK_WINDOW(tmp), title);
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
3383 gtk_window_set_resizable(GTK_WINDOW(tmp), (flStyle & DW_FCF_SIZEBORDER) ? TRUE : FALSE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3384
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3385 gtk_widget_realize(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3386
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3387 if(flStyle & DW_FCF_TITLEBAR)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3388 flags |= GDK_DECOR_TITLE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3389
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3390 if(flStyle & DW_FCF_MINMAX)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3391 flags |= GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3392
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3393 if(flStyle & DW_FCF_SIZEBORDER)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3394 flags |= GDK_DECOR_RESIZEH | GDK_DECOR_BORDER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3395
1491
d77b8cf25f04 Code cleanup and removed some erroneous code for GTK in dw_window_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1486
diff changeset
3396 if(flStyle & (DW_FCF_BORDER | DW_FCF_DLGBORDER))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3397 flags |= GDK_DECOR_BORDER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3398
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3399 if(flStyle & DW_FCF_FULLSCREEN)
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3400 gtk_window_fullscreen(GTK_WINDOW(tmp));
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3401 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3402 {
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3403 if(flStyle & DW_FCF_MAXIMIZE)
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3404 gtk_window_maximize(GTK_WINDOW(tmp));
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3405
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3406 if(flStyle & DW_FCF_MINIMIZE)
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3407 gtk_window_iconify(GTK_WINDOW(tmp));
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3408 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3409
1388
8fe15c1648c9 Fix windows on GTK that aren't supposed to have a close button..
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1386
diff changeset
3410 /* Either the CLOSEBUTTON or SYSMENU flags should make it deletable */
1491
d77b8cf25f04 Code cleanup and removed some erroneous code for GTK in dw_window_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1486
diff changeset
3411 gtk_window_set_deletable(GTK_WINDOW(tmp), (flStyle & (DW_FCF_CLOSEBUTTON | DW_FCF_SYSMENU)) ? TRUE : FALSE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3412
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3413 gdk_window_set_decorations(gtk_widget_get_window(tmp), flags);
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
3414 if(!flags)
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
3415 gtk_window_set_decorated(GTK_WINDOW(tmp), FALSE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3416
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3417 if(hwndOwner)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3418 gdk_window_reparent(gtk_widget_get_window(GTK_WIDGET(tmp)), gtk_widget_get_window(GTK_WIDGET(hwndOwner)), 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3419
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3420 if(flStyle & DW_FCF_SIZEBORDER)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3421 g_object_set_data(G_OBJECT(tmp), "_dw_size", GINT_TO_POINTER(1));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3422
1452
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3423 gtk_grid_attach(GTK_GRID(grid), box, 0, 1, 1, 1);
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3424 gtk_container_add(GTK_CONTAINER(tmp), grid);
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3425 g_object_set_data(G_OBJECT(tmp), "_dw_boxhandle", (gpointer)box);
1452
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3426 g_object_set_data(G_OBJECT(tmp), "_dw_grid", (gpointer)grid);
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
3427 gtk_widget_add_events(GTK_WIDGET(tmp), GDK_PROPERTY_CHANGE_MASK);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3428 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3429 g_object_set_data(G_OBJECT(tmp), "_dw_style", GINT_TO_POINTER(flStyle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3430 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3431 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3432 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3433
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3434 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3435 * Create a new Box to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3436 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3437 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3438 * pad: Number of pixels to pad around the box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3439 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3440 HWND dw_box_new(int type, int pad)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3441 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3442 GtkWidget *tmp, *eventbox;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3443 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3444
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3445 DW_MUTEX_LOCK;
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
3446 tmp = gtk_grid_new();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3447 eventbox = gtk_event_box_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3448
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3449 gtk_widget_show(eventbox);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3450 g_object_set_data(G_OBJECT(tmp), "_dw_eventbox", (gpointer)eventbox);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3451 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3452 g_object_set_data(G_OBJECT(tmp), "_dw_boxpad", GINT_TO_POINTER(pad));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3453 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3454 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3455 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3456 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3457
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3458 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3459 * Create a new scrollable Box to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3460 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3461 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3462 * pad: Number of pixels to pad around the box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3463 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3464 HWND dw_scrollbox_new( int type, int pad )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3465 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3466 GtkWidget *tmp, *box, *eventbox;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3467 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3468
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3469 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3470 tmp = gtk_scrolled_window_new(NULL, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3471 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (tmp), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3472
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
3473 box = gtk_grid_new();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3474 eventbox = gtk_event_box_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3475
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3476 gtk_widget_show(eventbox);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3477 g_object_set_data(G_OBJECT(box), "_dw_eventbox", (gpointer)eventbox);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3478 g_object_set_data(G_OBJECT(box), "_dw_boxtype", GINT_TO_POINTER(type));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3479 g_object_set_data(G_OBJECT(box), "_dw_boxpad", GINT_TO_POINTER(pad));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3480 g_object_set_data(G_OBJECT(tmp), "_dw_boxhandle", (gpointer)box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3481
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
3482 #if GTK_CHECK_VERSION(3,8,0)
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
3483 gtk_container_add(GTK_CONTAINER(tmp), box);
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
3484 #else
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3485 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(tmp),box);
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
3486 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3487 g_object_set_data(G_OBJECT(tmp), "_dw_user", box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3488 gtk_widget_show(box);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3489 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3490
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3491 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3492 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3493 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3494
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3495 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3496 * Returns the position of the scrollbar in the scrollbox
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3497 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3498 * handle: Handle to the scrollbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3499 * orient: The vertical or horizontal scrollbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3500 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3501 int dw_scrollbox_get_pos(HWND handle, int orient)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3502 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3503 int val = -1, _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3504 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3505
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3506 if (!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3507 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3508
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3509 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3510 if ( orient == DW_HORZ )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3511 adjustment = gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3512 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3513 adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3514 if (adjustment)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3515 val = _dw_round_value(gtk_adjustment_get_value(adjustment));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3516 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3517 return val;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3518 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3519
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3520 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3521 * Gets the range for the scrollbar in the scrollbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3522 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3523 * handle: Handle to the scrollbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3524 * orient: The vertical or horizontal scrollbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3525 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3526 int API dw_scrollbox_get_range(HWND handle, int orient)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3527 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3528 int range = -1, _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3529 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3530
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3531 if (!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3532 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3533
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3534 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3535 if ( orient == DW_HORZ )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3536 adjustment = gtk_scrolled_window_get_hadjustment( GTK_SCROLLED_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3537 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3538 adjustment = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(handle) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3539 if (adjustment)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3540 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3541 range = _dw_round_value(gtk_adjustment_get_upper(adjustment));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3542 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3543 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3544 return range;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3545 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3546
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3547 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3548 * Create a new Group Box to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3549 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3550 * type: Either DW_VERT (vertical) or DW_HORZ (horizontal).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3551 * pad: Number of pixels to pad around the box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3552 * title: Text to be displayined in the group outline.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3553 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
3554 HWND dw_groupbox_new(int type, int pad, const char *title)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3555 {
1038
2c2fcfeeffcc Attempt at making dw_window_get_font() return a Dynamic Windows style font name on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1022
diff changeset
3556 GtkWidget *tmp, *frame;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3557 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3558
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3559 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3560 frame = gtk_frame_new(NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3561 gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3562 gtk_frame_set_label(GTK_FRAME(frame), title && *title ? title : NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3563
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
3564 tmp = gtk_grid_new();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3565 gtk_container_set_border_width(GTK_CONTAINER(tmp), pad);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3566 g_object_set_data(G_OBJECT(tmp), "_dw_boxtype", GINT_TO_POINTER(type));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3567 g_object_set_data(G_OBJECT(tmp), "_dw_boxpad", GINT_TO_POINTER(pad));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3568 g_object_set_data(G_OBJECT(frame), "_dw_boxhandle", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3569 gtk_container_add(GTK_CONTAINER(frame), tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3570 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3571 gtk_widget_show(frame);
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
3572 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
3573 dw_window_set_font(frame, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3574 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3575 return frame;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3576 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3577
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
3578 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3579 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3580 * Create a new MDI Frame to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3581 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3582 * id: An ID to be used with dw_window_from_id or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3583 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3584 HWND dw_mdi_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3585 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3586 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3587 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3588
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3589 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3590 tmp = gtk_mdi_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3591 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3592 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3593 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3594 }
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
3595 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3596
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3597 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3598 * Create a bitmap object to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3599 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3600 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3601 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3602 HWND dw_bitmap_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3603 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3604 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3605 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3606
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3607 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3608 tmp = gtk_image_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3609 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3610 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3611 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3612 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3613 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3614
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3615 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3616 * Create a notebook object to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3617 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3618 * id: An ID to be used for getting the resource from the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3619 * resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3620 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3621 HWND dw_notebook_new(unsigned long id, int top)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3622 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3623 GtkWidget *tmp, **pagearray = calloc(sizeof(GtkWidget *), 256);
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3624 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3625
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3626 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3627 tmp = gtk_notebook_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3628 if(top)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3629 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_TOP);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3630 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3631 gtk_notebook_set_tab_pos(GTK_NOTEBOOK(tmp), GTK_POS_BOTTOM);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3632 gtk_notebook_set_scrollable(GTK_NOTEBOOK(tmp), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3633 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3634 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3635 g_object_set_data(G_OBJECT(tmp), "_dw_pagearray", (gpointer)pagearray);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3636 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3637 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3638 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3639
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3640 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3641 * Create a menu object to be popped up.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3642 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3643 * id: An ID to be used for getting the resource from the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3644 * resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3645 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3646 HMENUI dw_menu_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3647 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3648 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3649 GtkAccelGroup *accel_group;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3650 HMENUI tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3651
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3652 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3653 tmp = gtk_menu_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3654 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3655 accel_group = gtk_accel_group_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3656 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3657 g_object_set_data(G_OBJECT(tmp), "_dw_accel", (gpointer)accel_group);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3658 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3659 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3660 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3661
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3662 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3663 * Create a menubar on a window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3664 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3665 * location: Handle of a window frame to be attached to.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3666 * If there is no box already packed into the "location", the menu will not appear
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3667 * so tell the user.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3668 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3669 HMENUI dw_menubar_new(HWND location)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3670 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3671 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3672 GtkAccelGroup *accel_group;
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3673 GtkWidget *box;
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3674 HMENUI tmp = 0;
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3675
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3676 DW_MUTEX_LOCK;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3677 if(GTK_IS_WINDOW(location) &&
1452
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3678 (box = (GtkWidget *)g_object_get_data(G_OBJECT(location), "_dw_grid")))
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3679 {
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3680 /* If there is an existing menu bar, remove it */
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3681 GtkWidget *oldmenu = (GtkWidget *)g_object_get_data(G_OBJECT(location), "_dw_menubar");
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3682 if(oldmenu)
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3683 gtk_widget_destroy(oldmenu);
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3684 /* Create a new menu bar */
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3685 tmp = gtk_menu_bar_new();
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3686 gtk_widget_show(tmp);
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3687 accel_group = gtk_accel_group_new();
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3688 g_object_set_data(G_OBJECT(tmp), "_dw_accel", (gpointer)accel_group);
1452
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3689 /* Save pointers to each other */
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3690 g_object_set_data(G_OBJECT(location), "_dw_menubar", (gpointer)tmp);
1452
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3691 g_object_set_data(G_OBJECT(tmp), "_dw_window", (gpointer)location);
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3692 gtk_grid_attach(GTK_GRID(box), tmp, 0, 0, 1, 1);
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
3693 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3694 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3695 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3696 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3697
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3698 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3699 * Destroys a menu created with dw_menubar_new or dw_menu_new.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3700 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3701 * menu: Handle of a menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3702 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3703 void dw_menu_destroy(HMENUI *menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3704 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3705 if(menu && *menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3706 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3707 int _dw_locked_by_me = FALSE;
1452
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3708 GtkWidget *window;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3709
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3710 DW_MUTEX_LOCK;
1452
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3711 /* If it is a menu bar, try to delete the reference to it */
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3712 if(GTK_IS_MENU_BAR(*menu) &&
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3713 (window = (GtkWidget *)g_object_get_data(G_OBJECT(*menu), "_dw_window")))
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3714 g_object_set_data(G_OBJECT(window), "_dw_menubar", NULL);
dbe16031ffb4 Changes for GTK to make top-level windows act more like on other platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1451
diff changeset
3715 /* Actually destroy the menu */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3716 gtk_widget_destroy(*menu);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3717 *menu = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3718 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3719 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3720 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3721
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3722 char _dw_removetilde(char *dest, const char *src)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3723 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3724 int z, cur=0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3725 char accel = '\0';
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3726
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3727 for(z=0;z<strlen(src);z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3728 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3729 if(src[z] != '~')
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3730 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3731 dest[cur] = src[z];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3732 cur++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3733 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3734 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3735 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3736 dest[cur] = '_';
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3737 accel = src[z+1];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3738 cur++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3739 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3740 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3741 dest[cur] = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3742 return accel;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3743 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3744
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3745 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3746 * Adds a menuitem or submenu to an existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3747 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3748 * menu: The handle to the existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3749 * title: The title text on the menu item to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3750 * id: An ID to be used for message passing.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3751 * flags: Extended attributes to set on the menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3752 * end: If TRUE memu is positioned at the end of the menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3753 * check: If TRUE menu is "check"able.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3754 * submenu: Handle to an existing menu to be a submenu or NULL.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3755 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
3756 HWND dw_menu_append_item(HMENUI menu, const char *title, unsigned long id, unsigned long flags, int end, int check, HMENUI submenu)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3757 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3758 GtkWidget *tmphandle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3759 char accel, *tempbuf = malloc(strlen(title)+1);
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3760 int _dw_locked_by_me = FALSE, submenucount;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3761 GtkAccelGroup *accel_group;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3762
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3763 if (!menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3764 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3765 free(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3766 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3767 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3768
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3769 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3770 accel = _dw_removetilde(tempbuf, title);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3771
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3772 accel_group = (GtkAccelGroup *)g_object_get_data(G_OBJECT(menu), "_dw_accel");
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
3773 submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu), "_dw_submenucount"));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3774
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3775 if (strlen(tempbuf) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3776 tmphandle=gtk_menu_item_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3777 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3778 {
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
3779 char numbuf[25] = {0};
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
3780
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3781 if (check)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3782 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3783 tmphandle = gtk_check_menu_item_new_with_label(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3784 if (accel && accel_group)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3785 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3786 gtk_label_set_use_underline(GTK_LABEL(gtk_bin_get_child(GTK_BIN(tmphandle))), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3787 #if 0 /* TODO: This isn't working right */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3788 gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3789 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3790 }
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
3791 snprintf(numbuf, 24, "%lu", id);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3792 g_object_set_data(G_OBJECT(menu), numbuf, (gpointer)tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3793 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3794 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3795 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3796 tmphandle=gtk_menu_item_new_with_label(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3797 if (accel && accel_group)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3798 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3799 gtk_label_set_use_underline(GTK_LABEL(gtk_bin_get_child(GTK_BIN(tmphandle))), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3800 #if 0 /* TODO: This isn't working right */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3801 gtk_widget_add_accelerator(tmphandle, "activate", accel_group, tmp_key, GDK_MOD1_MASK, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3802 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3803 }
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
3804 snprintf(numbuf, 24, "%lu", id);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3805 g_object_set_data(G_OBJECT(menu), numbuf, (gpointer)tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3806 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3807 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3808
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3809 gtk_widget_show(tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3810
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3811 if (submenu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3812 {
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
3813 char tempbuf[101] = {0};
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
3814
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
3815 snprintf(tempbuf, 100, "_dw_submenu%d", submenucount);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3816 submenucount++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3817 gtk_menu_item_set_submenu(GTK_MENU_ITEM(tmphandle), submenu);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3818 g_object_set_data(G_OBJECT(menu), tempbuf, (gpointer)submenu);
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
3819 g_object_set_data(G_OBJECT(menu), "_dw_submenucount", GINT_TO_POINTER(submenucount));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3820 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3821
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3822 if (GTK_IS_MENU_BAR(menu))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3823 gtk_menu_shell_append(GTK_MENU_SHELL(menu), tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3824 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3825 gtk_menu_shell_append(GTK_MENU_SHELL(menu), tmphandle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3826
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3827 g_object_set_data(G_OBJECT(tmphandle), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3828 free(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3829 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3830 * Set flags
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3831 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3832 if ( check && (flags & DW_MIS_CHECKED) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3833 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3834 _dw_ignore_click = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3835 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(tmphandle), 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3836 _dw_ignore_click = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3837 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3838
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3839 if ( flags & DW_MIS_DISABLED )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3840 gtk_widget_set_sensitive( tmphandle, FALSE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3841
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3842 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3843 return tmphandle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3844 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3845
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3846 GtkWidget *_dw_find_submenu_id(GtkWidget *start, const char *name)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3847 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3848 GtkWidget *tmp;
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
3849 int z, submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(start), "_dw_submenucount"));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3850
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3851 if((tmp = g_object_get_data(G_OBJECT(start), name)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3852 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3853
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3854 for(z=0;z<submenucount;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3855 {
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
3856 char tempbuf[101] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3857 GtkWidget *submenu, *menuitem;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3858
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
3859 snprintf(tempbuf, 100, "_dw_submenu%d", z);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3860
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3861 if((submenu = g_object_get_data(G_OBJECT(start), tempbuf)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3862 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3863 if((menuitem = _dw_find_submenu_id(submenu, name)))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3864 return menuitem;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3865 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3866 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3867 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3868 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3869
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3870 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3871 * Sets the state of a menu item check.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3872 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3873 * menu: The handle the the existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3874 * id: Menuitem id.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3875 * check: TRUE for checked FALSE for not checked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3876 * deprecated: use dw_menu_item_set_state()
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3877 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3878 void dw_menu_item_set_check(HMENUI menu, unsigned long id, int check)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3879 {
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
3880 char numbuf[25] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3881 GtkWidget *tmphandle;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3882 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3883
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3884 if(!menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3885 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3886
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3887 DW_MUTEX_LOCK;
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
3888 snprintf(numbuf, 24, "%lu", id);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3889 tmphandle = _dw_find_submenu_id(menu, numbuf);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3890
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3891 if(tmphandle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3892 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3893 _dw_ignore_click = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3894 if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(tmphandle)) != check)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3895 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(tmphandle), check);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3896 _dw_ignore_click = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3897 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3898 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3899 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3900
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3901 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3902 * Sets the state of a menu item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3903 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3904 * menu: The handle the the existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3905 * id: Menuitem id.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3906 * state: TRUE for checked FALSE for not checked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3907 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3908 void dw_menu_item_set_state(HMENUI menu, unsigned long id, unsigned long state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3909 {
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
3910 char numbuf[25] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3911 GtkWidget *tmphandle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3912 int check;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3913 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3914
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3915 if(!menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3916 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3917
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3918 DW_MUTEX_LOCK;
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
3919 snprintf(numbuf, 24, "%lu", id);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3920 tmphandle = _dw_find_submenu_id(menu, numbuf);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3921
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3922 if ( (state & DW_MIS_CHECKED) || (state & DW_MIS_UNCHECKED) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3923 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3924 if ( state & DW_MIS_CHECKED )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3925 check = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3926 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3927 check = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3928
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3929 if (tmphandle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3930 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3931 _dw_ignore_click = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3932 if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(tmphandle)) != check)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3933 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(tmphandle), check);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3934 _dw_ignore_click = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3935 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3936 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3937 if ( (state & DW_MIS_ENABLED) || (state & DW_MIS_DISABLED) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3938 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3939 if (tmphandle )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3940 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3941 _dw_ignore_click = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3942 if ( state & DW_MIS_ENABLED )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3943 gtk_widget_set_sensitive( tmphandle, TRUE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3944 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3945 gtk_widget_set_sensitive( tmphandle, FALSE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3946 _dw_ignore_click = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3947 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3948 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3949 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3950 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3951
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3952 /*
1373
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3953 * Deletes the menu item specified.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3954 * Parameters:
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3955 * menu: The handle to the menu in which the item was appended.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3956 * id: Menuitem id.
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
3957 * Returns:
1373
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3958 * DW_ERROR_NONE (0) on success or DW_ERROR_UNKNOWN on failure.
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3959 */
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3960 int API dw_menu_delete_item(HMENUI menu, unsigned long id)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3961 {
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
3962 char numbuf[25] = {0};
1373
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3963 GtkWidget *tmphandle;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3964 int _dw_locked_by_me = FALSE;
1373
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3965 int ret = DW_ERROR_UNKNOWN;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3966
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3967 if(!menu)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3968 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3969
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3970 DW_MUTEX_LOCK;
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
3971 snprintf(numbuf, 24, "%lu", id);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
3972 tmphandle = _dw_find_submenu_id(menu, numbuf);
1373
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3973
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3974 if(tmphandle)
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3975 {
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3976 gtk_widget_destroy(tmphandle);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3977 g_object_set_data(G_OBJECT(menu), numbuf, NULL);
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3978 ret = DW_ERROR_NONE;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3979 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3980 DW_MUTEX_UNLOCK;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3981 return ret;
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3982 }
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3983
bad3e17ab6e5 Implemented dw_menu_delete_item() for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1358
diff changeset
3984 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3985 * Pops up a context menu at given x and y coordinates.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3986 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3987 * menu: The handle the the existing menu.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3988 * parent: Handle to the window initiating the popup.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3989 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3990 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3991 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3992 void dw_menu_popup(HMENUI *menu, HWND parent, int x, int y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3993 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
3994 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3995
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3996 if(!menu || !*menu)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3997 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
3998
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
3999 _dw_popup = parent;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4000
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4001 DW_MUTEX_LOCK;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
4002 #if GTK_CHECK_VERSION(3,22,0)
1931
3a5571255ee6 GTK3: dw_menu_popup() on GTK has always ignored the coordinate paramaters
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1930
diff changeset
4003 gtk_menu_popup_at_pointer(GTK_MENU(*menu), NULL);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
4004 #else
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4005 gtk_menu_popup(GTK_MENU(*menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
4006 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4007 *menu = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4008 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4009 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4010
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4011
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4012 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4013 * Returns the current X and Y coordinates of the mouse pointer.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4014 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4015 * x: Pointer to variable to store X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4016 * y: Pointer to variable to store Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4017 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4018 void dw_pointer_query_pos(long *x, long *y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4019 {
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
4020 int gx = 0, gy = 0;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
4021 #ifdef GDK_WINDOWING_X11
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
4022 GdkModifierType state = 0;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4023 int _dw_locked_by_me = FALSE;
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
4024 GdkDisplay *display;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4025
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4026 DW_MUTEX_LOCK;
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
4027 display = gdk_display_get_default();
2342
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4028
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4029 if(display && GDK_IS_X11_DISPLAY(display))
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4030 {
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
4031 #if GTK_CHECK_VERSION(3,20,0)
2342
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4032 GdkSeat *seat = gdk_display_get_default_seat(display);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4033 GdkDevice *device = gdk_seat_get_pointer(seat);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
4034 #else
2342
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4035 GdkDeviceManager *manager = gdk_display_get_device_manager(display);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4036 GdkDevice *device = gdk_device_manager_get_client_pointer(manager);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4037 #endif
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4038 gdk_window_get_device_position(gdk_x11_window_lookup_for_display(display, GDK_ROOT_WINDOW()),
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4039 device, &gx, &gy, &state);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4040 }
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
4041 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4042 #endif
1122
e52c710e6d08 Minor change to allow dw_pointer_query_pos() to take NULL paramaters on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1121
diff changeset
4043 if(x)
e52c710e6d08 Minor change to allow dw_pointer_query_pos() to take NULL paramaters on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1121
diff changeset
4044 *x = gx;
e52c710e6d08 Minor change to allow dw_pointer_query_pos() to take NULL paramaters on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1121
diff changeset
4045 if(y)
e52c710e6d08 Minor change to allow dw_pointer_query_pos() to take NULL paramaters on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1121
diff changeset
4046 *y = gy;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4047 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4048
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4049 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4050 * Sets the X and Y coordinates of the mouse pointer.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4051 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4052 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4053 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4054 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4055 void dw_pointer_set_pos(long x, long y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4056 {
2342
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4057 #ifdef GDK_WINDOWING_X11
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4058 int _dw_locked_by_me = FALSE;
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
4059 GdkDisplay *display;
2342
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4060
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4061 DW_MUTEX_LOCK;
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
4062 display = gdk_display_get_default();
2342
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4063
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4064 if(display && GDK_IS_X11_DISPLAY(display))
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4065 {
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
4066 #if GTK_CHECK_VERSION(3,20,0)
2342
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4067 GdkSeat *seat = gdk_display_get_default_seat(display);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4068 GdkDevice *device = gdk_seat_get_pointer(seat);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
4069 #else
2342
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4070 GdkDeviceManager *manager = gdk_display_get_device_manager(display);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4071 GdkDevice *device = gdk_device_manager_get_client_pointer(manager);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4072 #endif
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4073 gdk_device_warp(device, gdk_screen_get_default(), x, y);
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4074 }
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4075 DW_MUTEX_UNLOCK;
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
4076 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4077 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4078
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4079 #define _DW_TREE_CONTAINER 1
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4080 #define _DW_TREE_TREE 2
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4081 #define _DW_TREE_LISTBOX 3
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4082
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4083 GtkWidget *_dw_tree_create(unsigned long id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4084 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4085 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4086
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4087 tmp = gtk_scrolled_window_new(NULL, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4088 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (tmp),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4089 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4090
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4091 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4092 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4093 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4094 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4095
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4096 GtkWidget *_dw_tree_setup(GtkWidget *tmp, GtkTreeModel *store)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4097 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4098 GtkWidget *tree = gtk_tree_view_new_with_model(store);
900
2ba1f71e23fa Disable searching in GTK tree view based controls. It is very disconcerting.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 892
diff changeset
4099 gtk_tree_view_set_enable_search(GTK_TREE_VIEW(tree), FALSE);
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
4100 #if GTK_CHECK_VERSION(3,8,0)
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
4101 gtk_container_add(GTK_CONTAINER(tmp), tree);
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
4102 #else
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4103 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(tmp), tree);
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
4104 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4105 g_object_set_data(G_OBJECT(tmp), "_dw_user", (gpointer)tree);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4106 return tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4107 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4108
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4109 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4110 * Create a container object to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4111 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4112 * id: An ID to be used for getting the resource from the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4113 * resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4114 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4115 HWND dw_container_new(unsigned long id, int multi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4116 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4117 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4118 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4119
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4120 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4121 if(!(tmp = _dw_tree_create(id)))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4122 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4123 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4124 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4125 }
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
4126 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4127 g_object_set_data(G_OBJECT(tmp), "_dw_multi_sel", GINT_TO_POINTER(multi));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4128 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4129 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4130 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4131
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4132 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4133 * Create a tree object to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4134 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4135 * id: An ID to be used for getting the resource from the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4136 * resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4137 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4138 HWND dw_tree_new(ULONG id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4139 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4140 GtkWidget *tmp, *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4141 GtkTreeStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4142 GtkTreeViewColumn *col;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4143 GtkCellRenderer *rend;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4144 GtkTreeSelection *sel;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4145 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4146
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4147 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4148 if(!(tmp = _dw_tree_create(id)))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4149 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4150 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4151 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4152 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4153 store = gtk_tree_store_new(4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_POINTER);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4154 tree = _dw_tree_setup(tmp, GTK_TREE_MODEL(store));
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
4155 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE));
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
4156 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4157 col = gtk_tree_view_column_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4158
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4159 rend = gtk_cell_renderer_pixbuf_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4160 gtk_tree_view_column_pack_start(col, rend, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4161 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4162 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4163 gtk_tree_view_column_pack_start(col, rend, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4164 gtk_tree_view_column_add_attribute(col, rend, "text", 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4165
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4166 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4167 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4168 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4169
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4170 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4171 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4172 gtk_widget_show(tree);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4173
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4174 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4175 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4176 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4177 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4178 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4179
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4180
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4181 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4182 * Create a new static text window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4183 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4184 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4185 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4186 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4187 HWND dw_text_new(const char *text, unsigned long id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4188 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4189 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4190 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4191
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4192 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4193 tmp = gtk_label_new(text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4194
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4195 /* Left and centered */
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
4196 #if GTK_CHECK_VERSION(3,16,0)
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
4197 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f);
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
4198 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f);
1917
933b5f7005a9 Fix building on GTK3 versions older than 3.16.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1916
diff changeset
4199 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1916
diff changeset
4200 gtk_misc_set_alignment(GTK_MISC(tmp), 0.0f, 0.5f);
933b5f7005a9 Fix building on GTK3 versions older than 3.16.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1916
diff changeset
4201 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4202 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4203 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4204 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4205 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4206 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4207 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4208 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4209
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4210 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4211 * Create a new status text window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4212 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4213 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4214 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4215 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4216 HWND dw_status_text_new(const char *text, ULONG id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4217 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4218 GtkWidget *tmp, *frame;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4219 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4220
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4221 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4222 frame = gtk_frame_new(NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4223 gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4224 tmp = gtk_label_new(text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4225 gtk_container_add(GTK_CONTAINER(frame), tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4226 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4227 gtk_widget_show(frame);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4228
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4229 /* Left and centered */
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
4230 #if GTK_CHECK_VERSION(3,16,0)
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
4231 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f);
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
4232 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f);
1917
933b5f7005a9 Fix building on GTK3 versions older than 3.16.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1916
diff changeset
4233 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1916
diff changeset
4234 gtk_misc_set_alignment(GTK_MISC(tmp), 0.0f, 0.5f);
933b5f7005a9 Fix building on GTK3 versions older than 3.16.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1916
diff changeset
4235 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4236 g_object_set_data(G_OBJECT(frame), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4237 g_object_set_data(G_OBJECT(frame), "_dw_label", (gpointer)tmp);
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4238 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4239 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4240 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4241 return frame;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4242 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4243
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4244 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4245 * Create a new Multiline Editbox window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4246 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4247 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4248 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4249 HWND dw_mle_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4250 {
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
4251 GtkWidget *tmp, *tmpbox;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4252 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4253
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4254 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4255 tmpbox = gtk_scrolled_window_new (NULL, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4256 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW(tmpbox),
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4257 GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4258 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(tmpbox), GTK_SHADOW_ETCHED_IN);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4259 tmp = gtk_text_view_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4260 gtk_container_add (GTK_CONTAINER(tmpbox), tmp);
1545
6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1539
diff changeset
4261 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), GTK_WRAP_WORD);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4262
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4263 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4264 g_object_set_data(G_OBJECT(tmpbox), "_dw_user", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4265 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4266 gtk_widget_show(tmpbox);
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4267 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4268 dw_window_set_font(tmpbox, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4269 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4270 return tmpbox;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4271 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4272
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4273 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4274 * Create a new Entryfield window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4275 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4276 * text: The default text to be in the entryfield widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4277 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4278 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4279 HWND dw_entryfield_new(const char *text, unsigned long id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4280 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4281 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4282 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4283
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4284 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4285 tmp = gtk_entry_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4286
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4287 gtk_entry_set_text(GTK_ENTRY(tmp), text);
1352
08de3c1f4ae4 Fix entryfields, comboboxes etc being too wide in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1330
diff changeset
4288 gtk_entry_set_width_chars(GTK_ENTRY(tmp), 0);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4289
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4290 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4291 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4292
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4293 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4294 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4295 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4296 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4297 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4298
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4299 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4300 * Create a new Entryfield (password) window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4301 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4302 * text: The default text to be in the entryfield widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4303 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4304 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4305 HWND dw_entryfield_password_new(const char *text, ULONG id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4306 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4307 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4308 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4309
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4310 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4311 tmp = gtk_entry_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4312
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4313 gtk_entry_set_visibility(GTK_ENTRY(tmp), FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4314 gtk_entry_set_text(GTK_ENTRY(tmp), text);
1352
08de3c1f4ae4 Fix entryfields, comboboxes etc being too wide in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1330
diff changeset
4315 gtk_entry_set_width_chars(GTK_ENTRY(tmp), 0);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4316
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4317 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4318 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4319
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4320 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4321 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4322 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4323 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4324 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4325
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4326 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4327 * Create a new Combobox window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4328 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4329 * text: The default text to be in the combpbox widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4330 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4331 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4332 HWND dw_combobox_new(const char *text, unsigned long id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4333 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4334 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4335 GtkListStore *store;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4336 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4337
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4338 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4339 store = gtk_list_store_new(1, G_TYPE_STRING);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4340 tmp = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store));
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
4341 gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(tmp), 0);
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
4342 gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(tmp))), text);
1352
08de3c1f4ae4 Fix entryfields, comboboxes etc being too wide in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1330
diff changeset
4343 gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(tmp))), 0);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4344 gtk_widget_show(tmp);
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
4345 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_COMBOBOX));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4346 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4347 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4348 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4349 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4350 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4351 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4352
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4353 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4354 * Create a new button window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4355 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4356 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4357 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4358 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4359 HWND dw_button_new(const char *text, unsigned long id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4360 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4361 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4362 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4363
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4364 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4365 tmp = gtk_button_new_with_label(text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4366 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4367 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4368 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4369 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4370 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4371 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4372 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4373
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4374 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4375 * Create a new bitmap button window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4376 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4377 * text: Bubble help text to be displayed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4378 * id: An ID of a bitmap in the resource file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4379 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4380 HWND dw_bitmapbutton_new(const char *text, unsigned long id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4381 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4382 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4383 GtkWidget *bitmap;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4384 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4385
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4386 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4387 tmp = gtk_button_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4388 bitmap = dw_bitmap_new(id);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4389
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4390 if(bitmap)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4391 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4392 dw_window_set_bitmap(bitmap, id, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4393 gtk_container_add (GTK_CONTAINER(tmp), bitmap);
1069
a1deca9b0876 Attempt at scaling bitmaps if they are too big for where they are packed on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1066
diff changeset
4394 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4395 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4396 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4397 if(text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4398 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4399 gtk_widget_set_tooltip_text(tmp, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4400 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4401 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4402 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4403 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4404 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4405
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4406 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4407 * Create a new bitmap button window (widget) to be packed from a file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4408 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4409 * label_text: Text to display on button. TBD when Windows works
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4410 * text: Bubble help text to be displayed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4411 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4412 * filename: Name of the file, omit extention to have
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4413 * DW pick the appropriate file extension.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4414 * (BMP on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4415 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4416 HWND dw_bitmapbutton_new_from_file(const char *text, unsigned long id, const char *filename)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4417 {
1830
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1823
diff changeset
4418 GtkWidget *tmp;
1831
ce7543633fef Slight typo in that last commit fixed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1830
diff changeset
4419 GtkWidget *bitmap;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4420 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4421
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4422 DW_MUTEX_LOCK;
1069
a1deca9b0876 Attempt at scaling bitmaps if they are too big for where they are packed on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1066
diff changeset
4423 /* Create a new button */
1830
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1823
diff changeset
4424 tmp = gtk_button_new();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4425 /* Now on to the image stuff */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4426 bitmap = dw_bitmap_new(id);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4427 if(bitmap)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4428 {
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4429 dw_window_set_bitmap(bitmap, 0, filename);
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4430 gtk_container_add(GTK_CONTAINER(tmp), bitmap);
1830
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1823
diff changeset
4431 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap);
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1823
diff changeset
4432 }
1832
cd4ff1eb34a3 Accidentally removed a very important line from GTK 3.x.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1831
diff changeset
4433 gtk_widget_show(tmp);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4434 if(text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4435 {
1830
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1823
diff changeset
4436 gtk_widget_set_tooltip_text(tmp, text);
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1823
diff changeset
4437 }
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1823
diff changeset
4438 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1823
diff changeset
4439 DW_MUTEX_UNLOCK;
6b90c7e9e520 Attempt at fixing GTK 2.x issue with dw_window_set_bitmap() when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1823
diff changeset
4440 return tmp;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4441 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4442
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4443 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4444 * Create a new bitmap button window (widget) to be packed from data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4445 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4446 * text: Bubble help text to be displayed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4447 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4448 * data: Raw data of image.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4449 * (BMP on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4450 * len: Length of raw data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4451 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4452 HWND dw_bitmapbutton_new_from_data(const char *text, unsigned long id, const char *data, int len)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4453 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4454 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4455 GtkWidget *bitmap;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4456 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4457
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4458 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4459 tmp = gtk_button_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4460 bitmap = dw_bitmap_new(id);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4461
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4462 if(bitmap)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4463 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4464 dw_window_set_bitmap_from_data(bitmap, 0, data, len);
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4465 gtk_container_add(GTK_CONTAINER(tmp), bitmap);
1069
a1deca9b0876 Attempt at scaling bitmaps if they are too big for where they are packed on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1066
diff changeset
4466 g_object_set_data(G_OBJECT(tmp), "_dw_bitmap", bitmap);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4467 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4468 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4469 if(text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4470 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4471 gtk_widget_set_tooltip_text(tmp, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4472 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4473 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4474 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4475 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4476 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4477
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4478 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4479 * Create a new spinbutton window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4480 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4481 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4482 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4483 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4484 HWND dw_spinbutton_new(const char *text, unsigned long id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4485 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4486 GtkAdjustment *adj;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4487 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4488 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4489
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4490 DW_MUTEX_LOCK;
1022
fa1a826348b3 Change the default range of spinbuttons to be -65536 to 65536 on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1021
diff changeset
4491 adj = (GtkAdjustment *)gtk_adjustment_new ((float)atoi(text), -65536.0, 65536.0, 1.0, 5.0, 0.0);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4492 tmp = gtk_spin_button_new (adj, 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4493 gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(tmp), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4494 gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(tmp), TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4495 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4496 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adj);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4497 g_object_set_data(G_OBJECT(adj), "_dw_spinbutton", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4498 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4499 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4500 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4501 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4502 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4503 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4504
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4505 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4506 * Create a new radiobutton window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4507 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4508 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4509 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4510 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4511 HWND dw_radiobutton_new(const char *text, ULONG id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4512 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4513 /* This will have to be fixed in the future. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4514 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4515 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4516
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4517 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4518 tmp = gtk_radio_button_new_with_label(NULL, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4519 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4520 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4521
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4522 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4523 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4524 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4525 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4526 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4527
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4528 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4529 * Create a new slider window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4530 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4531 * vertical: TRUE or FALSE if slider is vertical.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4532 * increments: Number of increments available.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4533 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4534 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4535 HWND dw_slider_new(int vertical, int increments, ULONG id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4536 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4537 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4538 GtkAdjustment *adjustment;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4539 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4540
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4541 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4542 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, (gfloat)increments, 1, 1, 1);
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
4543 tmp = gtk_scale_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4544 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4545 gtk_scale_set_draw_value(GTK_SCALE(tmp), 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4546 gtk_scale_set_digits(GTK_SCALE(tmp), 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4547 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4548 g_object_set_data(G_OBJECT(adjustment), "_dw_slider", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4549 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4550 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4551 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4552 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4553
1793
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4554 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4555 gboolean ubuntu_overlay_scrollbar_get_enabled(void);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4556 void ubuntu_overlay_scrollbar_set_enabled(gboolean enabled);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4557 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4558
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4559 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4560 * Create a new scrollbar window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4561 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4562 * vertical: TRUE or FALSE if scrollbar is vertical.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4563 * increments: Number of increments available.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4564 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4565 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4566 HWND dw_scrollbar_new(int vertical, ULONG id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4567 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4568 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4569 GtkAdjustment *adjustment;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4570 int _dw_locked_by_me = FALSE;
1793
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4571 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4572 gboolean overlaysb;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4573 #endif
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4574
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4575 DW_MUTEX_LOCK;
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4576 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4577 overlaysb = ubuntu_overlay_scrollbar_get_enabled();
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4578 ubuntu_overlay_scrollbar_set_enabled(FALSE);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4579 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4580 adjustment = (GtkAdjustment *)gtk_adjustment_new(0, 0, 0, 1, 1, 1);
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
4581 tmp = gtk_scrollbar_new(vertical ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL, adjustment);
1793
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4582 #ifdef HAVE_OVERLAY_SCROLLBARS
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4583 ubuntu_overlay_scrollbar_set_enabled(overlaysb);
2cfbfccbbafe Added code to disable Ubuntu overlay scrollbars
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1785
diff changeset
4584 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4585 gtk_widget_set_can_focus(tmp, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4586 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4587 g_object_set_data(G_OBJECT(tmp), "_dw_adjustment", (gpointer)adjustment);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4588 g_object_set_data(G_OBJECT(adjustment), "_dw_scrollbar", (gpointer)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4589 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4590 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4591 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4592 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4593
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4594 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4595 * Create a new percent bar window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4596 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4597 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4598 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4599 HWND dw_percent_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4600 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4601 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4602 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4603
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4604 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4605 tmp = gtk_progress_bar_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4606 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4607 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4608 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4609 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4610 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4611
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4612 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4613 * Create a new checkbox window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4614 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4615 * text: The text to be display by the static text widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4616 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4617 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4618 HWND dw_checkbox_new(const char *text, unsigned long id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4619 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4620 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4621 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4622
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4623 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4624 tmp = gtk_check_button_new_with_label(text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4625 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4626 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4627 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4628 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4629 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4630 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4631 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4632
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4633 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4634 * Create a new listbox window (widget) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4635 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4636 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4637 * multi: Multiple select TRUE or FALSE.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4638 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4639 HWND dw_listbox_new(unsigned long id, int multi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4640 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4641 GtkWidget *tmp, *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4642 GtkListStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4643 GtkTreeViewColumn *col;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4644 GtkCellRenderer *rend;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4645 GtkTreeSelection *sel;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4646 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4647
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4648 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4649 if(!(tmp = _dw_tree_create(id)))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4650 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4651 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4652 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4653 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4654 store = gtk_list_store_new(1, G_TYPE_STRING);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4655 tree = _dw_tree_setup(tmp, GTK_TREE_MODEL(store));
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
4656 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX));
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
4657 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
4658
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4659 col = gtk_tree_view_column_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4660 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4661 gtk_tree_view_column_pack_start(col, rend, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4662 gtk_tree_view_column_add_attribute(col, rend, "text", 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4663
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4664 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4665 gtk_tree_view_set_expander_column(GTK_TREE_VIEW(tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4666 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
4667
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4668 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4669 if(multi)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4670 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4671 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4672 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4673 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4674 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4675 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4676 }
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
4677 gtk_widget_show(tree);
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4678 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
4679 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4680 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4681 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4682 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4683
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4684 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4685 * Sets the icon used for a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4686 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4687 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4688 * id: An ID to be used to specify the icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4689 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4690 void dw_window_set_icon(HWND handle, HICN icon)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4691 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4692 GdkPixbuf *icon_pixbuf;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4693 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4694
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4695 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4696 icon_pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4697
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4698 if(gtk_widget_get_window(handle) && icon_pixbuf)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4699 {
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
4700 GList *list = g_list_append(NULL, icon_pixbuf);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4701 gdk_window_set_icon_list(gtk_widget_get_window(handle), list);
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
4702 g_list_free(list);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4703 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4704 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4705 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4706
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4707 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4708 * Sets the bitmap used for a given static window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4709 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4710 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4711 * id: An ID to be used to specify the icon,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4712 * (pass 0 if you use the filename param)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4713 * filename: a path to a file (Bitmap on OS/2 or
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4714 * Windows and a pixmap on Unix, pass
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4715 * 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: 2751
diff changeset
4716 * Returns:
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4717 * 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: 2751
diff changeset
4718 * 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: 2751
diff changeset
4719 * 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: 2751
diff changeset
4720 */
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4721 int dw_window_set_bitmap(HWND handle, unsigned long id, const char *filename)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4722 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4723 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: 2751
diff changeset
4724 int i, found_ext = 0;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4725 int _dw_locked_by_me = FALSE;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4726 int retval = DW_ERROR_UNKNOWN;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4727
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4728 if(!id && !filename)
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4729 return retval;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4730
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4731 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4732 if(id)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4733 tmp = _dw_find_pixbuf((HICN)id, NULL, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4734 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4735 {
1258
3df86772b625 Updated the list of supported image formats for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1245
diff changeset
4736 char *file = alloca(strlen(filename) + 6);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4737
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4738 if(!file)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4739 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4740 DW_MUTEX_UNLOCK;
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4741 return DW_ERROR_GENERAL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4742 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4743
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4744 strcpy(file, filename);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4745
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4746 /* check if we can read from this file (it exists and read permission) */
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4747 if(access(file, 04) != 0)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4748 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4749 /* Try with various extentions */
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4750 for(i = 0; i < NUM_EXTS; i++)
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4751 {
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4752 strcpy(file, filename);
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4753 strcat(file, _dw_image_exts[i]);
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4754 if(access( file, 04 ) == 0)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4755 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4756 found_ext = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4757 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4758 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4759 }
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4760 if(found_ext == 0)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4761 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4762 DW_MUTEX_UNLOCK;
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4763 return DW_ERROR_GENERAL;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4764 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4765 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4766 tmp = gdk_pixbuf_new_from_file(file, NULL);
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4767 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4768
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4769 if(tmp)
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4770 {
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4771 if(GTK_IS_BUTTON(handle))
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4772 {
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4773 GtkWidget *pixmap = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_bitmap");
1823
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1796
diff changeset
4774 if(pixmap)
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1796
diff changeset
4775 {
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1796
diff changeset
4776 gtk_image_set_from_pixbuf(GTK_IMAGE(pixmap), tmp);
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4777 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: 2751
diff changeset
4778 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4779 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4780 else if(GTK_IS_IMAGE(handle))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4781 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4782 gtk_image_set_from_pixbuf(GTK_IMAGE(handle), tmp);
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4783 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: 2751
diff changeset
4784 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4785 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4786 DW_MUTEX_UNLOCK;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4787 return retval;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4788 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4789
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4790 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4791 * Sets the bitmap used for a given static window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4792 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4793 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4794 * id: An ID to be used to specify the icon,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4795 * (pass 0 if you use the filename param)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4796 * data: the image data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4797 * Bitmap on Windows and a pixmap on Unix, pass
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4798 * NULL if you use the id param)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4799 * 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: 2751
diff changeset
4800 * Returns:
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4801 * 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: 2751
diff changeset
4802 * 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: 2751
diff changeset
4803 * 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: 2751
diff changeset
4804 */
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4805 int dw_window_set_bitmap_from_data(HWND handle, unsigned long id, const char *data, int len)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4806 {
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
4807 GdkPixbuf *tmp = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4808 int _dw_locked_by_me = FALSE;
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4809 int retval = DW_ERROR_UNKNOWN;
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4810
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4811 if(!id && !data)
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4812 return retval;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4813
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4814 DW_MUTEX_LOCK;
1718
fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1709
diff changeset
4815 if(data)
fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1709
diff changeset
4816 {
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4817 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4818 * A real hack; create a temporary file and write the contents
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4819 * of the data to the file
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4820 */
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4821 char template[] = "/tmp/dwpixmapXXXXXX";
2201
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
4822 int written = -1, fd = mkstemp(template);
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
4823
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
4824 if(fd != -1)
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
4825 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
4826 written = write(fd, data, len);
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4827 close(fd);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4828 }
2201
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
4829 /* Bail if we couldn't write full file */
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
4830 if(fd == -1 || written != len)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4831 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4832 DW_MUTEX_UNLOCK;
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4833 return DW_ERROR_GENERAL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4834 }
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4835
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4836 tmp = gdk_pixbuf_new_from_file(template, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4837 /* remove our temporary file */
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4838 unlink(template);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4839 }
1718
fae374a0055b Same fix for GTK2/3 as committed for OS/2 and Windows...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1709
diff changeset
4840 else if (id)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
4841 tmp = _dw_find_pixbuf((HICN)id, NULL, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4842
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4843 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4844 {
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4845 if(GTK_IS_BUTTON(handle))
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4846 {
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4847 GtkWidget *pixmap = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_bitmap");
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
4848
1823
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1796
diff changeset
4849 if(pixmap)
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4850 {
1823
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1796
diff changeset
4851 gtk_image_set_from_pixbuf(GTK_IMAGE(pixmap), tmp);
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4852 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: 2751
diff changeset
4853 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4854 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4855 else if(GTK_IS_IMAGE(handle))
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4856 {
1823
9c77567c5b2d Fixed broken support in dw_window_set_bitmap() on GTK2/3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1796
diff changeset
4857 gtk_image_set_from_pixbuf(GTK_IMAGE(handle), tmp);
2854
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4858 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: 2751
diff changeset
4859 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4860 }
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4861 DW_MUTEX_UNLOCK;
8a5131cbbe93 GTK2/3/4: Add return values to dw_window_set_bitmap(_from_data).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2751
diff changeset
4862 return retval;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4863 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4864
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4865 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4866 * Sets the text used for a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4867 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4868 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4869 * text: The text associated with a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4870 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4871 void dw_window_set_text(HWND handle, const char *text)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4872 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4873 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4874 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4875
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4876 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4877 if((tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi_title")))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4878 handle = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4879 if(GTK_IS_ENTRY(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4880 gtk_entry_set_text(GTK_ENTRY(handle), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4881 else if(GTK_IS_COMBO_BOX(handle))
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
4882 gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(handle))), text);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4883 else if(GTK_IS_LABEL(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4884 gtk_label_set_text(GTK_LABEL(handle), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4885 else if(GTK_IS_BUTTON(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4886 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4887 gtk_button_set_label(GTK_BUTTON(handle), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4888 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4889 else if(gtk_widget_is_toplevel(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4890 gtk_window_set_title(GTK_WINDOW(handle), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4891 else if (GTK_IS_FRAME(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4892 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4893 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4894 * This is a groupbox or status_text
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4895 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4896 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_label");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4897 if ( tmp && GTK_IS_LABEL(tmp) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4898 gtk_label_set_text(GTK_LABEL(tmp), text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4899 else /* assume groupbox */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4900 gtk_frame_set_label(GTK_FRAME(handle), text && *text ? text : NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4901 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4902 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4903 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4904
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4905 /*
1389
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4906 * Sets the text used for a given window's floating bubble help.
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4907 * Parameters:
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4908 * handle: Handle to the window (widget).
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4909 * bubbletext: The text in the floating bubble tooltip.
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4910 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
4911 void API dw_window_set_tooltip(HWND handle, const char *bubbletext)
1389
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4912 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4913 int _dw_locked_by_me = FALSE;
1389
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4914
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4915 DW_MUTEX_LOCK;
1400
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1390
diff changeset
4916 if(bubbletext && *bubbletext)
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1390
diff changeset
4917 gtk_widget_set_tooltip_text(handle, bubbletext);
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1390
diff changeset
4918 else
ccd383e11ff8 Allow removing of tooltips by passing NULL or "" and prevent double tooltips on some platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1390
diff changeset
4919 gtk_widget_set_has_tooltip(handle, FALSE);
1389
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4920 DW_MUTEX_UNLOCK;
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4921 }
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4922
0512fbb08abf Added dw_window_set_tooltip() for adding bubble help to most controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1388
diff changeset
4923 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4924 * Gets the text used for a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4925 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4926 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4927 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4928 * text: The text associsated with a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4929 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4930 char *dw_window_get_text(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4931 {
1742
cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1718
diff changeset
4932 const char *possible = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4933 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4934
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4935 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4936 if(GTK_IS_ENTRY(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4937 possible = gtk_entry_get_text(GTK_ENTRY(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4938 else if(GTK_IS_COMBO_BOX(handle))
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
4939 possible = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(handle))));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
4940 else if(GTK_IS_LABEL(handle))
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
4941 possible = gtk_label_get_text(GTK_LABEL(handle));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4942
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4943 DW_MUTEX_UNLOCK;
1742
cebf830e3da7 Minor GTK3 code cleanups from attempt at fixing combobox event order.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1718
diff changeset
4944 return strdup(possible ? possible : "");
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4945 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4946
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4947 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4948 * Disables given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4949 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4950 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4951 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4952 void dw_window_disable(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4953 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4954 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4955
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4956 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4957 gtk_widget_set_sensitive(handle, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4958 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4959 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4960
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4961 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4962 * Enables given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4963 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4964 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4965 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4966 void dw_window_enable(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4967 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4968 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4969
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4970 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4971 gtk_widget_set_sensitive(handle, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4972 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4973 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4974
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4975 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4976 * Gets the child window handle with specified ID.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4977 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4978 * handle: Handle to the parent window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4979 * id: Integer ID of the child.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4980 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4981 HWND API dw_window_from_id(HWND handle, int id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4982 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4983 GList *orig = NULL, *list = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
4984 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4985
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4986 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4987 if(handle && GTK_IS_CONTAINER(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4988 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4989 orig = list = gtk_container_get_children(GTK_CONTAINER(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4990 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4991 while(list)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4992 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4993 if(GTK_IS_WIDGET(list->data))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4994 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
4995 if(id == GPOINTER_TO_INT(g_object_get_data(G_OBJECT(list->data), "_dw_id")))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4996 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4997 HWND ret = (HWND)list->data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4998 g_list_free(orig);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
4999 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5000 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5001 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5002 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5003 list = list->next;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5004 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5005 if(orig)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5006 g_list_free(orig);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5007 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5008 return 0L;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5009 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5010
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5011 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5012 * Adds text to an MLE box and returns the current point.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5013 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5014 * handle: Handle to the MLE to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5015 * buffer: Text buffer to be imported.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5016 * startpoint: Point to start entering text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5017 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
5018 unsigned int dw_mle_import(HWND handle, const char *buffer, int startpoint)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5019 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5020 unsigned int tmppoint = startpoint;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5021 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5022
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5023 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5024 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5025 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5026 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5027
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5028 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5029 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5030 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5031 GtkTextIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5032
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5033 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5034 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, startpoint);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5035 gtk_text_buffer_place_cursor(tbuffer, &iter);
994
f1c7b03f944d Removed carriage return stripping from GTK3, it is not needed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 986
diff changeset
5036 gtk_text_buffer_insert_at_cursor(tbuffer, buffer, -1);
f1c7b03f944d Removed carriage return stripping from GTK3, it is not needed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 986
diff changeset
5037 tmppoint = (startpoint > -1 ? startpoint : 0) + strlen(buffer);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5038 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5039 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5040 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5041 return tmppoint;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5042 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5043
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5044 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5045 * Grabs text from an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5046 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5047 * handle: Handle to the MLE to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5048 * buffer: Text buffer to be exported. MUST allow for trailing nul character.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5049 * startpoint: Point to start grabbing text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5050 * length: Amount of text to be grabbed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5051 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5052 void dw_mle_export(HWND handle, char *buffer, int startpoint, int length)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5053 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5054 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5055 gchar *text;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5056
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5057 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5058 /* force the return value to nul in case the following tests fail */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5059 if(buffer)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5060 buffer[0] = '\0';
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5061 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5062 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5063 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5064
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5065 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5066 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5067 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5068 GtkTextIter start, end;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5069
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5070 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5071 gtk_text_buffer_get_iter_at_offset(tbuffer, &start, startpoint);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5072 gtk_text_buffer_get_iter_at_offset(tbuffer, &end, startpoint + length);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5073 text = gtk_text_iter_get_text(&start, &end);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5074 if(text) /* Should this get freed? */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5075 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5076 if(buffer)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5077 strcpy(buffer, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5078 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5079 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5080 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5081 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5082 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5083
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5084 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5085 * Obtains information about an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5086 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5087 * handle: Handle to the MLE to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5088 * bytes: A pointer to a variable to return the total bytes.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5089 * lines: A pointer to a variable to return the number of lines.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5090 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5091 void dw_mle_get_size(HWND handle, unsigned long *bytes, unsigned long *lines)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5092 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5093 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5094
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5095 if(bytes)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5096 *bytes = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5097 if(lines)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5098 *lines = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5099
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5100 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5101 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5102 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5103 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5104
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5105 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5106 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5107 GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5108
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5109 if(bytes)
998
f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!!
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 994
diff changeset
5110 *bytes = gtk_text_buffer_get_char_count(buffer);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5111 if(lines)
998
f019c5e8511f Fixed GTK reporting wrong character and line counts. 1000 revisions!!!
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 994
diff changeset
5112 *lines = gtk_text_buffer_get_line_count(buffer);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5113 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5114 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5115 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5116 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5117
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5118 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5119 * Deletes text from an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5120 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5121 * handle: Handle to the MLE to be deleted from.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5122 * startpoint: Point to start deleting text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5123 * length: Amount of text to be deleted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5124 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5125 void dw_mle_delete(HWND handle, int startpoint, int length)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5126 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5127 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5128
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5129 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5130 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5131 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5132 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5133
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5134 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5135 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5136 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5137 GtkTextIter start, end;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5138
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5139 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5140 gtk_text_buffer_get_iter_at_offset(tbuffer, &start, startpoint);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5141 gtk_text_buffer_get_iter_at_offset(tbuffer, &end, startpoint + length);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5142 gtk_text_buffer_delete(tbuffer, &start, &end);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5143 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5144 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5145 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5146 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5147
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5148 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5149 * Clears all text from an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5150 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5151 * handle: Handle to the MLE to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5152 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5153 void dw_mle_clear(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5154 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5155 int length, _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5156
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5157 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5158 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5159 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5160 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5161
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5162 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5163 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5164 GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5165
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5166 length = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5167 gtk_text_buffer_set_text(buffer, "", length);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5168 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5169 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5170 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5171 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5172
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5173 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5174 * Sets the visible line of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5175 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5176 * handle: Handle to the MLE.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5177 * line: Line to be visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5178 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5179 void dw_mle_set_visible(HWND handle, int line)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5180 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5181 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5182
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5183 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5184 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5185 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5186 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5187
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5188 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5189 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5190 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5191 GtkTextIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5192 GtkTextMark *mark = (GtkTextMark *)g_object_get_data(G_OBJECT(handle), "_dw_mark");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5193
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5194 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5195 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5196 gtk_text_iter_set_line(&iter, line);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5197 if(!mark)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5198 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5199 mark = gtk_text_buffer_create_mark(tbuffer, NULL, &iter, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5200 g_object_set_data(G_OBJECT(handle), "_dw_mark", (gpointer)mark);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5201 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5202 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5203 gtk_text_buffer_move_mark(tbuffer, mark, &iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5204 gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(tmp), mark,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5205 0, FALSE, 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5206 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5207 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5208 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5209 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5210
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5211 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5212 * Sets the editablity of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5213 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5214 * handle: Handle to the MLE.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5215 * state: TRUE if it can be edited, FALSE for readonly.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5216 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5217 void dw_mle_set_editable(HWND handle, int state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5218 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5219 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5220
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5221 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5222 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5223 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5224 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5225
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5226 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5227 gtk_text_view_set_editable(GTK_TEXT_VIEW(tmp), state);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5228 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5229 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5230 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5231
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5232 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5233 * Sets the word wrap state of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5234 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5235 * handle: Handle to the MLE.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5236 * state: TRUE if it wraps, FALSE if it doesn't.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5237 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5238 void dw_mle_set_word_wrap(HWND handle, int state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5239 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5240 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5241
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5242 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5243 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5244 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5245 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5246
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5247 if(tmp && GTK_IS_TEXT_VIEW(tmp))
1545
6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1539
diff changeset
5248 gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(tmp), state ? GTK_WRAP_WORD : GTK_WRAP_NONE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5249 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5250 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5251 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5252
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5253 /*
1926
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5254 * Sets the word auto complete state of an MLE box.
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5255 * Parameters:
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5256 * handle: Handle to the MLE.
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5257 * state: Bitwise combination of DW_MLE_COMPLETE_TEXT/DASH/QUOTE
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5258 */
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5259 void dw_mle_set_auto_complete(HWND handle, int state)
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5260 {
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5261 }
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5262
3c60066cb16f Added dw_mle_set_auto_complete() stubs for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1921
diff changeset
5263 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5264 * Sets the current cursor position of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5265 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5266 * handle: Handle to the MLE to be positioned.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5267 * point: Point to position cursor.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5268 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5269 void dw_mle_set_cursor(HWND handle, int point)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5270 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5271 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5272
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5273 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5274 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5275 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5276 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5277
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5278 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5279 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5280 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5281 GtkTextIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5282 GtkTextMark *mark = (GtkTextMark *)g_object_get_data(G_OBJECT(handle), "_dw_mark");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5283
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5284 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5285 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, point);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5286 if(!mark)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5287 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5288 mark = gtk_text_buffer_create_mark(tbuffer, NULL, &iter, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5289 g_object_set_data(G_OBJECT(handle), "_dw_mark", (gpointer)mark);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5290 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5291 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5292 gtk_text_buffer_move_mark(tbuffer, mark, &iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5293 gtk_text_buffer_place_cursor(tbuffer, &iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5294 gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(tmp), mark,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5295 0, FALSE, 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5296 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5297 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5298 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5299 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5300
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5301 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5302 * Finds text in an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5303 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5304 * handle: Handle to the MLE to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5305 * text: Text to search for.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5306 * point: Start point of search.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5307 * flags: Search specific flags.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5308 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
5309 int dw_mle_search(HWND handle, const char *text, int point, unsigned long flags)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5310 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5311 int _dw_locked_by_me = FALSE, retval = 0;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5312
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5313 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5314 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5315 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5316 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5317
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5318 if(tmp && GTK_IS_TEXT_VIEW(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5319 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5320 GtkTextBuffer *tbuffer;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5321 GtkTextIter iter, found;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5322
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5323 tbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tmp));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5324 gtk_text_buffer_get_iter_at_offset(tbuffer, &iter, point);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5325 gtk_text_iter_forward_search(&iter, text, GTK_TEXT_SEARCH_TEXT_ONLY, &found, NULL, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5326 retval = gtk_text_iter_get_offset(&found);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5327 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5328 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5329 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5330 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5331 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5332
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5333 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5334 * Stops redrawing of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5335 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5336 * handle: Handle to the MLE to freeze.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5337 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5338 void dw_mle_freeze(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5339 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5340 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5341
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5342 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5343 * Resumes redrawing of an MLE box.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5344 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5345 * handle: Handle to the MLE to thaw.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5346 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5347 void dw_mle_thaw(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5348 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5349 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5350
1190
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5351 /* Internal function to update the progress bar
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
5352 * while in an indeterminate state.
1190
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5353 */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5354 gboolean _dw_update_progress_bar(gpointer data)
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5355 {
1191
40500dabb112 Compile fix and fix for returning wrong value from the timeout function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1190
diff changeset
5356 if(g_object_get_data(G_OBJECT(data), "_dw_alive"))
1190
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5357 {
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5358 gtk_progress_bar_pulse(GTK_PROGRESS_BAR(data));
1191
40500dabb112 Compile fix and fix for returning wrong value from the timeout function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1190
diff changeset
5359 return TRUE;
40500dabb112 Compile fix and fix for returning wrong value from the timeout function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1190
diff changeset
5360 }
40500dabb112 Compile fix and fix for returning wrong value from the timeout function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1190
diff changeset
5361 return FALSE;
1190
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5362 }
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5363
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5364 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5365 * Sets the percent bar position.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5366 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5367 * handle: Handle to the percent bar to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5368 * position: Position of the percent bar withing the range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5369 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5370 void dw_percent_set_pos(HWND handle, unsigned int position)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5371 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5372 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5373
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5374 DW_MUTEX_LOCK;
1190
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5375 if(position == DW_PERCENT_INDETERMINATE)
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5376 {
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5377 /* Check if we are indeterminate already */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5378 if(!g_object_get_data(G_OBJECT(handle), "_dw_alive"))
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5379 {
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5380 /* If not become indeterminate... and start a timer to continue */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5381 gtk_progress_bar_pulse(GTK_PROGRESS_BAR(handle));
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5382 g_object_set_data(G_OBJECT(handle), "_dw_alive", GINT_TO_POINTER(1));
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5383 g_timeout_add(100, (GSourceFunc)_dw_update_progress_bar, (gpointer)handle);
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5384 }
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5385 }
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5386 else
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5387 {
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5388 /* Cancel the existing timer if one is there */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5389 g_object_set_data(G_OBJECT(handle), "_dw_alive", NULL);
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5390 /* Set the position like normal */
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5391 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(handle), (gfloat)position/100);
76262040ed5f Added DW_PERCENT_INDETERMINATE which can be passed to dw_percent_set_pos() to
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1185
diff changeset
5392 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5393 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5394 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5395
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5396 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5397 * Returns the position of the slider.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5398 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5399 * handle: Handle to the slider to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5400 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5401 unsigned int dw_slider_get_pos(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5402 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5403 int val = 0, _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5404 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5405
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5406 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5407 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5408
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5409 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5410 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5411 if(adjustment)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5412 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
5413 int max = _dw_round_value(gtk_adjustment_get_upper(adjustment)) - 1;
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
5414 int thisval = _dw_round_value(gtk_adjustment_get_value(adjustment));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5415
1583
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
5416 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_VERTICAL)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5417 val = max - thisval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5418 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5419 val = thisval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5420 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5421 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5422 return val;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5423 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5424
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5425 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5426 * Sets the slider position.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5427 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5428 * handle: Handle to the slider to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5429 * position: Position of the slider withing the range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5430 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5431 void dw_slider_set_pos(HWND handle, unsigned int position)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5432 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5433 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5434 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5435
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5436 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5437 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5438
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5439 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5440 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5441 if(adjustment)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5442 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
5443 int max = _dw_round_value(gtk_adjustment_get_upper(adjustment)) - 1;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5444
1583
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
5445 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_VERTICAL)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5446 gtk_adjustment_set_value(adjustment, (gfloat)(max - position));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5447 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5448 gtk_adjustment_set_value(adjustment, (gfloat)position);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5449 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5450 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5451 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5452
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5453 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5454 * Returns the position of the scrollbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5455 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5456 * handle: Handle to the scrollbar to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5457 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5458 unsigned int dw_scrollbar_get_pos(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5459 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5460 int val = 0, _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5461 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5462
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5463 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5464 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5465
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5466 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5467 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5468 if(adjustment)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
5469 val = _dw_round_value(gtk_adjustment_get_value(adjustment));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5470 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5471 return val;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5472 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5473
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5474 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5475 * Sets the scrollbar position.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5476 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5477 * handle: Handle to the scrollbar to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5478 * position: Position of the scrollbar withing the range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5479 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5480 void dw_scrollbar_set_pos(HWND handle, unsigned int position)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5481 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5482 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5483 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5484
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5485 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5486 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5487
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5488 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5489 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5490 if(adjustment)
1486
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1482
diff changeset
5491 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
5492 g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event", GINT_TO_POINTER(1));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5493 gtk_adjustment_set_value(adjustment, (gfloat)position);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
5494 g_object_set_data(G_OBJECT(adjustment), "_dw_suppress_dw_value_changed_event", GINT_TO_POINTER(0));
1486
5cfbf2715eec Code simplification on GTK2 and ported the fix to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1482
diff changeset
5495 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5496 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5497 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5498
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5499 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5500 * Sets the scrollbar range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5501 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5502 * handle: Handle to the scrollbar to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5503 * range: Maximum range value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5504 * visible: Visible area relative to the range.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5505 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5506 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5507 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5508 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5509 GtkAdjustment *adjustment;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5510
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5511 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5512 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5513
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5514 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5515 adjustment = (GtkAdjustment *)g_object_get_data(G_OBJECT(handle), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5516 if(adjustment)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5517 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5518 gtk_adjustment_set_upper(adjustment, (gdouble)range);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5519 gtk_adjustment_set_page_increment(adjustment,(gdouble)visible);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5520 gtk_adjustment_set_page_size(adjustment, (gdouble)visible);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5521 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5522 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5523 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5524
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5525 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5526 * Sets the spinbutton value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5527 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5528 * handle: Handle to the spinbutton to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5529 * position: Current value of the spinbutton.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5530 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5531 void dw_spinbutton_set_pos(HWND handle, long position)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5532 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5533 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5534
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5535 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5536 gtk_spin_button_set_value(GTK_SPIN_BUTTON(handle), (gfloat)position);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5537 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5538 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5539
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5540 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5541 * Sets the spinbutton limits.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5542 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5543 * handle: Handle to the spinbutton to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5544 * position: Current value of the spinbutton.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5545 * position: Current value of the spinbutton.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5546 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5547 void dw_spinbutton_set_limits(HWND handle, long upper, long lower)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5548 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5549 long curval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5550 GtkAdjustment *adj;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5551 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5552
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5553 curval = dw_spinbutton_get_pos(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5554 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5555 adj = (GtkAdjustment *)gtk_adjustment_new((gfloat)curval, (gfloat)lower, (gfloat)upper, 1.0, 5.0, 0.0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5556 gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(handle), adj);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5557 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5558 * Set our internal relationships between the adjustment and the spinbutton
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5559 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5560 g_object_set_data(G_OBJECT(handle), "_dw_adjustment", (gpointer)adj);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5561 g_object_set_data(G_OBJECT(adj), "_dw_spinbutton", (gpointer)handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5562 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5563 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5564
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5565 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5566 * Sets the entryfield character limit.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5567 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5568 * handle: Handle to the spinbutton to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5569 * limit: Number of characters the entryfield will take.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5570 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5571 void dw_entryfield_set_limit(HWND handle, ULONG limit)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5572 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5573 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5574
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5575 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5576 gtk_entry_set_max_length(GTK_ENTRY(handle), limit);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5577 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5578 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5579
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5580 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5581 * Returns the current value of the spinbutton.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5582 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5583 * handle: Handle to the spinbutton to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5584 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5585 long dw_spinbutton_get_pos(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5586 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5587 long retval;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5588 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5589
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5590 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5591 retval = (long)gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5592 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5593
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5594 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5595 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5596
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5597 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5598 * Returns the state of the checkbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5599 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5600 * handle: Handle to the checkbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5601 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5602 int dw_checkbox_get(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5603 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5604 int retval;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5605 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5606
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5607 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5608 retval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5609 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5610
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5611 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5612 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5613
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5614 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5615 * Sets the state of the checkbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5616 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5617 * handle: Handle to the checkbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5618 * value: TRUE for checked, FALSE for unchecked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5619 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5620 void dw_checkbox_set(HWND handle, int value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5621 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5622 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5623
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5624 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5625 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(handle), value);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5626 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5627 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5628
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5629 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5630 * Inserts an item into a tree window (widget) after another item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5631 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5632 * handle: Handle to the tree to be inserted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5633 * item: Handle to the item to be positioned after.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5634 * title: The text title of the entry.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5635 * icon: Handle to coresponding icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5636 * parent: Parent handle or 0 if root.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5637 * itemdata: Item specific data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5638 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
5639 HTREEITEM dw_tree_insert_after(HWND handle, HTREEITEM item, const char *title, HICN icon, HTREEITEM parent, void *itemdata)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5640 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5641 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5642 GtkTreeIter *iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5643 GtkTreeStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5644 GdkPixbuf *pixbuf;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5645 HTREEITEM retval = 0;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5646 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5647
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5648 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5649 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5650
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5651 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5652 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5653 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5654 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5655 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5656 iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5657
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
5658 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5659
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5660 gtk_tree_store_insert_after(store, iter, (GtkTreeIter *)parent, (GtkTreeIter *)item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5661 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5662 retval = (HTREEITEM)iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5663 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5664 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5665
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5666 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5667 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5668
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5669 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5670 * Inserts an item into a tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5671 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5672 * handle: Handle to the tree to be inserted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5673 * title: The text title of the entry.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5674 * icon: Handle to coresponding icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5675 * parent: Parent handle or 0 if root.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5676 * itemdata: Item specific data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5677 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
5678 HTREEITEM dw_tree_insert(HWND handle, const char *title, HICN icon, HTREEITEM parent, void *itemdata)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5679 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5680 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5681 GtkTreeIter *iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5682 GtkTreeStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5683 GdkPixbuf *pixbuf;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5684 HTREEITEM retval = 0;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5685 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5686
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5687 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5688 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5689
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5690 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5691 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5692 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5693 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5694 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5695 iter = (GtkTreeIter *)malloc(sizeof(GtkTreeIter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5696
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
5697 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5698
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5699 gtk_tree_store_append (store, iter, (GtkTreeIter *)parent);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5700 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5701 retval = (HTREEITEM)iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5702 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5703 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5704
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5705 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5706 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5707
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5708 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5709 * Sets the text and icon of an item in a tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5710 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5711 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5712 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5713 * title: The text title of the entry.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5714 * icon: Handle to coresponding icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5715 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
5716 void dw_tree_item_change(HWND handle, HTREEITEM item, const char *title, HICN icon)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5717 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5718 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5719 GtkTreeStore *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5720 GdkPixbuf *pixbuf;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5721 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5722
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5723 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5724 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5725
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5726 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5727 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5728 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5729 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5730 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
5731 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5732
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5733 gtk_tree_store_set(store, (GtkTreeIter *)item, 0, title, 1, pixbuf, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5734 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5735 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5736 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5737
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5738 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5739 * Sets the item data of a tree item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5740 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5741 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5742 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5743 * itemdata: User defined data to be associated with item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5744 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5745 void dw_tree_item_set_data(HWND handle, HTREEITEM item, void *itemdata)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5746 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5747 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5748 GtkTreeStore *store;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5749 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5750
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5751 if(!handle || !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5752 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5753
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5754 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5755 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5756 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5757 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5758 gtk_tree_store_set(store, (GtkTreeIter *)item, 2, itemdata, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5759 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5760 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5761
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5762 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5763 * Gets the text an item in a tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5764 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5765 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5766 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5767 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5768 char * API dw_tree_get_title(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5769 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5770 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5771 char *text = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5772 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5773 GtkTreeModel *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5774
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5775 if(!handle || !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5776 return text;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5777
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5778 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5779 tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5780
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5781 if(tree && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5782 (store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
5783 gtk_tree_model_get(store, (GtkTreeIter *)item, _DW_DATA_TYPE_STRING, &text, -1);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
5784 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
5785 {
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
5786 char *temp = text;
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
5787 text = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
5788 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
5789 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5790 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5791 return text;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5792 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5793
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5794 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5795 * Gets the text an item in a tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5796 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5797 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5798 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5799 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5800 HTREEITEM API dw_tree_get_parent(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5801 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5802 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5803 HTREEITEM parent = (HTREEITEM)0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5804 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5805 GtkTreeModel *store;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5806
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5807 if(!handle || !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5808 return parent;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5809
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5810 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5811 tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5812
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5813 if(tree && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5814 (store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5815 {
1900
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1894
diff changeset
5816 GtkTreeIter iter;
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1894
diff changeset
5817
969f7bbc0ff5 Fixed memory leak in dw_tree_get_parent() on GTK2/3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1894
diff changeset
5818 if(gtk_tree_model_iter_parent(store, &iter, (GtkTreeIter *)item))
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
5819 gtk_tree_model_get(store, &iter, 3, &parent, -1);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5820 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5821 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5822 return parent;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5823 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5824
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5825 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5826 * Gets the item data of a tree item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5827 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5828 * handle: Handle to the tree containing the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5829 * item: Handle of the item to be modified.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5830 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5831 void *dw_tree_item_get_data(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5832 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5833 void *ret = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5834 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5835 GtkTreeModel *store;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5836 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5837
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5838 if(!handle || !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5839 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5840
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5841 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5842 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5843 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5844 (store = (GtkTreeModel *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5845 gtk_tree_model_get(store, (GtkTreeIter *)item, 2, &ret, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5846 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5847 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5848 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5849
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5850 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5851 * Sets this item as the active selection.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5852 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5853 * handle: Handle to the tree window (widget) to be selected.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5854 * item: Handle to the item to be selected.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5855 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5856 void dw_tree_item_select(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5857 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5858 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5859 GtkTreeStore *store;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5860 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5861
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5862 if(!handle || !item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5863 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5864
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5865 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5866 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5867 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5868 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5869 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5870 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), (GtkTreeIter *)item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5871 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5872
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5873 gtk_tree_view_set_cursor(GTK_TREE_VIEW(tree), path, NULL, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5874 gtk_tree_selection_select_iter(sel, (GtkTreeIter *)item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5875 gtk_tree_path_free(path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5876 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5877 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5878 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5879
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5880 static void _dw_recursive_free(GtkTreeModel *store, GtkTreeIter parent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5881 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5882 void *data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5883 GtkTreeIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5884
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5885 gtk_tree_model_get(store, &parent, 3, &data, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5886 if(data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5887 free(data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5888 gtk_tree_store_set(GTK_TREE_STORE(store), &parent, 3, NULL, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5889
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5890 if(gtk_tree_model_iter_children(store, &iter, &parent))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5891 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5892 do {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5893 _dw_recursive_free(GTK_TREE_MODEL(store), iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5894 } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5895 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5896 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5897
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5898 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5899 * Removes all nodes from a tree.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5900 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5901 * handle: Handle to the window (widget) to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5902 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5903 void dw_tree_clear(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5904 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5905 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5906 GtkTreeStore *store;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5907 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5908
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5909 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5910 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5911
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5912 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5913 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5914 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5915 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5916 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5917 GtkTreeIter iter;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5918
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5919 if(gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5920 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5921 do {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5922 _dw_recursive_free(GTK_TREE_MODEL(store), iter);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5923 } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5924 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5925 gtk_tree_store_clear(store);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5926 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5927 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5928 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5929
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5930 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5931 * Expands a node on a tree.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5932 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5933 * handle: Handle to the tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5934 * item: Handle to node to be expanded.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5935 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5936 void dw_tree_item_expand(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5937 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5938 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5939 GtkTreeStore *store;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5940 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5941
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5942 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5943 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5944
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5945 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5946 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5947 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5948 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5949 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5950 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), (GtkTreeIter *)item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5951 gtk_tree_view_expand_row(GTK_TREE_VIEW(tree), path, FALSE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5952 gtk_tree_path_free(path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5953 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5954 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5955 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5956
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5957 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5958 * Collapses a node on a tree.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5959 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5960 * handle: Handle to the tree window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5961 * item: Handle to node to be collapsed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5962 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5963 void dw_tree_item_collapse(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5964 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5965 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5966 GtkTreeStore *store;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5967 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5968
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5969 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5970 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5971
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5972 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5973 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5974 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5975 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5976 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5977 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), (GtkTreeIter *)item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5978 gtk_tree_view_collapse_row(GTK_TREE_VIEW(tree), path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5979 gtk_tree_path_free(path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5980 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5981 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5982 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5983
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5984 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5985 * Removes a node from a tree.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5986 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5987 * handle: Handle to the window (widget) to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5988 * item: Handle to node to be deleted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5989 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5990 void dw_tree_item_delete(HWND handle, HTREEITEM item)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5991 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5992 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5993 GtkTreeStore *store;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
5994 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5995
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5996 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5997 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5998
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
5999 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6000 if((tree = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6001 && GTK_IS_TREE_VIEW(tree) &&
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6002 (store = (GtkTreeStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(tree))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6003 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6004 gtk_tree_store_remove(store, (GtkTreeIter *)item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6005 free(item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6006 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6007 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6008 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6009
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6010 #define _DW_CONTAINER_STORE_EXTRA 2
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6011
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6012 static int _dw_container_setup(HWND handle, unsigned long *flags, char **titles, int count, int separator, int extra)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6013 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6014 int z;
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
6015 char numbuf[25] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6016 GtkWidget *tree;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6017 GtkListStore *store;
784
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
6018 GtkTreeViewColumn *col;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6019 GtkCellRenderer *rend;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6020 GtkTreeSelection *sel;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6021 int _dw_locked_by_me = FALSE;
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6022 GType *array = calloc(count + _DW_CONTAINER_STORE_EXTRA + 1, sizeof(GType));
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
6023
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
6024 DW_MUTEX_LOCK;
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
6025 /* Save some of the info so it is easily accessible */
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
6026 g_object_set_data(G_OBJECT(handle), "_dw_cont_columns", GINT_TO_POINTER(count));
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6027 g_object_set_data(G_OBJECT(handle), "_dw_cont_extra", GINT_TO_POINTER(extra));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6028
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6029 /* First param is row title */
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6030 array[0] = G_TYPE_STRING;
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6031 /* Second param is row data */
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6032 array[1] = G_TYPE_POINTER;
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6033 array[2] = G_TYPE_POINTER;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6034 /* First loop... create array to create the store */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6035 for(z=0;z<count;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6036 {
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6037 if(z == 0 && flags[z] & DW_CFA_STRINGANDICON)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6038 {
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6039 array[_DW_CONTAINER_STORE_EXTRA] = GDK_TYPE_PIXBUF;
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6040 array[_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6041 }
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6042 else if(flags[z] & DW_CFA_BITMAPORICON)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6043 {
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6044 array[z+_DW_CONTAINER_STORE_EXTRA+1] = GDK_TYPE_PIXBUF;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6045 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6046 else if(flags[z] & DW_CFA_STRING)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6047 {
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6048 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6049 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6050 else if(flags[z] & DW_CFA_ULONG)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6051 {
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6052 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_ULONG;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6053 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6054 else if(flags[z] & DW_CFA_TIME)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6055 {
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6056 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6057 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6058 else if(flags[z] & DW_CFA_DATE)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6059 {
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6060 array[z+_DW_CONTAINER_STORE_EXTRA+1] = G_TYPE_STRING;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6061 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6062 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6063 /* Create the store and then the tree */
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6064 store = gtk_list_store_newv(count + _DW_CONTAINER_STORE_EXTRA + 1, array);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
6065 tree = _dw_tree_setup(handle, GTK_TREE_MODEL(store));
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
6066 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6067 /* Second loop... create the columns */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6068 for(z=0;z<count;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6069 {
1937
eb488c379969 Fixed a few deprecation warnings on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1933
diff changeset
6070 snprintf(numbuf, 24, "_dw_cont_col%d", z);
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6071 g_object_set_data(G_OBJECT(tree), numbuf, GINT_TO_POINTER(flags[z]));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6072 col = gtk_tree_view_column_new();
884
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6073 rend = NULL;
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
6074 void **params = calloc(sizeof(void *), 3);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6075
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6076 if(z == 0 && flags[z] & DW_CFA_STRINGANDICON)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6077 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6078 rend = gtk_cell_renderer_pixbuf_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6079 gtk_tree_view_column_pack_start(col, rend, FALSE);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6080 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", _DW_CONTAINER_STORE_EXTRA);
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6081 rend = gtk_cell_renderer_text_new();
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6082 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6083 gtk_tree_view_column_add_attribute(col, rend, "text", _DW_CONTAINER_STORE_EXTRA+1);
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6084 }
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6085 else if(flags[z] & DW_CFA_BITMAPORICON)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6086 {
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6087 rend = gtk_cell_renderer_pixbuf_new();
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6088 gtk_tree_view_column_pack_start(col, rend, FALSE);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6089 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", z+_DW_CONTAINER_STORE_EXTRA+1);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6090 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6091 else if(flags[z] & DW_CFA_STRING)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6092 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6093 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6094 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6095 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
784
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
6096 gtk_tree_view_column_set_resizable(col, TRUE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6097 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6098 else if(flags[z] & DW_CFA_ULONG)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6099 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6100 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6101 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6102 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
784
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
6103 gtk_tree_view_column_set_resizable(col, TRUE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6104 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6105 else if(flags[z] & DW_CFA_TIME)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6106 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6107 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6108 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6109 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
784
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
6110 gtk_tree_view_column_set_resizable(col, TRUE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6111 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6112 else if(flags[z] & DW_CFA_DATE)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6113 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6114 rend = gtk_cell_renderer_text_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6115 gtk_tree_view_column_pack_start(col, rend, TRUE);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6116 gtk_tree_view_column_add_attribute(col, rend, "text", z+_DW_CONTAINER_STORE_EXTRA+1);
784
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
6117 gtk_tree_view_column_set_resizable(col, TRUE);
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
6118 }
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6119 g_object_set_data(G_OBJECT(col), "_dw_column", GINT_TO_POINTER(z));
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
6120 params[2] = tree;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
6121 g_signal_connect_data(G_OBJECT(col), "clicked", G_CALLBACK(_dw_column_click_event), (gpointer)params, _dw_signal_disconnect, 0);
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
6122 gtk_tree_view_column_set_title(col, titles[z]);
884
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6123 if(flags[z] & DW_CFA_RIGHT)
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6124 {
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6125 gtk_tree_view_column_set_alignment(col, 1.0);
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6126 if(rend)
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6127 gtk_cell_renderer_set_alignment(rend, 1.0, 0.5);
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6128 }
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6129 else if(flags[z] & DW_CFA_CENTER)
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6130 {
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6131 gtk_tree_view_column_set_alignment(col, 0.5);
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6132 if(rend)
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6133 gtk_cell_renderer_set_alignment(rend, 0.5, 0.5);
0f99520041c4 Implemented container column alignment on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 883
diff changeset
6134 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6135 gtk_tree_view_append_column(GTK_TREE_VIEW (tree), col);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6136 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6137 /* Finish up */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6138 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), TRUE);
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6139 gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(tree), TRUE);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6140 gtk_tree_view_set_rubber_banding(GTK_TREE_VIEW(tree), TRUE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6141 sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6142 if(g_object_get_data(G_OBJECT(handle), "_dw_multi_sel"))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6143 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6144 gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6145 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6146 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6147 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6148 gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6149 }
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
6150 gtk_widget_show(tree);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6151 free(array);
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
6152 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
6153 dw_window_set_font(handle, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6154 DW_MUTEX_UNLOCK;
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
6155 return DW_ERROR_NONE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6156 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6157
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6158 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6159 * Sets up the container columns.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6160 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6161 * handle: Handle to the container to be configured.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6162 * flags: An array of unsigned longs with column flags.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6163 * titles: An array of strings with column text titles.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6164 * count: The number of columns (this should match the arrays).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6165 * separator: The column number that contains the main separator.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6166 * (this item may only be used in OS/2)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6167 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6168 int dw_container_setup(HWND handle, unsigned long *flags, char **titles, int count, int separator)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6169 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6170 return _dw_container_setup(handle, flags, titles, count, separator, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6171 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6172
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6173 /*
1744
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6174 * Configures the main filesystem columnn title for localization.
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6175 * Parameters:
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6176 * handle: Handle to the container to be configured.
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6177 * title: The title to be displayed in the main column.
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6178 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6179 void API dw_filesystem_set_column_title(HWND handle, const char *title)
1744
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6180 {
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6181 char *newtitle = strdup(title ? title : "");
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6182
1745
7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1744
diff changeset
6183 g_object_set_data(G_OBJECT(handle), "_dw_coltitle", newtitle);
1744
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6184 }
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6185
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6186 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6187 * Sets up the filesystem columns, note: filesystem always has an icon/filename field.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6188 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6189 * handle: Handle to the container to be configured.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6190 * flags: An array of unsigned longs with column flags.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6191 * titles: An array of strings with column text titles.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6192 * count: The number of columns (this should match the arrays).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6193 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6194 int dw_filesystem_setup(HWND handle, unsigned long *flags, char **titles, int count)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6195 {
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6196 char **newtitles = malloc(sizeof(char *) * (count + 1));
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6197 unsigned long *newflags = malloc(sizeof(unsigned long) * (count + 1));
1745
7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1744
diff changeset
6198 char *coltitle = (char *)g_object_get_data(G_OBJECT(handle), "_dw_coltitle");
1744
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6199
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6200 newtitles[0] = coltitle ? coltitle : "Filename";
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6201 newflags[0] = DW_CFA_STRINGANDICON | DW_CFA_LEFT | DW_CFA_HORZSEPARATOR;
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6202
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6203 memcpy(&newtitles[1], titles, sizeof(char *) * count);
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6204 memcpy(&newflags[1], flags, sizeof(unsigned long) * count);
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6205
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6206 _dw_container_setup(handle, newflags, newtitles, count + 1, 1, 1);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6207
1744
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6208 if(coltitle)
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6209 {
1745
7dd1659c2693 Fixes for the new localization function on OS/2 and GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1744
diff changeset
6210 g_object_set_data(G_OBJECT(handle), "_dw_coltitle", NULL);
1744
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6211 free(coltitle);
535e8c19a13d Added dw_filesystem_set_column_title() function to aid in localization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1742
diff changeset
6212 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6213 if ( newtitles) free(newtitles);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6214 if ( newflags ) free(newflags);
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
6215 return DW_ERROR_NONE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6216 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6217
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6218 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6219 * Obtains an icon from a module (or header in GTK).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6220 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6221 * module: Handle to module (DLL) in OS/2 and Windows.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6222 * id: A unsigned long id int the resources on OS/2 and
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6223 * Windows, on GTK this is converted to a pointer
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6224 * to an embedded XPM.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6225 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6226 HICN dw_icon_load(unsigned long module, unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6227 {
976
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
6228 return (HICN)id;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6229 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6230
1706
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1679
diff changeset
6231 /* Internal function to keep HICNs from getting too big */
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1679
diff changeset
6232 GdkPixbuf *_icon_resize(GdkPixbuf *ret)
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1679
diff changeset
6233 {
1709
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6234 if(ret)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6235 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6236 int pwidth = gdk_pixbuf_get_width(ret);
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6237 int pheight = gdk_pixbuf_get_height(ret);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
6238
1709
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6239 if(pwidth > 24 || pheight > 24)
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6240 {
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6241 GdkPixbuf *orig = ret;
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6242 ret = gdk_pixbuf_scale_simple(ret, pwidth > 24 ? 24 : pwidth, pheight > 24 ? 24 : pheight, GDK_INTERP_BILINEAR);
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6243 g_object_unref(G_OBJECT(orig));
de49c1f284b2 Safety check for the icon resize code on Mac and GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1706
diff changeset
6244 }
1706
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1679
diff changeset
6245 }
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1679
diff changeset
6246 return ret;
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1679
diff changeset
6247 }
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1679
diff changeset
6248
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6249 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6250 * Obtains an icon from a file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6251 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6252 * filename: Name of the file, omit extention to have
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6253 * DW pick the appropriate file extension.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6254 * (ICO on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6255 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6256 HICN API dw_icon_load_from_file(const char *filename)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6257 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6258 int _dw_locked_by_me = FALSE;
1258
3df86772b625 Updated the list of supported image formats for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1245
diff changeset
6259 char *file = alloca(strlen(filename) + 6);
976
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
6260 int i, found_ext = 0;
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
6261 HICN ret = 0;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6262
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6263 if (!file)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6264 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6265
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6266 strcpy(file, filename);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6267
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6268 /* check if we can read from this file (it exists and read permission) */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6269 if (access(file, 04) != 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6270 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6271 /* Try with various extentions */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6272 for ( i = 0; i < NUM_EXTS; i++ )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6273 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6274 strcpy( file, filename );
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
6275 strcat( file, _dw_image_exts[i] );
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6276 if ( access( file, 04 ) == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6277 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6278 found_ext = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6279 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6280 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6281 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6282 if ( found_ext == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6283 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6284 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6285 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6286 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6287
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6288 DW_MUTEX_LOCK;
1706
fb6807b0ab0d Limit the size of an HICN to 24x24 on GTK... icons are used for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1679
diff changeset
6289 ret = _icon_resize(gdk_pixbuf_new_from_file(file, NULL));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6290 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6291 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6292 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6293
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6294 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6295 * Obtains an icon from data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6296 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6297 * data: Source of data for image.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6298 * len: length of data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6299 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6300 HICN API dw_icon_load_from_data(const char *data, int len)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6301 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6302 int fd, written = -1, _dw_locked_by_me = FALSE;
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
6303 char template[] = "/tmp/dwiconXXXXXX";
976
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
6304 HICN ret = 0;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6305
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6306 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6307 * A real hack; create a temporary file and write the contents
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6308 * of the data to the file
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6309 */
2201
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
6310 if((fd = mkstemp(template)) != -1)
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
6311 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
6312 written = write(fd, data, len);
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
6313 close(fd);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6314 }
2201
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
6315 /* Bail if we couldn't write full file */
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
6316 if(fd == -1 || written != len)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6317 return 0;
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
6318 DW_MUTEX_LOCK;
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
6319 ret = _icon_resize(gdk_pixbuf_new_from_file(template, NULL));
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
6320 DW_MUTEX_UNLOCK;
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
6321 unlink(template);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6322 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6323 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6324
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6325 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6326 * Frees a loaded resource in OS/2 and Windows.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6327 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6328 * handle: Handle to icon returned by dw_icon_load().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6329 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6330 void dw_icon_free(HICN handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6331 {
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
6332 int iicon = GPOINTER_TO_INT(handle);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6333
976
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
6334 if(iicon > 65535)
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
6335 {
ab244c6f9386 Changed HICN to be a pointer type and simplified the icon code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 972
diff changeset
6336 g_object_unref(handle);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6337 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6338 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6339
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6340 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6341 * Allocates memory used to populate a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6342 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6343 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6344 * rowcount: The number of items to be populated.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6345 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6346 void *dw_container_alloc(HWND handle, int rowcount)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6347 {
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6348 int z, prevrowcount = 0;
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6349 GtkWidget *cont;
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6350 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6351 int _dw_locked_by_me = FALSE;
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6352
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6353 DW_MUTEX_LOCK;
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6354 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6355
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6356 /* Make sure it is the correct tree type */
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6357 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6358 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6359
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6360 if(store)
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6361 {
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6362 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6363
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
6364 prevrowcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6365
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6366 for(z=0;z<rowcount;z++)
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6367 {
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6368 gtk_list_store_append(store, &iter);
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6369 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6370 g_object_set_data(G_OBJECT(cont), "_dw_insertpos", GINT_TO_POINTER(prevrowcount));
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6371 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rowcount + prevrowcount));
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6372 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6373 DW_MUTEX_UNLOCK;
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6374 return (void *)cont;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6375 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6376
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6377 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6378 * Internal representation of dw_container_set_item() extracted so we can pass
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6379 * two data pointers; icon and text for dw_filesystem_set_item().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6380 */
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6381 void _dw_container_set_item(HWND handle, void *pointer, int column, int row, void *data)
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6382 {
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
6383 char numbuf[25] = {0}, textbuffer[101] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6384 int flag = 0;
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6385 GtkWidget *cont;
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6386 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6387 int _dw_locked_by_me = FALSE;
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6388
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6389 DW_MUTEX_LOCK;
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6390 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6391
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6392 /* Make sure it is the correct tree type */
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6393 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6394 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6395
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6396 if(store)
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6397 {
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6398 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6399
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
6400 snprintf(numbuf, 24, "_dw_cont_col%d", column);
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
6401 flag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), numbuf));
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6402 if(pointer)
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6403 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
6404 row += GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_insertpos"));
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6405 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6406
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6407 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row))
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6408 {
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6409 if(flag & DW_CFA_STRINGANDICON)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6410 {
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6411 void **thisdata = (void **)data;
1501
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6412 HICN hicon = data ? *((HICN *)thisdata[0]) : 0;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6413 char *tmp = data ? (char *)thisdata[1] : NULL;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
6414 GdkPixbuf *pixbuf = hicon ? _dw_find_pixbuf(hicon, NULL, NULL) : NULL;
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6415
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6416 gtk_list_store_set(store, &iter, _DW_CONTAINER_STORE_EXTRA, pixbuf, -1);
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6417 gtk_list_store_set(store, &iter, _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1);
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6418 }
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6419 else if(flag & DW_CFA_BITMAPORICON)
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6420 {
1501
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6421 HICN hicon = data ? *((HICN *)data) : 0;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
6422 GdkPixbuf *pixbuf = hicon ? _dw_find_pixbuf(hicon, NULL, NULL) : NULL;
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6423
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6424 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, pixbuf, -1);
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6425 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6426 else if(flag & DW_CFA_STRING)
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6427 {
1501
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6428 char *tmp = data ? *((char **)data) : NULL;
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6429 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1);
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6430 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6431 else if(flag & DW_CFA_ULONG)
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6432 {
1501
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6433 ULONG tmp = data ? *((ULONG *)data): 0;
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6434
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6435 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, tmp, -1);
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6436 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6437 else if(flag & DW_CFA_DATE)
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6438 {
1501
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6439 if(data)
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6440 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6441 struct tm curtm;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6442 CDATE cdate = *((CDATE *)data);
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6443
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6444 memset( &curtm, 0, sizeof(curtm) );
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6445 curtm.tm_mday = cdate.day;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6446 curtm.tm_mon = cdate.month - 1;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6447 curtm.tm_year = cdate.year - 1900;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6448
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6449 strftime(textbuffer, 100, "%x", &curtm);
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6450 }
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6451 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, textbuffer, -1);
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6452 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6453 else if(flag & DW_CFA_TIME)
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6454 {
1501
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6455 if(data)
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6456 {
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6457 struct tm curtm;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6458 CTIME ctime = *((CTIME *)data);
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6459
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6460 memset( &curtm, 0, sizeof(curtm) );
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6461 curtm.tm_hour = ctime.hours;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6462 curtm.tm_min = ctime.minutes;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6463 curtm.tm_sec = ctime.seconds;
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6464
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6465 strftime(textbuffer, 100, "%X", &curtm);
7060e258e383 Allow passing NULL to the dw_container_change/set_item() APIs on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1499
diff changeset
6466 }
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6467 gtk_list_store_set(store, &iter, column + _DW_CONTAINER_STORE_EXTRA + 1, textbuffer, -1);
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6468 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6469 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6470 }
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6471 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6472 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6473
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6474 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6475 * Sets an item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6476 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6477 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6478 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6479 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6480 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6481 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6482 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6483 void dw_container_set_item(HWND handle, void *pointer, int column, int row, void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6484 {
835
82072ff08513 Removed some GTK_IS_TREE_VIEW checks that were erroneously dropping out of valid requests.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 830
diff changeset
6485 _dw_container_set_item(handle, pointer, column, row, data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6486 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6487
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6488 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6489 * Changes an existing item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6490 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6491 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6492 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6493 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6494 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6495 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6496 void dw_container_change_item(HWND handle, int column, int row, void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6497 {
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6498 _dw_container_set_item(handle, NULL, column, row, data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6499 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6500
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6501 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6502 * Changes an existing item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6503 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6504 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6505 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6506 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6507 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6508 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6509 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6510 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6511 dw_filesystem_set_item(handle, NULL, column, row, data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6512 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6513
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6514 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6515 * Changes an item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6516 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6517 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6518 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6519 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6520 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6521 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6522 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6523 void API dw_filesystem_change_file(HWND handle, int row, const char *filename, HICN icon)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6524 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6525 dw_filesystem_set_file(handle, NULL, row, filename, icon);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6526 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6527
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6528 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6529 * Sets an item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6530 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6531 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6532 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6533 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6534 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6535 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6536 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6537 void dw_filesystem_set_file(HWND handle, void *pointer, int row, const char *filename, HICN icon)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6538 {
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6539 void *data[2] = { (void *)&icon, (void *)filename };
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6540
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6541 _dw_container_set_item(handle, pointer, 0, row, (void *)data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6542 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6543
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6544 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6545 * Sets an item in specified row and column to the given data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6546 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6547 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6548 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6549 * column: Zero based column of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6550 * row: Zero based row of data being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6551 * data: Pointer to the data to be added.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6552 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6553 void dw_filesystem_set_item(HWND handle, void *pointer, int column, int row, void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6554 {
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6555 _dw_container_set_item(handle, pointer, column + 1, row, data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6556 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6557
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6558 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6559 * Gets column type for a container column
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6560 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6561 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6562 * column: Zero based column.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6563 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6564 int dw_container_get_column_type(HWND handle, int column)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6565 {
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
6566 char numbuf[25] = {0};
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
6567 int flag, rc = 0;
786
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
6568 GtkWidget *cont = handle;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6569 int _dw_locked_by_me = FALSE;
781
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6570
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6571 DW_MUTEX_LOCK;
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6572 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
df6091308b3f Have the basics of containers working now with the tree view widget.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 780
diff changeset
6573 if(!cont)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6574 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6575 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6576 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6577 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6578
2199
8ee74cf778cb GTK: Increase number buffers to 25 bytes to make sure they can store an
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2197
diff changeset
6579 snprintf(numbuf, 24, "_dw_cont_col%d", column);
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
6580 flag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), numbuf));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6581
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6582 if(flag & DW_CFA_BITMAPORICON)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6583 rc = DW_CFA_BITMAPORICON;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6584 else if(flag & DW_CFA_STRING)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6585 rc = DW_CFA_STRING;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6586 else if(flag & DW_CFA_ULONG)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6587 rc = DW_CFA_ULONG;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6588 else if(flag & DW_CFA_DATE)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6589 rc = DW_CFA_DATE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6590 else if(flag & DW_CFA_TIME)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6591 rc = DW_CFA_TIME;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6592 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6593 rc = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6594 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6595 return rc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6596 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6597
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6598 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6599 * Gets column type for a filesystem container column
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6600 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6601 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6602 * column: Zero based column.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6603 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6604 int API dw_filesystem_get_column_type(HWND handle, int column)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6605 {
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
6606 return dw_container_get_column_type( handle, column + 1 );
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6607 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6608
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6609 /*
1207
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6610 * Sets the alternating row colors for container window (widget) handle.
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6611 * Parameters:
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6612 * handle: The window (widget) handle.
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6613 * oddcolor: Odd row background color in DW_RGB format or a default color index.
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6614 * evencolor: Even row background color in DW_RGB format or a default color index.
1211
70dca53cb071 Updated GTK3 with the behavior change just commited for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1207
diff changeset
6615 * DW_RGB_TRANSPARENT will disable coloring rows.
70dca53cb071 Updated GTK3 with the behavior change just commited for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1207
diff changeset
6616 * DW_CLR_DEFAULT will use the system default alternating row colors.
1207
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6617 */
1291
b99b0b2c2826 Renamed dw_container_set_row_bg() to dw_container_set_stripe().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1289
diff changeset
6618 void API dw_container_set_stripe(HWND handle, unsigned long oddcolor, unsigned long evencolor)
1207
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6619 {
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
6620 #if !GTK_CHECK_VERSION(3,14,0)
1207
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6621 GtkWidget *cont;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6622 int _dw_locked_by_me = FALSE;
1207
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6623 DW_MUTEX_LOCK;
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6624 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6625
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6626 /* Make sure it is the correct tree type */
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6627 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6628 {
1211
70dca53cb071 Updated GTK3 with the behavior change just commited for Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1207
diff changeset
6629 if(oddcolor == DW_RGB_TRANSPARENT && evencolor == DW_RGB_TRANSPARENT)
1207
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6630 gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(cont), FALSE);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
6631 else
1207
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6632 gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(cont), TRUE);
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6633 }
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6634 DW_MUTEX_UNLOCK;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
6635 #endif
1207
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6636 }
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6637
423da07c8f05 Basic support for row colors on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1203
diff changeset
6638 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6639 * Sets the width of a column in the container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6640 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6641 * handle: Handle to window (widget) of container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6642 * column: Zero based column of width being set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6643 * width: Width of column in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6644 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6645 void dw_container_set_column_width(HWND handle, int column, int width)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6646 {
830
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6647 GtkWidget *cont;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6648 int _dw_locked_by_me = FALSE;
830
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6649
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6650 DW_MUTEX_LOCK;
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6651 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
6652
830
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6653 /* Make sure it is the correct tree type */
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6654 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6655 {
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6656 GtkTreeViewColumn *col = gtk_tree_view_get_column(GTK_TREE_VIEW(cont), column);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6657
830
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6658 if(col && GTK_IS_TREE_VIEW_COLUMN(col))
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6659 {
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6660 gtk_tree_view_column_set_fixed_width(GTK_TREE_VIEW_COLUMN(col), width);
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6661 }
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6662 }
43e6282463fa Implemented dw_container_set_column_width().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 820
diff changeset
6663 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6664 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6665
820
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6666 /* Internal version for both */
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6667 void _dw_container_set_row_data(HWND handle, void *pointer, int row, int type, void *data)
820
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6668 {
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6669 GtkWidget *cont = handle;
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6670 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6671 int _dw_locked_by_me = FALSE;
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6672
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6673 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6674 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6675 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6676 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6677
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6678 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6679 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6680 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6681
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6682 if(pointer)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6683 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
6684 row += GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_insertpos"));
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6685 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6686
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6687 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6688 {
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6689 gtk_list_store_set(store, &iter, type, (gpointer)data, -1);
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6690 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6691 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6692 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6693 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6694
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6695 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6696 * Sets the title of a row in the container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6697 * Parameters:
820
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6698 * pointer: Pointer to the allocated memory in dw_container_alloc().
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6699 * row: Zero based row of data being set.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6700 * title: String title of the item.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6701 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6702 void dw_container_set_row_title(void *pointer, int row, const char *title)
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6703 {
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6704 _dw_container_set_row_data(pointer, pointer, row, _DW_DATA_TYPE_STRING, (void *)title);
820
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6705 }
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6706
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6707 /*
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6708 * Changes the title of a row already inserted in the container.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6709 * Parameters:
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6710 * handle: Handle to window (widget) of container.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6711 * row: Zero based row of data being set.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6712 * title: String title of the item.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6713 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6714 void dw_container_change_row_title(HWND handle, int row, const char *title)
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6715 {
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
6716 _dw_container_set_row_data(handle, NULL, row, _DW_DATA_TYPE_STRING, (void *)title);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6717 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6718
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6719 /*
1875
fb137f7f91e4 Initial commit of GTK2 code changes (untested) ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1873
diff changeset
6720 * Sets the data of a row in the container.
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6721 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6722 * pointer: Pointer to the allocated memory in dw_container_alloc().
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6723 * row: Zero based row of data being set.
1875
fb137f7f91e4 Initial commit of GTK2 code changes (untested) ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1873
diff changeset
6724 * data: Data pointer.
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6725 */
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6726 void dw_container_set_row_data(void *pointer, int row, void *data)
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6727 {
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6728 _dw_container_set_row_data(pointer, pointer, row, _DW_DATA_TYPE_POINTER, data);
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6729 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6730
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6731 /*
1875
fb137f7f91e4 Initial commit of GTK2 code changes (untested) ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1873
diff changeset
6732 * Changes the data of a row already inserted in the container.
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6733 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6734 * handle: Handle to window (widget) of container.
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6735 * row: Zero based row of data being set.
1875
fb137f7f91e4 Initial commit of GTK2 code changes (untested) ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1873
diff changeset
6736 * data: Data pointer.
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6737 */
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6738 void dw_container_change_row_data(HWND handle, int row, void *data)
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6739 {
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
6740 _dw_container_set_row_data(handle, NULL, row, _DW_DATA_TYPE_POINTER, data);
820
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6741 }
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6742
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6743 /*
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6744 * Sets the title of a row in the container.
19a632499344 GTK2/3 changes for similar dw_container_set_item() and dw_container_change_item() misbehavior.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 818
diff changeset
6745 * Parameters:
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6746 * handle: Handle to the container window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6747 * pointer: Pointer to the allocated memory in dw_container_alloc().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6748 * rowcount: The number of rows to be inserted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6749 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6750 void dw_container_insert(HWND handle, void *pointer, int rowcount)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6751 {
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6752 /* Don't need to do anything here */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6753 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6754
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6755 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6756 * Removes the first x rows from a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6757 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6758 * handle: Handle to the window (widget) to be deleted from.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6759 * rowcount: The number of rows to be deleted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6760 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6761 void dw_container_delete(HWND handle, int rowcount)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6762 {
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6763 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6764 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6765 int _dw_locked_by_me = FALSE;
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6766
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6767 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6768 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6769
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6770 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6771 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6772 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6773
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6774 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6775 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6776 GtkTreeIter iter;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6777 int rows, z;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6778
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
6779 rows = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6780
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6781 for(z=0;z<rowcount;z++)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6782 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6783 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6784 gtk_list_store_remove(store, &iter);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6785 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6786
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6787 if(rows - rowcount < 0)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6788 rows = 0;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6789 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6790 rows -= rowcount;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6791
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6792 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rows));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6793 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6794 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6795 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6796
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6797 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6798 * Removes all rows from a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6799 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6800 * handle: Handle to the window (widget) to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6801 * redraw: TRUE to cause the container to redraw immediately.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6802 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6803 void dw_container_clear(HWND handle, int redraw)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6804 {
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6805 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6806 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6807 int _dw_locked_by_me = FALSE;
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6808
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6809 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6810 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6811
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6812 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6813 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6814 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6815
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6816 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6817 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6818 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(0));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6819 g_object_set_data(G_OBJECT(cont), "_dw_insertpos", GINT_TO_POINTER(0));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6820
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6821 gtk_list_store_clear(store);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6822 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6823 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6824 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6825
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6826 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6827 * Scrolls container up or down.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6828 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6829 * handle: Handle to the window (widget) to be scrolled.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6830 * direction: DW_SCROLL_UP, DW_SCROLL_DOWN, DW_SCROLL_TOP or
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6831 * DW_SCROLL_BOTTOM. (rows is ignored for last two)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6832 * rows: The number of rows to be scrolled.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6833 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6834 void dw_container_scroll(HWND handle, int direction, long rows)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6835 {
861
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6836 GtkWidget *cont;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6837 int _dw_locked_by_me = FALSE;
861
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6838
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6839 DW_MUTEX_LOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6840 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6841
861
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6842 /* Make sure it is the correct tree type */
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6843 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6844 {
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
6845 GtkAdjustment *adjust = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(cont));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6846
861
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6847 if(adjust)
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6848 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
6849 gint rowcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
861
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6850 gdouble currpos = gtk_adjustment_get_value(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6851 gdouble upper = gtk_adjustment_get_upper(adjust);
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6852 gdouble lower = gtk_adjustment_get_lower(adjust);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6853 gdouble change;
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6854
861
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6855 /* Safety check */
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6856 if(rowcount < 1)
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6857 {
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6858 DW_MUTEX_UNLOCK;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6859 return;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6860 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6861
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6862 change = ((gdouble)rows/(gdouble)rowcount) * (upper - lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6863
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6864 switch(direction)
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6865 {
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6866 case DW_SCROLL_TOP:
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6867 {
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6868 gtk_adjustment_set_value(adjust, lower);
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6869 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6870 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6871 case DW_SCROLL_BOTTOM:
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6872 {
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6873 gtk_adjustment_set_value(adjust, upper);
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6874 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6875 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6876 case DW_SCROLL_UP:
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6877 {
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6878 gdouble newpos = currpos - change;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6879 if(newpos < lower)
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6880 {
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6881 newpos = lower;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6882 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6883 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6884 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6885 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6886 case DW_SCROLL_DOWN:
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6887 {
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6888 gdouble newpos = currpos + change;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6889 if(newpos > upper)
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6890 {
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6891 newpos = upper;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6892 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6893 gtk_adjustment_set_value(adjust, newpos);
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6894 break;
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6895 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6896 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6897 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6898 }
8f2722696a8e Implemented dw_container_scroll() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 843
diff changeset
6899 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6900 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6901
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6902 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6903 * Starts a new query of a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6904 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6905 * handle: Handle to the window (widget) to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6906 * flags: If this parameter is DW_CRA_SELECTED it will only
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6907 * return items that are currently selected. Otherwise
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6908 * it will return all records in the container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6909 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6910 char *dw_container_query_start(HWND handle, unsigned long flags)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6911 {
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6912 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6913 GtkListStore *store = NULL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6914 char *retval = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
6915 int _dw_locked_by_me = FALSE;
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6916 int type = flags & DW_CR_RETDATA ? _DW_DATA_TYPE_POINTER : _DW_DATA_TYPE_STRING;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6917
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6918 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6919 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6920
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6921 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6922 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6923 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6924
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6925 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6926 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6927 /* These should be separate but right now this will work */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6928 if(flags & DW_CRA_SELECTED)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6929 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6930 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6931 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6932 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6933 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6934 GtkTreePath *path = g_list_nth_data(list, 0);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6935
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6936 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6937 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6938 gint *indices = gtk_tree_path_get_indices(path);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6939
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6940 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6941 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6942 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6943
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6944 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, indices[0]))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6945 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6946 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6947 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(1));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6948 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6949 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6950 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6951 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6952 g_list_free(list);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6953 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6954 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6955 else if(flags & DW_CRA_CURSORED)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6956 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6957 GtkTreePath *path;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6958
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6959 gtk_tree_view_get_cursor(GTK_TREE_VIEW(cont), &path, NULL);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6960 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6961 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6962 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6963
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6964 if(gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6965 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6966 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6967 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6968 gtk_tree_path_free(path);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6969 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6970 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6971 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6972 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6973 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
6974
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6975 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6976 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6977 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6978 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(1));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6979 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6980 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6981 }
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6982 /* If there is a title, duplicate it and free the temporary copy */
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6983 if(retval && type == _DW_DATA_TYPE_STRING)
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6984 {
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6985 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6986 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6987 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
6988 }
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
6989 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6990 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6991 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6992
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6993 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6994 * Continues an existing query of a container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6995 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6996 * handle: Handle to the window (widget) to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6997 * flags: If this parameter is DW_CRA_SELECTED it will only
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6998 * return items that are currently selected. Otherwise
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
6999 * it will return all records in the container.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7000 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7001 char *dw_container_query_next(HWND handle, unsigned long flags)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7002 {
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7003 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7004 GtkListStore *store = NULL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7005 char *retval = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7006 int _dw_locked_by_me = FALSE;
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7007 int type = flags & DW_CR_RETDATA ? _DW_DATA_TYPE_POINTER : _DW_DATA_TYPE_STRING;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7008
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7009 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7010 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7011
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7012 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7013 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7014 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7015
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7016 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7017 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
7018 int pos = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_querypos"));
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7019 int count = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7020
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7021 /* These should be separate but right now this will work */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7022 if(flags & DW_CRA_SELECTED)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7023 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7024 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7025 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7026
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7027 if(list)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7028 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7029 GtkTreePath *path = g_list_nth_data(list, pos);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7030
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7031 if(path)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7032 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7033 gint *indices = gtk_tree_path_get_indices(path);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7034
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7035 if(indices)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7036 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7037 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7038
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7039 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, indices[0]))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7040 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7041 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7042 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(pos+1));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7043 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7044 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7045 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7046 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7047 g_list_free(list);
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7048 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7049 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7050 else if(flags & DW_CRA_CURSORED)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7051 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7052 /* There will only be one item cursored,
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7053 * retrieve it with dw_container_query_start()
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7054 */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7055 retval = NULL;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7056 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7057 else
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7058 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7059 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7060
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7061 if(pos < count && gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, pos))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7062 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7063 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, type, &retval, -1);
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7064 g_object_set_data(G_OBJECT(cont), "_dw_querypos", GINT_TO_POINTER(pos+1));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7065 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7066 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7067 }
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7068 /* If there is a title, duplicate it and free the temporary copy */
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7069 if(retval && type == _DW_DATA_TYPE_STRING)
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7070 {
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7071 char *temp = retval;
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7072 retval = strdup(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7073 g_free(temp);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7074 }
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7075 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7076 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7077 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7078
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7079 int _dw_find_iter(GtkListStore *store, GtkTreeIter *iter, void *data, int textcomp)
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7080 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7081 int z, rows = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7082 void *thisdata;
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7083 int retval = FALSE;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7084
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7085 for(z=0;z<rows;z++)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7086 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7087 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), iter, NULL, z))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7088 {
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7089 /* Get either string from position 0 or pointer from position 1 */
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7090 gtk_tree_model_get(GTK_TREE_MODEL(store), iter, textcomp ? _DW_DATA_TYPE_STRING : _DW_DATA_TYPE_POINTER, &thisdata, -1);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7091 if((textcomp && thisdata && strcmp((char *)thisdata, (char *)data) == 0) || (!textcomp && thisdata == data))
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7092 {
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7093 retval = TRUE;
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7094 z = rows;
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7095 }
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7096 if(textcomp && thisdata)
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7097 g_free(thisdata);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7098 }
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7099 }
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
7100 return retval;
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7101 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7102
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7103 void _dw_container_cursor(HWND handle, void *data, int textcomp)
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7104 {
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7105 GtkWidget *cont;
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7106 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7107 int _dw_locked_by_me = FALSE;
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7108
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7109 DW_MUTEX_LOCK;
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7110 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7111
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7112 /* Make sure it is the correct tree type */
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7113 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7114 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7115
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7116 if(store)
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7117 {
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7118 GtkTreeIter iter;
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7119
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7120 if(_dw_find_iter(store, &iter, data, textcomp))
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7121 {
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7122 GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7123
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7124 if(path)
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7125 {
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7126 gtk_tree_view_row_activated(GTK_TREE_VIEW(cont), path, NULL);
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7127 gtk_tree_path_free(path);
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7128 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7129 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7130 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7131 DW_MUTEX_UNLOCK;
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7132 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7133
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7134 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7135 * Cursors the item with the text speficied, and scrolls to that item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7136 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7137 * handle: Handle to the window (widget) to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7138 * text: Text usually returned by dw_container_query().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7139 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
7140 void dw_container_cursor(HWND handle, const char *text)
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
7141 {
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
7142 _dw_container_cursor(handle, (void *)text, TRUE);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7143 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7144
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7145 /*
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7146 * Cursors the item with the text speficied, and scrolls to that item.
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7147 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7148 * handle: Handle to the window (widget) to be queried.
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7149 * text: Text usually returned by dw_container_query().
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7150 */
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7151 void dw_container_cursor_by_data(HWND handle, void *data)
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7152 {
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7153 _dw_container_cursor(handle, data, FALSE);
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7154 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7155
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7156 void _dw_container_delete_row(HWND handle, void *data, int textcomp)
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7157 {
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7158 GtkWidget *cont;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7159 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7160 int _dw_locked_by_me = FALSE;
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7161
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7162 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7163 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7164
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7165 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7166 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7167 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7168
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7169 if(store)
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7170 {
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7171 GtkTreeIter iter;
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7172 int rows = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount"));
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7173
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7174 if(_dw_find_iter(store, &iter, data, textcomp))
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7175 {
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7176 gtk_list_store_remove(store, &iter);
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7177 rows--;
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7178 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7179
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7180 g_object_set_data(G_OBJECT(cont), "_dw_rowcount", GINT_TO_POINTER(rows));
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7181 }
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7182 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7183 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7184
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7185 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7186 * Deletes the item with the text speficied.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7187 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7188 * handle: Handle to the window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7189 * text: Text usually returned by dw_container_query().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7190 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
7191 void dw_container_delete_row(HWND handle, const char *text)
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
7192 {
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
7193 _dw_container_delete_row(handle, (void *)text, TRUE);
1873
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7194 }
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7195
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7196 /*
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7197 * Deletes the item with the text speficied.
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7198 * Parameters:
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7199 * handle: Handle to the window (widget).
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7200 * text: Text usually returned by dw_container_query().
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7201 */
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7202 void dw_container_delete_row_by_data(HWND handle, void *data)
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7203 {
15d24b5300ec Third GTK3 round of changes to split string and data
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1861
diff changeset
7204 _dw_container_delete_row(handle, data, FALSE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7205 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7206
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7207 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7208 * Optimizes the column widths so that all data is visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7209 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7210 * handle: Handle to the window (widget) to be optimized.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7211 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7212 void dw_container_optimize(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7213 {
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7214 GtkWidget *cont;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7215 int _dw_locked_by_me = FALSE;
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7216
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7217 DW_MUTEX_LOCK;
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7218 cont = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7219
782
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7220 /* Make sure it is the correct tree type */
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7221 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER))
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7222 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(cont));
5a4bfe989f50 Most of the dw_container_* functions now implemented but many untested.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 781
diff changeset
7223 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7224 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7225
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7226 /* Translate the status message into a message on our buddy window */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7227 static void _dw_status_translate(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7228 {
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7229 GdkEventButton event = { 0 };
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7230 long x, y;
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7231 gboolean retval;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7232
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7233 dw_pointer_query_pos(&x, &y);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7234
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7235 event.button = button;
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7236 event.x = x;
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7237 event.y = y;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7238
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7239 g_signal_emit_by_name(G_OBJECT(user_data), "button_press_event", &event, &retval);
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7240 }
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7241
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7242 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7243 * Inserts an icon into the taskbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7244 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7245 * handle: Window handle that will handle taskbar icon messages.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7246 * icon: Icon handle to display in the taskbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7247 * bubbletext: Text to show when the mouse is above the icon.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7248 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
7249 void dw_taskbar_insert(HWND handle, HICN icon, const char *bubbletext)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7250 {
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7251 GtkStatusIcon *status;
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7252 GdkPixbuf *pixbuf;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7253 int _dw_locked_by_me = FALSE;
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7254
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7255 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7256 pixbuf = _dw_find_pixbuf(icon, NULL, NULL);
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7257 status = gtk_status_icon_new_from_pixbuf(pixbuf);
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7258 if(bubbletext)
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7259 gtk_status_icon_set_tooltip_text(status, bubbletext);
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7260 g_object_set_data(G_OBJECT(handle), "_dw_taskbar", status);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7261 g_signal_connect(G_OBJECT (status), "popup-menu", G_CALLBACK (_dw_status_translate), handle);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7262 gtk_status_icon_set_visible(status, TRUE);
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7263 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7264 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7265
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7266 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7267 * Deletes an icon from the taskbar.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7268 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7269 * handle: Window handle that was used with dw_taskbar_insert().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7270 * icon: Icon handle that was used with dw_taskbar_insert().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7271 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7272 void dw_taskbar_delete(HWND handle, HICN icon)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7273 {
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7274 GtkStatusIcon *status;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7275 int _dw_locked_by_me = FALSE;
1223
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7276
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7277 DW_MUTEX_LOCK;
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7278 status = g_object_get_data(G_OBJECT(handle), "_dw_taskbar");
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7279 g_object_unref(G_OBJECT(status));
1255ba41adad Added taskbar support for GTK...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1211
diff changeset
7280 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7281 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7282
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7283 /* Make sure the widget is out of the dirty list if it is destroyed */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7284 static void _dw_render_destroy(GtkWidget *widget, gpointer data)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7285 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7286 _dw_dirty_list = g_list_remove(_dw_dirty_list, widget);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7287 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7288
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7289 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7290 * Creates a rendering context widget (window) to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7291 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7292 * id: An id to be used with dw_window_from_id.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7293 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7294 * A handle to the widget or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7295 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7296 HWND dw_render_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7297 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7298 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7299 GtkWidget *tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7300
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7301 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7302 tmp = gtk_drawing_area_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7303 gtk_widget_set_events(tmp, GDK_EXPOSURE_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7304 | GDK_LEAVE_NOTIFY_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7305 | GDK_BUTTON_PRESS_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7306 | GDK_BUTTON_RELEASE_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7307 | GDK_KEY_PRESS_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7308 | GDK_POINTER_MOTION_MASK
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7309 | GDK_POINTER_MOTION_HINT_MASK);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7310 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7311 g_signal_connect(G_OBJECT(tmp), "destroy", G_CALLBACK(_dw_render_destroy), NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7312 gtk_widget_set_can_focus(tmp, TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7313 gtk_widget_show(tmp);
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
7314 if(_DWDefaultFont)
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
7315 dw_window_set_font(tmp, _DWDefaultFont);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7316 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7317 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7318 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7319
2355
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7320 /*
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7321 * 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: 2349
diff changeset
7322 * Parameters:
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7323 * 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: 2349
diff changeset
7324 */
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7325 void API dw_render_redraw(HWND handle)
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7326 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7327 int _dw_locked_by_me = FALSE;
2355
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7328
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7329 DW_MUTEX_LOCK;
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7330 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: 2349
diff changeset
7331 gtk_widget_queue_draw(handle);
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7332 DW_MUTEX_UNLOCK;
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7333 }
fad0821cb953 Add new function dw_render_redraw() which will trigger expose event on render widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2349
diff changeset
7334
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7335 /* Returns a GdkRGBA from a DW color */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7336 static GdkRGBA _dw_internal_color(unsigned long value)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7337 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7338 if(DW_RGB_COLOR & value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7339 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7340 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 };
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7341 return color;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7342 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7343 if (value < 16)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7344 return _dw_colors[value];
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7345 return _dw_colors[0];
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7346 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7347
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7348 /* Sets the current foreground drawing color.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7349 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7350 * red: red value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7351 * green: green value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7352 * blue: blue value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7353 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7354 void dw_color_foreground_set(unsigned long value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7355 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7356 GdkRGBA color = _dw_internal_color(value);
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7357 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7358
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7359 *foreground = color;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7360 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7361
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7362 /* Sets the current background drawing color.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7363 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7364 * red: red value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7365 * green: green value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7366 * blue: blue value.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7367 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7368 void dw_color_background_set(unsigned long value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7369 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7370 GdkRGBA *background = pthread_getspecific(_dw_bg_color_key);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7371
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7372 if(value == DW_CLR_DEFAULT)
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7373 {
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7374 if(background)
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7375 {
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7376 pthread_setspecific(_dw_bg_color_key, NULL);
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7377 free(background);
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7378 }
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7379 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7380 else
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7381 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7382 GdkRGBA color = _dw_internal_color(value);
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7383
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7384 if(!background)
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7385 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7386 background = malloc(sizeof(GdkRGBA));
972
32830f1683c9 Fixed an issue where dw_color_background_set() would not function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 971
diff changeset
7387 pthread_setspecific(_dw_bg_color_key, background);
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7388 }
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7389 *background = color;
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
7390 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7391 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7392
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7393 #if GTK_CHECK_VERSION(3,3,11)
1597
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7394 /* Allows the user to choose a color using the system's color chooser dialog.
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7395 * Parameters:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7396 * value: current color
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7397 * Returns:
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7398 * The selected color or the current color if cancelled.
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7399 */
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7400 unsigned long API dw_color_choose(unsigned long value)
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7401 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7402 GtkColorChooser *cd;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7403 GdkRGBA color = _dw_internal_color(value);
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7404 int _dw_locked_by_me = FALSE;
1597
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7405 unsigned long retcolor = value;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7406
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7407 DW_MUTEX_LOCK;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7408 cd = (GtkColorChooser *)gtk_color_chooser_dialog_new("Choose color", NULL);
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7409 gtk_color_chooser_set_use_alpha(cd, FALSE);
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7410 gtk_color_chooser_set_rgba(cd, &color);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7411
1597
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7412 gtk_widget_show(GTK_WIDGET(cd));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7413
1597
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7414 if(gtk_dialog_run(GTK_DIALOG(cd)) == GTK_RESPONSE_OK)
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7415 {
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7416 gtk_color_chooser_get_rgba(cd, &color);
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7417 retcolor = DW_RGB((int)(color.red * 255), (int)(color.green * 255), (int)(color.blue * 255));
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7418 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7419 gtk_widget_destroy(GTK_WIDGET(cd));
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7420 DW_MUTEX_UNLOCK;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7421 return retcolor;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7422 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7423 #else
1597
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7424 static int _dw_color_active = 0;
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7425
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7426 /* Internal function to handle the color OK press */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7427 static gint _dw_color_ok(GtkWidget *widget, DWDialog *dwwait)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7428 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7429 GdkRGBA color;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7430 unsigned long dw_color;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7431 GtkColorSelection *colorsel;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7432
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7433 if(!dwwait)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7434 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7435
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7436 colorsel = (GtkColorSelection *)gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dwwait->data));
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7437 gtk_color_selection_get_current_rgba(colorsel, &color);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7438 gtk_widget_destroy(GTK_WIDGET(dwwait->data));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7439 _dw_color_active = 0;
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7440 dw_color = DW_RGB((int)(color.red * 255), (int)(color.green * 255), (int)(color.blue * 255));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7441 dw_dialog_dismiss(dwwait, (void *)dw_color);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7442 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7443 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7444
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7445 /* Internal function to handle the color Cancel press */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7446 static gint _dw_color_cancel(GtkWidget *widget, DWDialog *dwwait)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7447 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7448 if(!dwwait)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7449 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7450
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7451 gtk_widget_destroy(GTK_WIDGET(dwwait->data));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7452 _dw_color_active = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7453 dw_dialog_dismiss(dwwait, (void *)-1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7454 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7455 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7456
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7457 /* Allows the user to choose a color using the system's color chooser dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7458 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7459 * value: current color
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7460 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7461 * The selected color or the current color if cancelled.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7462 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7463 unsigned long API dw_color_choose(unsigned long value)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7464 {
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
7465 GtkWidget *colorw, *ok_button, *cancel_button;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7466 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7467 DWDialog *dwwait;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7468 GtkColorSelection *colorsel;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7469 GdkRGBA color = _dw_internal_color(value);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7470 unsigned long dw_color;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7471
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7472 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7473
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7474 /* The DW mutex should be sufficient for
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7475 * insuring no thread changes this unknowingly.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7476 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7477 if(_dw_color_active)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7478 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7479 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7480 return value;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7481 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7482
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7483 _dw_color_active = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7484
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7485 colorw = gtk_color_selection_dialog_new("Select Color");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7486
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7487 dwwait = dw_dialog_new((void *)colorw);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7488
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7489 colorsel = (GtkColorSelection *)gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(colorw));
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
7490 g_object_get(G_OBJECT(colorw), "ok-button", &ok_button, "cancel-button", &cancel_button, NULL);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7491 g_signal_connect(G_OBJECT(ok_button), "clicked", G_CALLBACK(_dw_color_ok), dwwait);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
7492 g_signal_connect(G_OBJECT(cancel_button), "clicked", G_CALLBACK(_dw_color_cancel), dwwait);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7493
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7494 gtk_color_selection_set_previous_rgba(colorsel,&color);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7495 gtk_color_selection_set_current_rgba(colorsel,&color);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7496 gtk_color_selection_set_has_palette(colorsel,TRUE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7497
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7498 gtk_widget_show(colorw);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7499
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7500 dw_color = (unsigned long)dw_dialog_wait(dwwait);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7501 if ((unsigned long)dw_color == -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7502 dw_color = value;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7503 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7504 return (unsigned long)dw_color;
1597
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7505 }
ed09531b7f0e Removed deprecated GtkColorSelectionDialog in 3.4 and higher switching to GtkColorChooser.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1583
diff changeset
7506 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7507
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7508 /* Draw a point on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7509 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7510 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7511 * pixmap: Handle to the pixmap. (choose only one of these)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7512 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7513 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7514 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7515 void dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7516 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7517 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7518 cairo_t *cr = NULL;
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7519 int cached = FALSE;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7520 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7521 GdkDrawingContext *dc = NULL;
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7522 cairo_region_t *clip = NULL;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7523 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7524
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7525 DW_MUTEX_LOCK;
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
7526 if(handle && _dw_render_safe_check(handle))
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
7527 {
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7528 GdkDisplay *display = gdk_display_get_default();
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7529
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7530 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7531 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7532 else if((display && GDK_IS_X11_DISPLAY(display)))
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7533 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7534 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7535 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7536 if(!window || !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7537 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7538 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7539 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7540 }
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7541 #if GTK_CHECK_VERSION(3,22,0)
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7542 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7543 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7544 cr = gdk_drawing_context_get_cairo_context(dc);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7545 #else
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7546 cr = gdk_cairo_create(window);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7547 #endif
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7548 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7549 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7550 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7551 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7552 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7553 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7554 }
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
7555 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7556 else if(pixmap)
815
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 814
diff changeset
7557 cr = cairo_create(pixmap->image);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7558 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7559 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7560 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7561
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7562 gdk_cairo_set_source_rgba(cr, foreground);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7563 cairo_set_line_width(cr, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7564 cairo_move_to(cr, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7565 cairo_stroke(cr);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7566 #if GTK_CHECK_VERSION(3,22,0)
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7567 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7568 cairo_region_destroy(clip);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7569 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7570 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7571 */
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7572 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7573 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7574 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7575 #endif
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7576 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7577 cairo_destroy(cr);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7578 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7579 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7580 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7581
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7582 /* Draw a line on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7583 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7584 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7585 * pixmap: Handle to the pixmap. (choose only one of these)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7586 * x1: First X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7587 * y1: First Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7588 * x2: Second X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7589 * y2: Second Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7590 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7591 void dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7592 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7593 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7594 cairo_t *cr = NULL;
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7595 int cached = FALSE;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7596 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7597 GdkDrawingContext *dc = NULL;
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7598 cairo_region_t *clip = NULL;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7599 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7600
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7601 DW_MUTEX_LOCK;
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
7602 if(handle && _dw_render_safe_check(handle))
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
7603 {
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7604 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7605
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7606 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7607 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7608 else if((display && GDK_IS_X11_DISPLAY(display)))
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7609 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7610 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7611 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7612 if(!window || !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7613 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7614 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7615 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7616 }
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7617 #if GTK_CHECK_VERSION(3,22,0)
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7618 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7619 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7620 cr = gdk_drawing_context_get_cairo_context(dc);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7621 #else
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7622 cr = gdk_cairo_create(window);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7623 #endif
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7624 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7625 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7626 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7627 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7628 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7629 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7630 }
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
7631 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7632 else if(pixmap)
815
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 814
diff changeset
7633 cr = cairo_create(pixmap->image);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7634 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7635 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7636 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7637
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7638 gdk_cairo_set_source_rgba(cr, foreground);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7639 cairo_set_line_width(cr, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7640 cairo_move_to(cr, x1, y1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7641 cairo_line_to(cr, x2, y2);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7642 cairo_stroke(cr);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7643 #if GTK_CHECK_VERSION(3,22,0)
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7644 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7645 cairo_region_destroy(clip);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7646 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7647 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7648 */
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7649 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7650 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7651 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7652 #endif
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7653 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7654 cairo_destroy(cr);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7655 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7656 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7657 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7658
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7659 /* Draw a closed polygon on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7660 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7661 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7662 * pixmap: Handle to the pixmap. (choose only one of these)
1275
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1271
diff changeset
7663 * flags: DW_DRAW_FILL (1) to fill the polygon or DW_DRAW_DEFAULT (0).
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7664 * number of points
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7665 * x[]: X coordinates.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7666 * y[]: Y coordinates.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7667 */
1275
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1271
diff changeset
7668 void dw_draw_polygon(HWND handle, HPIXMAP pixmap, int flags, int npoints, int *x, int *y)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7669 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7670 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7671 cairo_t *cr = NULL;
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7672 int cached = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7673 int z;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7674 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7675 GdkDrawingContext *dc = NULL;
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7676 cairo_region_t *clip = NULL;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7677 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7678
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7679 DW_MUTEX_LOCK;
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
7680 if(handle && _dw_render_safe_check(handle))
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
7681 {
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7682 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7683
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7684 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7685 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7686 else if((display && GDK_IS_X11_DISPLAY(display)))
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7687 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7688 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7689 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7690 if(!window || !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7691 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7692 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7693 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7694 }
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7695 #if GTK_CHECK_VERSION(3,22,0)
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7696 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7697 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7698 cr = gdk_drawing_context_get_cairo_context(dc);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7699 #else
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7700 cr = gdk_cairo_create(window);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7701 #endif
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7702 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7703 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7704 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7705 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7706 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7707 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7708 }
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
7709 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7710 else if(pixmap)
815
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 814
diff changeset
7711 cr = cairo_create(pixmap->image);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7712 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7713 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7714 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7715
1524
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1510
diff changeset
7716 if(flags & DW_DRAW_NOAA)
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1510
diff changeset
7717 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7718
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7719 gdk_cairo_set_source_rgba(cr, foreground);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7720 cairo_set_line_width(cr, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7721 cairo_move_to(cr, x[0], y[0]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7722 for(z=1;z<npoints;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7723 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7724 cairo_line_to(cr, x[z], y[z]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7725 }
1275
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1271
diff changeset
7726 if(flags & DW_DRAW_FILL)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7727 cairo_fill(cr);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7728 cairo_stroke(cr);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7729 #if GTK_CHECK_VERSION(3,22,0)
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7730 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7731 cairo_region_destroy(clip);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7732 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7733 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7734 */
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7735 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7736 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7737 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7738 #endif
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7739 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7740 cairo_destroy(cr);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7741 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7742 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7743 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7744
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7745 /* Draw a rectangle on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7746 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7747 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7748 * pixmap: Handle to the pixmap. (choose only one of these)
1275
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1271
diff changeset
7749 * flags: DW_DRAW_FILL (1) to fill the box or DW_DRAW_DEFAULT (0).
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7750 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7751 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7752 * width: Width of rectangle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7753 * height: Height of rectangle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7754 */
1275
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1271
diff changeset
7755 void dw_draw_rect(HWND handle, HPIXMAP pixmap, int flags, int x, int y, int width, int height)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7756 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7757 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7758 cairo_t *cr = NULL;
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7759 int cached = FALSE;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7760 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7761 GdkDrawingContext *dc = NULL;
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7762 cairo_region_t *clip = NULL;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7763 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7764
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7765 DW_MUTEX_LOCK;
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
7766 if(handle && _dw_render_safe_check(handle))
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
7767 {
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7768 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7769
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7770 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7771 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7772 else if((display && GDK_IS_X11_DISPLAY(display)))
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7773 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7774 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7775 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7776 if(!window || !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7777 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7778 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7779 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7780 }
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7781 #if GTK_CHECK_VERSION(3,22,0)
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7782 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7783 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7784 cr = gdk_drawing_context_get_cairo_context(dc);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7785 #else
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7786 cr = gdk_cairo_create(window);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7787 #endif
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7788 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7789 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7790 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7791 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7792 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7793 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7794 }
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
7795 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7796 else if(pixmap)
815
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 814
diff changeset
7797 cr = cairo_create(pixmap->image);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7798 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7799 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7800 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7801
1524
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1510
diff changeset
7802 if(flags & DW_DRAW_NOAA)
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1510
diff changeset
7803 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7804
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7805 gdk_cairo_set_source_rgba(cr, foreground);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7806 cairo_set_line_width(cr, 1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7807 cairo_move_to(cr, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7808 cairo_line_to(cr, x, y + height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7809 cairo_line_to(cr, x + width, y + height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7810 cairo_line_to(cr, x + width, y);
1275
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1271
diff changeset
7811 if(flags & DW_DRAW_FILL)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7812 cairo_fill(cr);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7813 cairo_stroke(cr);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7814 #if GTK_CHECK_VERSION(3,22,0)
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7815 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7816 cairo_region_destroy(clip);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7817 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7818 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7819 */
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7820 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7821 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7822 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7823 #endif
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7824 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7825 cairo_destroy(cr);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7826 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7827 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7828 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7829
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7830 /* Draw an arc on a window (preferably a render window).
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7831 * Parameters:
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7832 * handle: Handle to the window.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7833 * pixmap: Handle to the pixmap. (choose only one of these)
1275
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1271
diff changeset
7834 * flags: DW_DRAW_FILL (1) to fill the arc or DW_DRAW_DEFAULT (0).
0b34e2cf0706 Updated dw_draw_rect and dw_draw_polygon to accept flags the same way as dw_draw_arc.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1271
diff changeset
7835 * DW_DRAW_FULL will draw a complete circle/elipse.
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7836 * xorigin: X coordinate of center of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7837 * yorigin: Y coordinate of center of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7838 * x1: X coordinate of first segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7839 * y1: Y coordinate of first segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7840 * x2: X coordinate of second segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7841 * y2: Y coordinate of second segment of arc.
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7842 */
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7843 void API dw_draw_arc(HWND handle, HPIXMAP pixmap, int flags, int xorigin, int yorigin, int x1, int y1, int x2, int y2)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7844 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7845 int _dw_locked_by_me = FALSE;
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7846 cairo_t *cr = NULL;
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7847 int cached = FALSE;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7848 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7849 GdkDrawingContext *dc = NULL;
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7850 cairo_region_t *clip = NULL;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7851 #endif
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7852
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7853 DW_MUTEX_LOCK;
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
7854 if(handle && _dw_render_safe_check(handle))
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7855 {
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7856 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7857
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7858 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7859 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7860 else if((display && GDK_IS_X11_DISPLAY(display)))
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7861 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7862 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7863 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7864 if(!window || !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7865 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7866 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7867 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7868 }
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7869 #if GTK_CHECK_VERSION(3,22,0)
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7870 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7871 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7872 cr = gdk_drawing_context_get_cairo_context(dc);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7873 #else
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7874 cr = gdk_cairo_create(window);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7875 #endif
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7876 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7877 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7878 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7879 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7880 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7881 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7882 }
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7883 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7884 else if(pixmap)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7885 cr = cairo_create(pixmap->image);
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7886 if(cr)
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7887 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7888 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
1634
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7889 int width = abs(x2-x1);
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7890 float scale = fabs((float)(y2-y1))/(float)width;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7891
1524
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1510
diff changeset
7892 if(flags & DW_DRAW_NOAA)
010e1d916ee7 Added DW_DRAW_NOAA support on GTK3 for both pixmaps and windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1510
diff changeset
7893 cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7894
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
7895 gdk_cairo_set_source_rgba(cr, foreground);
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7896 cairo_set_line_width(cr, 1);
1283
87d6d11b6323 Initial support for ellipses on GTK3 and GTK2 Printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1281
diff changeset
7897 if(scale != 1.0)
87d6d11b6323 Initial support for ellipses on GTK3 and GTK2 Printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1281
diff changeset
7898 cairo_scale(cr, 1.0, scale);
1271
8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1266
diff changeset
7899 if(flags & DW_DRAW_FULL)
1634
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7900 cairo_arc(cr, xorigin, yorigin / scale, width/2, 0, M_PI*2);
1271
8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1266
diff changeset
7901 else
1634
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7902 {
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7903 double dx = xorigin - x1;
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7904 double dy = yorigin - y1;
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7905 double r = sqrt(dx*dx + dy*dy);
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7906 double a1 = atan2((y1-yorigin), (x1-xorigin));
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7907 double a2 = atan2((y2-yorigin), (x2-xorigin));
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7908
1271
8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1266
diff changeset
7909 cairo_arc(cr, xorigin, yorigin, r, a1, a2);
1634
c3e08322b8f6 Fixed issues drawing arcs on GTK3 and GTK2 for printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1597
diff changeset
7910 }
1271
8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1266
diff changeset
7911 if(flags & DW_DRAW_FILL)
8655753e2bc4 Implemented DW_DRAW_FULL and DW_DRAW_FILL for GTK3 and GTK2 printing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1266
diff changeset
7912 cairo_fill(cr);
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7913 cairo_stroke(cr);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7914 #if GTK_CHECK_VERSION(3,22,0)
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7915 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7916 cairo_region_destroy(clip);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7917 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7918 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7919 */
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7920 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7921 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7922 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
7923 #endif
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7924 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7925 cairo_destroy(cr);
1261
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7926 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7927 DW_MUTEX_UNLOCK;
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7928 }
61d0c5f84644 Initial attempt at adding dw_draw_arc() support on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1258
diff changeset
7929
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7930 /* Draw text on a window (preferably a render window).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7931 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7932 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7933 * pixmap: Handle to the pixmap. (choose only one of these)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7934 * x: X coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7935 * y: Y coordinate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7936 * text: Text to be displayed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7937 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
7938 void dw_draw_text(HWND handle, HPIXMAP pixmap, int x, int y, const char *text)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7939 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
7940 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7941 cairo_t *cr = NULL;
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7942 int cached = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7943 PangoFontDescription *font;
1232
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1223
diff changeset
7944 char *tmpname, *fontname = "monospace 10";
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7945 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7946 GdkDrawingContext *dc = NULL;
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
7947 cairo_region_t *clip = NULL;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
7948 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7949
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7950 if(!text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7951 return;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
7952
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7953 DW_MUTEX_LOCK;
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
7954 if(handle && _dw_render_safe_check(handle))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7955 {
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7956 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7957
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7958 if((cr = g_object_get_data(G_OBJECT(handle), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7959 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
7960 else if((display && GDK_IS_X11_DISPLAY(display)))
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7961 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7962 GdkWindow *window = gtk_widget_get_window(handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7963 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7964 if(!window || !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7965 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7966 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7967 return;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7968 }
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7969 #if GTK_CHECK_VERSION(3,22,0)
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7970 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7971 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7972 cr = gdk_drawing_context_get_cairo_context(dc);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7973 #else
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7974 cr = gdk_cairo_create(window);
2344
88f7e871b283 GTK3: Back port dw_window_destroy() fix from GTK4 and code cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2343
diff changeset
7975 #endif
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7976 if((tmpname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname")))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7977 fontname = tmpname;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7978 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7979 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7980 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7981 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7982 if(g_list_find(_dw_dirty_list, handle) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7983 _dw_dirty_list = g_list_append(_dw_dirty_list, handle);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
7984 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7985 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7986 else if(pixmap)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7987 {
1148
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
7988 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
7989 fontname = pixmap->font;
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
7990 else if(pixmap->handle && (tmpname = (char *)g_object_get_data(G_OBJECT(pixmap->handle), "_dw_fontname")))
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
7991 fontname = tmpname;
815
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 814
diff changeset
7992 cr = cairo_create(pixmap->image);
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 814
diff changeset
7993 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7994 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7995 {
1148
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
7996 font = pango_font_description_from_string(fontname);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7997 if(font)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7998 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
7999 PangoContext *context = pango_cairo_create_context(cr);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8000
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8001 if(context)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8002 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8003 PangoLayout *layout = pango_layout_new(context);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8004
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8005 if(layout)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8006 {
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
8007 GdkRGBA *foreground = pthread_getspecific(_dw_fg_color_key);
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
8008 GdkRGBA *background = pthread_getspecific(_dw_bg_color_key);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8009
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8010 pango_layout_set_font_description(layout, font);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8011 pango_layout_set_text(layout, text, strlen(text));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8012
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
8013 gdk_cairo_set_source_rgba(cr, foreground);
892
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8014 /* Create a background color attribute if required */
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
8015 if(background)
892
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8016 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8017 PangoAttrList *list = pango_layout_get_attributes(layout);
1554
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
8018 PangoAttribute *attr = pango_attr_background_new((guint16)(background->red * 65535),
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
8019 (guint16)(background->green * 65535),
e39e9e67110d Switched to using GdkRGBA from GdkColor int GTK3 since the GdkColor APIs
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1545
diff changeset
8020 (guint16)(background->blue* 65535));
892
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8021 if(!list)
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8022 {
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8023 list = pango_attr_list_new();
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8024 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8025 pango_attr_list_change(list, attr);
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8026 pango_layout_set_attributes(layout, list);
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8027 }
82f68adde8a0 Fix for dw_draw_text() not using the background color on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 885
diff changeset
8028 /* Do the drawing */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8029 cairo_move_to(cr, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8030 pango_cairo_show_layout (cr, layout);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
8031
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8032 g_object_unref(layout);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8033 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8034 g_object_unref(context);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8035 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8036 pango_font_description_free(font);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8037 }
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8038 #if GTK_CHECK_VERSION(3,22,0)
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
8039 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
8040 cairo_region_destroy(clip);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8041 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8042 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8043 */
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
8044 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
8045 gdk_window_end_draw_frame(gtk_widget_get_window(handle), dc);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8046 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8047 #endif
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
8048 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
8049 cairo_destroy(cr);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8050 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8051 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8052 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8053
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8054 /* Query the width and height of a text string.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8055 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8056 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8057 * pixmap: Handle to the pixmap. (choose only one of these)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8058 * text: Text to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8059 * width: Pointer to a variable to be filled in with the width.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8060 * height Pointer to a variable to be filled in with the height.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8061 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
8062 void dw_font_text_extents_get(HWND handle, HPIXMAP pixmap, const char *text, int *width, int *height)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8063 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
8064 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8065 PangoFontDescription *font;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8066 char *fontname = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8067 int free_fontname = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8068
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8069 if(!text)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8070 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8071
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8072 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8073 if(handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8074 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8075 fontname = (char *)g_object_get_data(G_OBJECT(handle), "_dw_fontname");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8076 if ( fontname == NULL )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8077 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8078 fontname = dw_window_get_font(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8079 free_fontname = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8080 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8081 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8082 else if(pixmap)
1232
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1223
diff changeset
8083 {
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1223
diff changeset
8084 if(pixmap->font)
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1223
diff changeset
8085 fontname = pixmap->font;
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1223
diff changeset
8086 else if(pixmap->handle)
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1223
diff changeset
8087 fontname = (char *)g_object_get_data(G_OBJECT(pixmap->handle), "_dw_fontname");
db21c0081387 Fixes for dw_font_text_extents_get() on GTK not honoring the font set by dw_pixmap_set_font().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1223
diff changeset
8088 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8089
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8090 font = pango_font_description_from_string(fontname ? fontname : "monospace 10");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8091 if(font)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8092 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8093 PangoContext *context = gdk_pango_context_get();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8094
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8095 if(context)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8096 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8097 PangoLayout *layout = pango_layout_new(context);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8098
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8099 if(layout)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8100 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8101 PangoRectangle rect;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8102
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8103 pango_layout_set_font_description(layout, font);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8104 pango_layout_set_text(layout, text, -1);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8105 pango_layout_get_pixel_extents(layout, NULL, &rect);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8106
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8107 if(width)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8108 *width = rect.width;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8109 if(height)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8110 *height = rect.height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8111
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8112 g_object_unref(layout);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8113 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8114 g_object_unref(context);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8115 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8116 pango_font_description_free(font);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8117 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8118 if ( free_fontname )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8119 free( fontname );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8120 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8121 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8122
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8123 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8124 * Creates a pixmap with given parameters.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8125 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8126 * handle: Window handle the pixmap is associated with.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8127 * or zero to enable this pixmap to be written
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8128 * off the screen to reduce flicker
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8129 * width: Width of the pixmap in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8130 * height: Height of the pixmap in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8131 * depth: Color depth of the pixmap.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8132 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8133 * A handle to a pixmap or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8134 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8135 HPIXMAP dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8136 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
8137 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8138 HPIXMAP pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8139
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8140 if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8141 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8142
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8143 if (!depth)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8144 depth = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8145
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8146 pixmap->width = width; pixmap->height = height;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8147
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8148
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8149 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8150 pixmap->handle = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8151 /* Depth needs to be divided by 3... but for the RGB colorspace...
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8152 * only 8 bits per sample is allowed, so to avoid issues just pass 8 for now.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8153 */
815
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 814
diff changeset
8154 pixmap->pixbuf = gdk_pixbuf_new( GDK_COLORSPACE_RGB, FALSE, 8, width, height );
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 814
diff changeset
8155 pixmap->image = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8156 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8157 return pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8158 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8159
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8160 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8161 * Creates a pixmap from a file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8162 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8163 * handle: Window handle the pixmap is associated with.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8164 * filename: Name of the file, omit extention to have
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8165 * DW pick the appropriate file extension.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8166 * (BMP on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8167 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8168 * A handle to a pixmap or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8169 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
8170 HPIXMAP dw_pixmap_new_from_file(HWND handle, const char *filename)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8171 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
8172 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8173 HPIXMAP pixmap;
1258
3df86772b625 Updated the list of supported image formats for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1245
diff changeset
8174 char *file = alloca(strlen(filename) + 6);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8175 int found_ext = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8176 int i;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8177
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8178 if (!file || !(pixmap = calloc(1,sizeof(struct _hpixmap))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8179 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8180
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8181 strcpy(file, filename);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8182
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8183 /* check if we can read from this file (it exists and read permission) */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8184 if(access(file, 04) != 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8185 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8186 /* Try with various extentions */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8187 for ( i = 0; i < NUM_EXTS; i++ )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8188 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8189 strcpy( file, filename );
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
8190 strcat( file, _dw_image_exts[i] );
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8191 if ( access( file, 04 ) == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8192 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8193 found_ext = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8194 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8195 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8196 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8197 if ( found_ext == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8198 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8199 free(pixmap);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8200 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8201 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8202 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8203
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8204 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8205 pixmap->pixbuf = gdk_pixbuf_new_from_file(file, NULL);
815
c1e93dd575a5 Initial implementation of a slightly disjointed dual cairo_surface gdkpixbuf image model.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 814
diff changeset
8206 pixmap->image = cairo_image_surface_create_from_png(file);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8207 pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8208 pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8209 pixmap->handle = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8210 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8211 return pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8212 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8213
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8214 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8215 * Creates a pixmap from data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8216 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8217 * handle: Window handle the pixmap is associated with.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8218 * data: Source of image data
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8219 * DW pick the appropriate file extension.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8220 * (BMP on OS/2 or Windows, XPM on Unix)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8221 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8222 * A handle to a pixmap or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8223 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
8224 HPIXMAP dw_pixmap_new_from_data(HWND handle, const char *data, int len)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8225 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
8226 int fd, written = -1, _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8227 HPIXMAP pixmap;
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
8228 char template[] = "/tmp/dwpixmapXXXXXX";
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
8229
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
8230 if(!data || !(pixmap = calloc(1,sizeof(struct _hpixmap))))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8231 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8232
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8233 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8234 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8235 * A real hack; create a temporary file and write the contents
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8236 * of the data to the file
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8237 */
2201
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
8238 if((fd = mkstemp(template)) != -1)
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
8239 {
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
8240 written = write(fd, data, len);
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
8241 close(fd);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8242 }
2201
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
8243 /* Bail if we couldn't write full file */
ae6626a4331f GTK: Same change from tmpnam() to mkstemp() for GTK2 plus extra safety
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2200
diff changeset
8244 if(fd == -1 || written != len)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8245 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8246 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8247 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8248 }
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
8249 pixmap->pixbuf = gdk_pixbuf_new_from_file(template, NULL);
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
8250 pixmap->image = cairo_image_surface_create_from_png(template);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8251 pixmap->width = gdk_pixbuf_get_width(pixmap->pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8252 pixmap->height = gdk_pixbuf_get_height(pixmap->pixbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8253 /* remove our temporary file */
2200
319eeecb411e GTK3: Linux complains about tmpnam() so switch to mkstemp().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2199
diff changeset
8254 unlink(template);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8255 pixmap->handle = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8256 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8257 return pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8258 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8259
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8260 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8261 * Sets the transparent color for a pixmap
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8262 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8263 * pixmap: Handle to a pixmap returned by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8264 * dw_pixmap_new..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8265 * color: transparent color
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8266 * Note: This does nothing on GTK+ as transparency
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8267 * is handled automatically
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8268 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8269 void dw_pixmap_set_transparent_color(HPIXMAP pixmap, unsigned long color)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8270 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8271 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8272
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8273 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8274 * Creates a pixmap from internal resource graphic specified by id.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8275 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8276 * handle: Window handle the pixmap is associated with.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8277 * id: Resource ID associated with requested pixmap.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8278 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8279 * A handle to a pixmap or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8280 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8281 HPIXMAP dw_pixmap_grab(HWND handle, ULONG id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8282 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8283 HPIXMAP pixmap;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
8284 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8285
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8286 if (!(pixmap = calloc(1,sizeof(struct _hpixmap))))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8287 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8288
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8289
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8290 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
8291 pixmap->pixbuf = gdk_pixbuf_copy(_dw_find_pixbuf((HICN)id, &pixmap->width, &pixmap->height));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8292 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8293 return pixmap;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8294 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8295
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8296 static void _dw_flush_dirty(gpointer widget, gpointer data)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8297 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8298 if(widget && GTK_IS_WIDGET(widget))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8299 gtk_widget_queue_draw(GTK_WIDGET(widget));
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8300 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8301
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8302 /* Call this after drawing to the screen to make sure
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8303 * anything you have drawn is visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8304 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8305 void dw_flush(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8306 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
8307 int _dw_locked_by_me = FALSE;
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8308
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8309 DW_MUTEX_LOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8310 g_list_foreach(_dw_dirty_list, _dw_flush_dirty, NULL);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8311 g_list_free(_dw_dirty_list);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8312 _dw_dirty_list = NULL;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8313 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8314 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8315
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8316 /*
1148
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8317 * Sets the font used by a specified pixmap.
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8318 * Normally the pixmap font is obtained from the associated window handle.
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8319 * However this can be used to override that, or for pixmaps with no window.
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8320 * Parameters:
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8321 * pixmap: Handle to a pixmap returned by dw_pixmap_new() or
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8322 * passed to the application via a callback.
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8323 * fontname: Name and size of the font in the form "size.fontname"
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8324 * Returns:
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8325 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8326 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
8327 int API dw_pixmap_set_font(HPIXMAP pixmap, const char *fontname)
1148
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8328 {
2248
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
8329 if(pixmap)
1148
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8330 {
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8331 char *oldfont = pixmap->font;
2248
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
8332
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
8333 pixmap->font = _dw_convert_font(fontname);
2248
4fb54b9fcf78 GTK3: Switch to using CSS syntax for specifying fonts from Pango.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2243
diff changeset
8334
1148
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8335 if(oldfont)
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8336 free(oldfont);
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8337 return DW_ERROR_NONE;
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8338 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8339 return DW_ERROR_GENERAL;
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8340 }
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8341
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8342 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8343 * Destroys an allocated pixmap.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8344 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8345 * pixmap: Handle to a pixmap returned by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8346 * dw_pixmap_new..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8347 */
2950
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8348 void API dw_pixmap_destroy(HPIXMAP pixmap)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8349 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
8350 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8351
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8352 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8353 g_object_unref(G_OBJECT(pixmap->pixbuf));
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
8354 cairo_surface_destroy(pixmap->image);
1148
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8355 if(pixmap->font)
439f276042cc Implemented dw_pixmap_set_font() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1145
diff changeset
8356 free(pixmap->font);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8357 free(pixmap);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8358 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8359 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8360
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8361 /*
2950
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8362 * Returns the width of the pixmap, same as the DW_PIXMAP_WIDTH() macro,
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8363 * but exported as an API, for non-C language bindings.
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8364 */
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8365 unsigned long API dw_pixmap_get_width(HPIXMAP pixmap)
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8366 {
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8367 return pixmap ? pixmap->width : 0;
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8368 }
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8369
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8370 /*
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8371 * Returns the height of the pixmap, same as the DW_PIXMAP_HEIGHT() macro,
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8372 * but exported as an API, for non-C language bindings.
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8373 */
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8374 unsigned long API dw_pixmap_get_height(HPIXMAP pixmap)
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8375 {
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8376 return pixmap ? pixmap->height : 0;
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8377 }
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8378
0577a97fe36d Added dw_pixmap_get_width() and dw_pixmap_get_height() by request for language bindings.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2947
diff changeset
8379 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8380 * Copies from one item to another.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8381 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8382 * dest: Destination window handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8383 * destp: Destination pixmap. (choose only one).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8384 * xdest: X coordinate of destination.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8385 * ydest: Y coordinate of destination.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8386 * width: Width of area to copy.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8387 * height: Height of area to copy.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8388 * src: Source window handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8389 * srcp: Source pixmap. (choose only one).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8390 * xsrc: X coordinate of source.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8391 * ysrc: Y coordinate of source.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8392 */
1245
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8393 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)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8394 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8395 dw_pixmap_stretch_bitblt(dest, destp, xdest, ydest, width, height, src, srcp, xsrc, ysrc, -1, -1);
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8396 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8397
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8398 /*
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8399 * Copies from one surface to another allowing for stretching.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8400 * Parameters:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8401 * dest: Destination window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8402 * destp: Destination pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8403 * xdest: X coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8404 * ydest: Y coordinate of destination.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8405 * width: Width of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8406 * height: Height of the target area.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8407 * src: Source window handle.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8408 * srcp: Source pixmap. (choose only one).
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8409 * xsrc: X coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8410 * ysrc: Y coordinate of source.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8411 * srcwidth: Width of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8412 * srcheight: Height of area to copy.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8413 * Returns:
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8414 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8415 */
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8416 int API dw_pixmap_stretch_bitblt(HWND dest, HPIXMAP destp, int xdest, int ydest, int width, int height, HWND src, HPIXMAP srcp, int xsrc, int ysrc, int srcwidth, int srcheight)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8417 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
8418 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8419 cairo_t *cr = NULL;
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
8420 int cached = FALSE;
1245
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8421 int retval = DW_ERROR_GENERAL;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8422 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8423 GdkDrawingContext *dc = NULL;
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
8424 cairo_region_t *clip = NULL;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8425 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8426
1177
c38ec904b6d3 Fixed dw_pixmap_bitblt() on printing context pixmaps in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1161
diff changeset
8427 if((!dest && (!destp || !destp->image)) || (!src && (!srcp || !srcp->image)))
1245
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8428 return retval;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8429
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8430 DW_MUTEX_LOCK;
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
8431 if(dest && _dw_render_safe_check(dest))
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
8432 {
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8433 GdkDisplay *display = gdk_display_get_default();
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8434
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
8435 if((cr = g_object_get_data(G_OBJECT(dest), "_dw_cr")))
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
8436 cached = TRUE;
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
8437 else if((display && GDK_IS_X11_DISPLAY(display)))
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8438 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8439 GdkWindow *window = gtk_widget_get_window(dest);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8440 /* Safety check for non-existant windows */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8441 if(!window || !GDK_IS_WINDOW(window))
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8442 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8443 DW_MUTEX_UNLOCK;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8444 return retval;
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8445 }
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8446 #if GTK_CHECK_VERSION(3,22,0)
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8447 clip = gdk_window_get_clip_region(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8448 dc = gdk_window_begin_draw_frame(window, clip);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8449 cr = gdk_drawing_context_get_cairo_context(dc);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8450 #else
2343
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8451 cr = gdk_cairo_create(window);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8452 #endif
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8453 }
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8454 else
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8455 {
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8456 /* If not X11, just mark the widget dirty.. and trigger draw in dw_flush() */
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8457 if(g_list_find(_dw_dirty_list, dest) == NULL)
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8458 _dw_dirty_list = g_list_append(_dw_dirty_list, dest);
347b0f97c295 GTK3: Back port Wayland fixes from the GTK4 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2342
diff changeset
8459 }
818
c17634e2b303 More safety checks in the drawing functions.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 817
diff changeset
8460 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8461 else if(destp)
816
916002e29d4c Implemented dw_pixmap_bitblt() with cairo surfaces instead of pixbufs.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 815
diff changeset
8462 cr = cairo_create(destp->image);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
8463
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8464 if(cr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8465 {
1245
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8466 double xscale = 1, yscale = 1;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8467
1245
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8468 if(srcwidth != -1 && srcheight != -1)
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8469 {
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8470 xscale = (double)width / (double)srcwidth;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8471 yscale = (double)height / (double)srcheight;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8472 cairo_scale(cr, xscale, yscale);
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8473 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8474
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8475 if(src)
1245
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8476 gdk_cairo_set_source_window (cr, gtk_widget_get_window(src), (xdest + xsrc) / xscale, (ydest + ysrc) / yscale);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8477 else if(srcp)
1245
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8478 cairo_set_source_surface (cr, srcp->image, (xdest + xsrc) / xscale, (ydest + ysrc) / yscale);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8479
1245
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8480 cairo_rectangle(cr, xdest / xscale, ydest / yscale, width, height);
959
37f2938ecd72 Fixes for bitblts with clipping and offset on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 900
diff changeset
8481 cairo_fill(cr);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8482 #if GTK_CHECK_VERSION(3,22,0)
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
8483 if(clip)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
8484 cairo_region_destroy(clip);
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8485 /* If we are using a drawing context...
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8486 * we don't own the cairo context so don't destroy it.
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
8487 */
1930
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
8488 if(dc)
fe04bcfd5b65 GTK3: Need to use cairo region in that new code or else drawing functions
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1929
diff changeset
8489 gdk_window_end_draw_frame(gtk_widget_get_window(dest), dc);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8490 else
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8491 #endif
2358
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
8492 if(!cached)
314d417e55c4 GTK3: Cache the cairo_t from the draw callback and use it for drawing.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2355
diff changeset
8493 cairo_destroy(cr);
1245
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8494 retval = DW_ERROR_NONE;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8495 }
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8496 DW_MUTEX_UNLOCK;
3a2ffe3a7eae Implemented dw_pixmap_stretch_bitblt() on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1240
diff changeset
8497 return retval;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8498 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8499
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8500 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8501 * Emits a beep.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8502 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8503 * freq: Frequency.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8504 * dur: Duration.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8505 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8506 void dw_beep(int freq, int dur)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8507 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
8508 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8509
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8510 DW_MUTEX_LOCK;
1937
eb488c379969 Fixed a few deprecation warnings on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1933
diff changeset
8511 gdk_display_beep(gdk_display_get_default());
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8512 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8513 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8514
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8515 void _my_strlwr(char *buf)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8516 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8517 int z, len = strlen(buf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8518
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8519 for(z=0;z<len;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8520 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8521 if(buf[z] >= 'A' && buf[z] <= 'Z')
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8522 buf[z] -= 'A' - 'a';
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8523 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8524 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8525
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8526 /* Open a shared library and return a handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8527 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8528 * name: Base name of the shared library.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8529 * handle: Pointer to a module handle,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8530 * will be filled in with the handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8531 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
8532 int dw_module_load(const char *name, HMOD *handle)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8533 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8534 int len;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8535 char *newname;
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
8536 char errorbuf[1025] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8537
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8538
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8539 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8540 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8541
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8542 if((len = strlen(name)) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8543 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8544
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8545 /* Lenth + "lib" + ".so" + NULL */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8546 newname = malloc(len + 7);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8547
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8548 if(!newname)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8549 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8550
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8551 sprintf(newname, "lib%s.so", name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8552 _my_strlwr(newname);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8553
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8554 *handle = dlopen(newname, RTLD_NOW);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8555 if(*handle == NULL)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8556 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8557 strncpy(errorbuf, dlerror(), 1024);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8558 printf("%s\n", errorbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8559 sprintf(newname, "lib%s.so", name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8560 *handle = dlopen(newname, RTLD_NOW);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8561 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8562
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8563 free(newname);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8564
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8565 return (NULL == *handle) ? -1 : 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8566 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8567
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8568 /* Queries the address of a symbol within open handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8569 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8570 * handle: Module handle returned by dw_module_load()
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8571 * name: Name of the symbol you want the address of.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8572 * func: A pointer to a function pointer, to obtain
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8573 * the address.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8574 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
8575 int dw_module_symbol(HMOD handle, const char *name, void**func)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8576 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8577 if(!func || !name)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8578 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8579
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8580 if(strlen(name) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8581 return -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8582
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8583 *func = (void*)dlsym(handle, name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8584 return (NULL == *func);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8585 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8586
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8587 /* Frees the shared library previously opened.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8588 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8589 * handle: Module handle returned by dw_module_load()
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8590 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8591 int dw_module_close(HMOD handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8592 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8593 if(handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8594 return dlclose(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8595 return 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8596 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8597
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8598 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8599 * Returns the handle to an unnamed mutex semaphore.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8600 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8601 HMTX dw_mutex_new(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8602 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8603 HMTX mutex = malloc(sizeof(pthread_mutex_t));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8604
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8605 pthread_mutex_init(mutex, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8606 return mutex;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8607 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8608
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8609 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8610 * Closes a semaphore created by dw_mutex_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8611 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8612 * mutex: The handle to the mutex returned by dw_mutex_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8613 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8614 void dw_mutex_close(HMTX mutex)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8615 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8616 if(mutex)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8617 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8618 pthread_mutex_destroy(mutex);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8619 free(mutex);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8620 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8621 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8622
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8623 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8624 * Tries to gain access to the semaphore, if it can't it blocks.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8625 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8626 * mutex: The handle to the mutex returned by dw_mutex_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8627 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8628 void dw_mutex_lock(HMTX mutex)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8629 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8630 /* If we are being called from an event handler we must release
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8631 * the GTK mutex so we don't deadlock.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8632 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8633 if(pthread_self() == _dw_thread)
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
8634 _dw_gdk_threads_leave();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8635
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8636 pthread_mutex_lock(mutex);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8637
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8638 /* And of course relock it when we have acquired the mutext */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8639 if(pthread_self() == _dw_thread)
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
8640 _dw_gdk_threads_enter();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8641 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8642
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8643 /*
1158
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8644 * Tries to gain access to the semaphore.
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8645 * Parameters:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8646 * mutex: The handle to the mutex returned by dw_mutex_new().
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8647 * Returns:
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8648 * DW_ERROR_NONE on success, DW_ERROR_TIMEOUT if it is already locked.
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8649 */
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8650 int API dw_mutex_trylock(HMTX mutex)
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8651 {
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8652 if(pthread_mutex_trylock(mutex) == 0)
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8653 return DW_ERROR_NONE;
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8654 return DW_ERROR_TIMEOUT;
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8655 }
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8656
f86f556ff29d Added dw_mutex_trylock() that functions like dw_mutex_lock() except
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1156
diff changeset
8657 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8658 * Reliquishes the access to the semaphore.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8659 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8660 * mutex: The handle to the mutex returned by dw_mutex_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8661 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8662 void dw_mutex_unlock(HMTX mutex)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8663 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8664 pthread_mutex_unlock(mutex);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8665 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8666
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8667 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8668 * Returns the handle to an unnamed event semaphore.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8669 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8670 HEV dw_event_new(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8671 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8672 HEV eve = (HEV)malloc(sizeof(struct _dw_unix_event));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8673
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8674 if(!eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8675 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8676
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8677 /* We need to be careful here, mutexes on Linux are
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8678 * FAST by default but are error checking on other
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8679 * systems such as FreeBSD and OS/2, perhaps others.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8680 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8681 pthread_mutex_init (&(eve->mutex), NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8682 pthread_mutex_lock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8683 pthread_cond_init (&(eve->event), NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8684
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8685 pthread_mutex_unlock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8686 eve->alive = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8687 eve->posted = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8688
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8689 return eve;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8690 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8691
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8692 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8693 * Resets a semaphore created by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8694 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8695 * eve: The handle to the event returned by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8696 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8697 int dw_event_reset (HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8698 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8699 if(!eve)
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8700 return DW_ERROR_NON_INIT;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8701
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8702 pthread_mutex_lock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8703 pthread_cond_broadcast (&(eve->event));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8704 pthread_cond_init (&(eve->event), NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8705 eve->posted = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8706 pthread_mutex_unlock (&(eve->mutex));
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8707 return DW_ERROR_NONE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8708 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8709
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8710 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8711 * Posts a semaphore created by dw_event_new(). Causing all threads
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8712 * waiting on this event in dw_event_wait to continue.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8713 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8714 * eve: The handle to the event returned by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8715 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8716 int dw_event_post (HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8717 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8718 if(!eve)
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8719 return DW_ERROR_NON_INIT;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8720
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8721 pthread_mutex_lock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8722 pthread_cond_broadcast (&(eve->event));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8723 eve->posted = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8724 pthread_mutex_unlock (&(eve->mutex));
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8725 return DW_ERROR_NONE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8726 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8727
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8728 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8729 * Waits on a semaphore created by dw_event_new(), until the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8730 * event gets posted or until the timeout expires.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8731 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8732 * eve: The handle to the event returned by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8733 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8734 int dw_event_wait(HEV eve, unsigned long timeout)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8735 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8736 int rc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8737
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8738 if(!eve)
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8739 return DW_ERROR_NON_INIT;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8740
1203
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1191
diff changeset
8741 pthread_mutex_lock (&(eve->mutex));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8742
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8743 if(eve->posted)
1203
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1191
diff changeset
8744 {
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1191
diff changeset
8745 pthread_mutex_unlock (&(eve->mutex));
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1191
diff changeset
8746 return DW_ERROR_NONE;
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1191
diff changeset
8747 }
fc87309372ef Same fix for GTK2/3 as I just committed for the Mac.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1191
diff changeset
8748
1156
03b6d9fdfac0 Fixed a typo on Unix... timeout not time.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1155
diff changeset
8749 if(timeout != -1)
1155
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8750 {
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8751 struct timeval now;
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8752 struct timespec timeo;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8753
1155
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8754 gettimeofday(&now, 0);
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8755 timeo.tv_sec = now.tv_sec + (timeout / 1000);
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8756 timeo.tv_nsec = now.tv_usec * 1000;
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8757 rc = pthread_cond_timedwait(&(eve->event), &(eve->mutex), &timeo);
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8758 }
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8759 else
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
8760 rc = pthread_cond_wait(&(eve->event), &(eve->mutex));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
8761
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8762 pthread_mutex_unlock (&(eve->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8763 if(!rc)
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8764 return DW_ERROR_NONE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8765 if(rc == ETIMEDOUT)
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8766 return DW_ERROR_TIMEOUT;
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8767 return DW_ERROR_GENERAL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8768 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8769
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8770 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8771 * Closes a semaphore created by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8772 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8773 * eve: The handle to the event returned by dw_event_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8774 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8775 int dw_event_close(HEV *eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8776 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8777 if(!eve || !(*eve))
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8778 return DW_ERROR_NON_INIT;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8779
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8780 pthread_mutex_lock (&((*eve)->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8781 pthread_cond_destroy (&((*eve)->event));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8782 pthread_mutex_unlock (&((*eve)->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8783 pthread_mutex_destroy (&((*eve)->mutex));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8784 free(*eve);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8785 *eve = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8786
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
8787 return DW_ERROR_NONE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8788 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8789
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8790 struct _dw_seminfo {
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8791 int fd;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8792 int waiting;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8793 };
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8794
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8795 static void _dw_handle_sem(int *tmpsock)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8796 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8797 fd_set rd;
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8798 struct _dw_seminfo *array = (struct _dw_seminfo *)malloc(sizeof(struct _dw_seminfo));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8799 int listenfd = tmpsock[0];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8800 int bytesread, connectcount = 1, maxfd, z, posted = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8801 char command;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8802 sigset_t mask;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8803
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8804 sigfillset(&mask); /* Mask all allowed signals */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8805 pthread_sigmask(SIG_BLOCK, &mask, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8806
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8807 /* problems */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8808 if(tmpsock[1] == -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8809 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8810 free(array);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8811 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8812 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8813
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8814 array[0].fd = tmpsock[1];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8815 array[0].waiting = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8816
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8817 /* Free the memory allocated in dw_named_event_new. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8818 free(tmpsock);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8819
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8820 while(1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8821 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8822 FD_ZERO(&rd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8823 FD_SET(listenfd, &rd);
2159
48172881415c GTK: Add DW_UNUSED() macro for defining variables that may be unused.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2158
diff changeset
8824 int DW_UNUSED(result);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8825
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8826 maxfd = listenfd;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8827
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8828 /* Added any connections to the named event semaphore */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8829 for(z=0;z<connectcount;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8830 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8831 if(array[z].fd > maxfd)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8832 maxfd = array[z].fd;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8833
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8834 FD_SET(array[z].fd, &rd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8835 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8836
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8837 if(select(maxfd+1, &rd, NULL, NULL, NULL) == -1)
1886
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1884
diff changeset
8838 {
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1884
diff changeset
8839 free(array);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8840 return;
1886
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1884
diff changeset
8841 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8842
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8843 if(FD_ISSET(listenfd, &rd))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8844 {
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8845 struct _dw_seminfo *newarray;
1886
f7d408a47752 Fix a couple of errors reported by the static analyzer on Mac....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1884
diff changeset
8846 int newfd = accept(listenfd, 0, 0);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8847
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8848 if(newfd > -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8849 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8850 /* Add new connections to the set */
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8851 newarray = (struct _dw_seminfo *)malloc(sizeof(struct _dw_seminfo)*(connectcount+1));
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8852 memcpy(newarray, array, sizeof(struct _dw_seminfo)*(connectcount));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8853
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8854 newarray[connectcount].fd = newfd;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8855 newarray[connectcount].waiting = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8856
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8857 connectcount++;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8858
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8859 /* Replace old array with new one */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8860 free(array);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8861 array = newarray;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8862 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8863 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8864
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8865 /* Handle any events posted to the semaphore */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8866 for(z=0;z<connectcount;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8867 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8868 if(FD_ISSET(array[z].fd, &rd))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8869 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8870 if((bytesread = read(array[z].fd, &command, 1)) < 1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8871 {
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8872 struct _dw_seminfo *newarray;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8873
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8874 /* Remove this connection from the set */
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8875 newarray = (struct _dw_seminfo *)malloc(sizeof(struct _dw_seminfo)*(connectcount-1));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8876 if(!z)
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8877 memcpy(newarray, &array[1], sizeof(struct _dw_seminfo)*(connectcount-1));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8878 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8879 {
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8880 memcpy(newarray, array, sizeof(struct _dw_seminfo)*z);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8881 if(z!=(connectcount-1))
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8882 memcpy(&newarray[z], &array[z+1], sizeof(struct _dw_seminfo)*(connectcount-(z+1)));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8883 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8884 connectcount--;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8885
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8886 /* Replace old array with new one */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8887 free(array);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8888 array = newarray;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8889 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8890 else if(bytesread == 1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8891 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8892 switch(command)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8893 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8894 case 0:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8895 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8896 /* Reset */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8897 posted = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8898 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8899 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8900 case 1:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8901 /* Post */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8902 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8903 int s;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8904 char tmp = (char)0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8905
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8906 posted = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8907
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8908 for(s=0;s<connectcount;s++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8909 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8910 /* The semaphore has been posted so
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8911 * we tell all the waiting threads to
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8912 * continue.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8913 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8914 if(array[s].waiting)
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
8915 result = write(array[s].fd, &tmp, 1);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8916 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8917 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8918 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8919 case 2:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8920 /* Wait */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8921 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8922 char tmp = (char)0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8923
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8924 array[z].waiting = 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8925
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8926 /* If we are posted exit immeditately */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8927 if(posted)
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
8928 result = write(array[z].fd, &tmp, 1);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8929 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8930 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8931 case 3:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8932 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8933 /* Done Waiting */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8934 array[z].waiting = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8935 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8936 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8937 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8938 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8939 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8940 }
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
8941 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8942 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8943
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8944 /* Using domain sockets on unix for IPC */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8945 /* Create a named event semaphore which can be
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8946 * opened from other processes.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8947 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8948 * eve: Pointer to an event handle to receive handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8949 * name: Name given to semaphore which can be opened
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8950 * by other processes.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8951 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
8952 HEV dw_named_event_new(const char *name)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8953 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8954 struct sockaddr_un un;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8955 int ev, *tmpsock = (int *)malloc(sizeof(int)*2);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8956 DWTID dwthread;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8957
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8958 if(!tmpsock)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8959 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8960
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8961 tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8962 ev = socket(AF_UNIX, SOCK_STREAM, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8963 memset(&un, 0, sizeof(un));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8964 un.sun_family=AF_UNIX;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8965 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8966 strcpy(un.sun_path, "/tmp/.dw/");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8967 strcat(un.sun_path, name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8968
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8969 /* just to be safe, this should be changed
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8970 * to support multiple instances.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8971 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8972 remove(un.sun_path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8973
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8974 bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8975 listen(tmpsock[0], 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8976 connect(ev, (struct sockaddr *)&un, sizeof(un));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8977 tmpsock[1] = accept(tmpsock[0], 0, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8978
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8979 if(tmpsock[0] < 0 || tmpsock[1] < 0 || ev < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8980 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8981 if(tmpsock[0] > -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8982 close(tmpsock[0]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8983 if(tmpsock[1] > -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8984 close(tmpsock[1]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8985 if(ev > -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8986 close(ev);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8987 free(tmpsock);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8988 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8989 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8990
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8991 /* Create a thread to handle this event semaphore */
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
8992 pthread_create(&dwthread, NULL, (void *)_dw_handle_sem, (void *)tmpsock);
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
8993 return GINT_TO_POINTER(ev);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8994 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8995
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8996 /* Open an already existing named event semaphore.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8997 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8998 * eve: Pointer to an event handle to receive handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
8999 * name: Name given to semaphore which can be opened
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9000 * by other processes.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9001 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
9002 HEV dw_named_event_get(const char *name)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9003 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9004 struct sockaddr_un un;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9005 int ev = socket(AF_UNIX, SOCK_STREAM, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9006 if(ev < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9007 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9008
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9009 un.sun_family=AF_UNIX;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9010 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9011 strcpy(un.sun_path, "/tmp/.dw/");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9012 strcat(un.sun_path, name);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9013 connect(ev, (struct sockaddr *)&un, sizeof(un));
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9014 return GINT_TO_POINTER(ev);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9015 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9016
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9017 /* Resets the event semaphore so threads who call wait
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9018 * on this semaphore will block.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9019 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9020 * eve: Handle to the semaphore obtained by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9021 * an open or create call.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9022 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9023 int dw_named_event_reset(HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9024 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9025 /* signal reset */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9026 char tmp = (char)0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9027
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9028 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9029 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9030
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9031 if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9032 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9033 return DW_ERROR_GENERAL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9034 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9035
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9036 /* Sets the posted state of an event semaphore, any threads
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9037 * waiting on the semaphore will no longer block.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9038 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9039 * eve: Handle to the semaphore obtained by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9040 * an open or create call.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9041 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9042 int dw_named_event_post(HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9043 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9044
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9045 /* signal post */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9046 char tmp = (char)1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9047
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9048 if(GPOINTER_TO_INT(eve) < 0)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9049 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9050
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9051 if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9052 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9053 return DW_ERROR_GENERAL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9054 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9055
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9056 /* Waits on the specified semaphore until it becomes
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9057 * posted, or returns immediately if it already is posted.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9058 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9059 * eve: Handle to the semaphore obtained by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9060 * an open or create call.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9061 * timeout: Number of milliseconds before timing out
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9062 * or -1 if indefinite.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9063 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9064 int dw_named_event_wait(HEV eve, unsigned long timeout)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9065 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9066 fd_set rd;
1155
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
9067 struct timeval tv, *useme = NULL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9068 int retval = 0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9069 char tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9070
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9071 if(GPOINTER_TO_INT(eve) < 0)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9072 return DW_ERROR_NON_INIT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9073
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9074 /* Set the timout or infinite */
1155
e6a2f57c0842 Added support for infinite wait for dw_event_wait() on Mac, Unix and Windows.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1152
diff changeset
9075 if(timeout != -1)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9076 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9077 tv.tv_sec = timeout / 1000;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9078 tv.tv_usec = timeout % 1000;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9079
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9080 useme = &tv;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9081 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9082
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9083 FD_ZERO(&rd);
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9084 FD_SET(GPOINTER_TO_INT(eve), &rd);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9085
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9086 /* Signal wait */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9087 tmp = (char)2;
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9088 retval = write(GPOINTER_TO_INT(eve), &tmp, 1);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9089
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9090 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9091 retval = select(GPOINTER_TO_INT(eve)+1, &rd, NULL, NULL, useme);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9092
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9093 /* Signal done waiting. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9094 tmp = (char)3;
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9095 if(retval == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9096 retval = write(GPOINTER_TO_INT(eve), &tmp, 1);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9097
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9098 if(retval == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9099 return DW_ERROR_TIMEOUT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9100 else if(retval == -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9101 return DW_ERROR_INTERRUPT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9102
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9103 /* Clear the entry from the pipe so
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9104 * we don't loop endlessly. :)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9105 */
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9106 if(read(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9107 return DW_ERROR_NONE;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9108 return DW_ERROR_GENERAL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9109 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9110
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9111 /* Release this semaphore, if there are no more open
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9112 * handles on this semaphore the semaphore will be destroyed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9113 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9114 * eve: Handle to the semaphore obtained by
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9115 * an open or create call.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9116 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9117 int dw_named_event_close(HEV eve)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9118 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9119 /* Finally close the domain socket,
2855
86286f528adf Fix new safety warnings reported by the new GCC on Linux.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2854
diff changeset
9120 * cleanup will continue in _dw_handle_sem.
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9121 */
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9122 close(GPOINTER_TO_INT(eve));
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9123 return DW_ERROR_NONE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9124 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9125
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9126 /*
1887
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9127 * Generally an internal function called from a newly created
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9128 * thread to setup the Dynamic Windows environment for the thread.
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9129 * However it is exported so language bindings can call it when
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9130 * they create threads that require access to Dynamic Windows.
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9131 */
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9132 void API _dw_init_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9133 {
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9134 GdkRGBA *foreground = malloc(sizeof(GdkRGBA));
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9135
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9136 foreground->alpha = foreground->red = foreground->green = foreground->blue = 0.0;
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9137 pthread_setspecific(_dw_fg_color_key, foreground);
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9138 pthread_setspecific(_dw_bg_color_key, NULL);
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9139 }
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9140
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9141 /*
1887
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9142 * Generally an internal function called from a terminating
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9143 * thread to cleanup the Dynamic Windows environment for the thread.
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9144 * However it is exported so language bindings can call it when
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9145 * they exit threads that require access to Dynamic Windows.
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9146 */
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9147 void API _dw_deinit_thread(void)
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9148 {
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9149 GdkRGBA *foreground, *background;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9150
1887
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9151 if((foreground = pthread_getspecific(_dw_fg_color_key)))
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9152 free(foreground);
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9153 if((background = pthread_getspecific(_dw_bg_color_key)))
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9154 free(background);
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9155 }
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9156
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9157 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9158 * Setup thread independent color sets.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9159 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9160 void _dwthreadstart(void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9161 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9162 void (*threadfunc)(void *) = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9163 void **tmp = (void **)data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9164
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9165 threadfunc = (void (*)(void *))tmp[0];
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
9166
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
9167 /* Initialize colors */
1887
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9168 _dw_init_thread();
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
9169
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9170 threadfunc(tmp[1]);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9171 free(tmp);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
9172
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
9173 /* Free colors */
1887
09860ba329a4 Divided thread initialization and deinitialization into separate
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1886
diff changeset
9174 _dw_deinit_thread();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9175 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9176
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9177 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9178 * Allocates a shared memory region with a name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9179 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9180 * handle: A pointer to receive a SHM identifier.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9181 * dest: A pointer to a pointer to receive the memory address.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9182 * size: Size in bytes of the shared memory region to allocate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9183 * name: A string pointer to a unique memory name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9184 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
9185 HSHM dw_named_memory_new(void **dest, int size, const char *name)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9186 {
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
9187 char namebuf[1025];
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9188 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9189
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9190 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
9191 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9192
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9193 if((handle->fd = open(namebuf, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR)) < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9194 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9195 free(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9196 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9197 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9198
1106
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9199 if(ftruncate(handle->fd, size))
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9200 {
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9201 close(handle->fd);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9202 free(handle);
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9203 return NULL;
eb6b27d17fe7 Fixed the 64bit warnings in GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1097
diff changeset
9204 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9205
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9206 /* attach the shared memory segment to our process's address space. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9207 *dest = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, handle->fd, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9208
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9209 if(*dest == MAP_FAILED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9210 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9211 close(handle->fd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9212 *dest = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9213 free(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9214 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9215 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9216
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9217 handle->size = size;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9218 handle->sid = getsid(0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9219 handle->path = strdup(namebuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9220
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9221 return handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9222 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9223
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9224 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9225 * Aquires shared memory region with a name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9226 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9227 * dest: A pointer to a pointer to receive the memory address.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9228 * size: Size in bytes of the shared memory region to requested.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9229 * name: A string pointer to a unique memory name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9230 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
9231 HSHM dw_named_memory_get(void **dest, int size, const char *name)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9232 {
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
9233 char namebuf[1025];
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9234 struct _dw_unix_shm *handle = malloc(sizeof(struct _dw_unix_shm));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9235
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9236 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
9237 snprintf(namebuf, 1024, "/tmp/.dw/%s", name);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9238
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9239 if((handle->fd = open(namebuf, O_RDWR)) < 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9240 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9241 free(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9242 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9243 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9244
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9245 /* attach the shared memory segment to our process's address space. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9246 *dest = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, handle->fd, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9247
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9248 if(*dest == MAP_FAILED)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9249 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9250 close(handle->fd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9251 *dest = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9252 free(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9253 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9254 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9255
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9256 handle->size = size;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9257 handle->sid = -1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9258 handle->path = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9259
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9260 return handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9261 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9262
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9263 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9264 * Frees a shared memory region previously allocated.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9265 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9266 * handle: Handle obtained from DB_named_memory_allocate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9267 * ptr: The memory address aquired with DB_named_memory_allocate.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9268 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9269 int dw_named_memory_free(HSHM handle, void *ptr)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9270 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9271 struct _dw_unix_shm *h = handle;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9272 int rc = munmap(ptr, h->size);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9273
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9274 close(h->fd);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9275 if(h->path)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9276 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9277 /* Only remove the actual file if we are the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9278 * creator of the file.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9279 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9280 if(h->sid != -1 && h->sid == getsid(0))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9281 remove(h->path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9282 free(h->path);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9283 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9284 return rc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9285 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9286 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9287 * Creates a new thread with a starting point of func.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9288 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9289 * func: Function which will be run in the new thread.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9290 * data: Parameter(s) passed to the function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9291 * stack: Stack size of new thread (OS/2 and Windows only).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9292 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9293 DWTID dw_thread_new(void *func, void *data, int stack)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9294 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9295 DWTID gtkthread;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9296 void **tmp = malloc(sizeof(void *) * 2);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9297 int rc;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9298
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9299 tmp[0] = func;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9300 tmp[1] = data;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9301
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9302 rc = pthread_create(&gtkthread, NULL, (void *)_dwthreadstart, (void *)tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9303 if ( rc == 0 )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9304 return gtkthread;
1894
ed377fd16360 Fix some warnings reported by clang on FreeBSD in the GTK modules.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1892
diff changeset
9305 return (DWTID)DW_ERROR_UNKNOWN;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9306 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9307
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9308 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9309 * Ends execution of current thread immediately.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9310 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9311 void dw_thread_end(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9312 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9313 pthread_exit(NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9314 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9315
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9316 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9317 * Returns the current thread's ID.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9318 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9319 DWTID dw_thread_id(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9320 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9321 return (DWTID)pthread_self();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9322 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9323
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9324 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9325 * Cleanly terminates a DW session, should be signal handler safe.
1861
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1853
diff changeset
9326 */
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1853
diff changeset
9327 void dw_shutdown(void)
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1853
diff changeset
9328 {
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1853
diff changeset
9329 }
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1853
diff changeset
9330
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1853
diff changeset
9331 /*
c836603d3f14 Add dw_shutdown() function which does the same thing as dw_exit() ...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1853
diff changeset
9332 * Cleanly terminates a DW session, should be signal handler safe.
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9333 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9334 * exitcode: Exit code reported to the operating system.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9335 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9336 void dw_exit(int exitcode)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9337 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9338 exit(exitcode);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9339 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9340
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9341 /* Internal function to get the recommended size of scrolled items */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9342 void _dw_get_scrolled_size(GtkWidget *item, gint *thiswidth, gint *thisheight)
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9343 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9344 GtkWidget *widget = g_object_get_data(G_OBJECT(item), "_dw_user");
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9345
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9346 *thisheight = *thiswidth = 0;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9347
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9348 if(widget)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9349 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9350 if(g_object_get_data(G_OBJECT(widget), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_TREE))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9351 {
1566
035bc006afbe Experimental change... halfway between min and max for tree controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1563
diff changeset
9352 /* Set to half for tree */
035bc006afbe Experimental change... halfway between min and max for tree controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1563
diff changeset
9353 *thiswidth = (int)((_DW_SCROLLED_MAX_WIDTH + _DW_SCROLLED_MIN_WIDTH)/2);
035bc006afbe Experimental change... halfway between min and max for tree controls.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1563
diff changeset
9354 *thisheight = (int)((_DW_SCROLLED_MAX_HEIGHT + _DW_SCROLLED_MIN_HEIGHT)/2);
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9355 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9356 else if(GTK_IS_TEXT_VIEW(widget))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9357 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9358 unsigned long bytes;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9359 int height, width;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9360 char *buf, *ptr;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9361 int wrap = (gtk_text_view_get_wrap_mode(GTK_TEXT_VIEW(widget)) == GTK_WRAP_WORD);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9362 static char testtext[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9363 int hscrolled = FALSE;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9364
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9365 *thiswidth = *thisheight = 0;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9366
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9367 dw_mle_get_size(item, &bytes, NULL);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9368
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9369 ptr = buf = alloca(bytes + 2);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9370 dw_mle_export(item, buf, 0, (int)bytes);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9371 buf[bytes] = 0;
1562
9a8aa230a538 Ported a couple fixes from GTK3 to GTK2 that I had missed.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1561
diff changeset
9372 strcat(buf, "\r");
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9373
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9374 /* MLE */
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9375 while((ptr = strstr(buf, "\r")))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9376 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9377 ptr[0] = 0;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9378 width = 0;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9379 if(strlen(buf))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9380 dw_font_text_extents_get(item, NULL, buf, &width, &height);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9381 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9382 dw_font_text_extents_get(item, NULL, testtext, NULL, &height);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9383
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9384 if(wrap && width > _DW_SCROLLED_MAX_WIDTH)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9385 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9386 *thiswidth = _DW_SCROLLED_MAX_WIDTH;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9387 *thisheight += height * (width / _DW_SCROLLED_MAX_WIDTH);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9388 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9389 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9390 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9391 if(width > *thiswidth)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9392 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9393 if(width > _DW_SCROLLED_MAX_WIDTH)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9394 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9395 *thiswidth = _DW_SCROLLED_MAX_WIDTH;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9396 hscrolled = TRUE;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9397 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9398 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9399 *thiswidth = width;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9400 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9401 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9402 *thisheight += height;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9403 if(ptr[1] == '\n')
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9404 buf = &ptr[2];
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9405 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9406 buf = &ptr[1];
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9407 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9408 if(hscrolled)
1563
90fdfc8aa16d Slight adjustment to the scrollbar additional space on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1562
diff changeset
9409 *thisheight += 10;
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9410 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9411 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9412 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9413 gtk_widget_get_preferred_height(GTK_WIDGET(widget), NULL, thisheight);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9414 gtk_widget_get_preferred_width(GTK_WIDGET(widget), NULL, thiswidth);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9415
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9416 *thisheight += 20;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9417 *thiswidth += 20;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9418 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9419 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9420 if(*thiswidth < _DW_SCROLLED_MIN_WIDTH)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9421 *thiswidth = _DW_SCROLLED_MIN_WIDTH;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9422 if(*thiswidth > _DW_SCROLLED_MAX_WIDTH)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9423 *thiswidth = _DW_SCROLLED_MAX_WIDTH;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9424 if(*thisheight < _DW_SCROLLED_MIN_HEIGHT)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9425 *thisheight = _DW_SCROLLED_MIN_HEIGHT;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9426 if(*thisheight > _DW_SCROLLED_MAX_HEIGHT)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9427 *thisheight = _DW_SCROLLED_MAX_HEIGHT;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9428 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9429
1087
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9430 /* Internal box packing function called by the other 3 functions */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9431 void _dw_box_pack(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad, char *funcname)
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9432 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
9433 int warn = FALSE, _dw_locked_by_me = FALSE;
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9434 GtkWidget *tmp, *tmpitem, *image = NULL;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9435
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9436 if(!box)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9437 return;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9438
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9439 /*
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9440 * If you try and pack an item into itself VERY bad things can happen; like at least an
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9441 * infinite loop on GTK! Lets be safe!
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9442 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9443 if(box == item)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9444 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9445 dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Danger! Danger! Will Robinson; box and item are the same!");
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9446 return;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9447 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9448
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9449 DW_MUTEX_LOCK;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9450
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
9451 /* If this is a special box, like: Window, Groupbox, Scrollbox...
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
9452 * get the internal box handle.
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
9453 */
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9454 if((tmp = g_object_get_data(G_OBJECT(box), "_dw_boxhandle")))
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9455 box = tmp;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9456
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
9457 /* Can't pack nothing with GTK, so create an empty label */
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9458 if(!item)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9459 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9460 item = gtk_label_new("");
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9461 g_object_set_data(G_OBJECT(item), "_dw_padding", GINT_TO_POINTER(1));
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9462 gtk_widget_show_all(item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9463 }
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
9464 /* Due to GTK3 minimum size limitations, if we are packing a widget
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
9465 * with an image, we need to scale the image down to fit the packed size.
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
9466 */
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9467 else if((image = g_object_get_data(G_OBJECT(item), "_dw_bitmap")))
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9468 {
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
9469 GdkPixbuf *pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(image));
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
9470
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9471 if(pixbuf)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9472 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9473 int pwidth = gdk_pixbuf_get_width(pixbuf);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9474 int pheight = gdk_pixbuf_get_height(pixbuf);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9475
1426
dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1414
diff changeset
9476 if(width == -1)
dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1414
diff changeset
9477 width = pwidth;
dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1414
diff changeset
9478 if(height == -1)
dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1414
diff changeset
9479 height = pheight;
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9480
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9481 if(pwidth > width || pheight > height)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9482 pixbuf = gdk_pixbuf_scale_simple(pixbuf, pwidth > width ? width : pwidth, pheight > height ? height : pheight, GDK_INTERP_BILINEAR);
1426
dfd9f177c34c Fix incorrect pixbuf scaling on GTK3 when -1 is passed as a parameter
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1414
diff changeset
9483 gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9484 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9485 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9486
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
9487 /* Check if the item to be packed is a special box */
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9488 tmpitem = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_boxhandle");
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9489
1451
95ca625b8ffc Removed GtkVbox and associated code from top-level windows on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1429
diff changeset
9490 /* Make sure our target box is valid */
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9491 if(GTK_IS_GRID(box))
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9492 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
9493 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
9494 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9495
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9496 /* If the item being packed is a box, then we use it's padding
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9497 * instead of the padding specified on the pack line, this is
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9498 * due to a bug in the OS/2 and Win32 renderer and a limitation
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9499 * of the GtkTable class.
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9500 */
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9501 if(GTK_IS_GRID(item) || (tmpitem && GTK_IS_GRID(tmpitem)))
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9502 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9503 GtkWidget *eventbox = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_eventbox");
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9504
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9505 /* NOTE: I left in the ability to pack boxes with a size,
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9506 * this eliminates that by forcing the size to 0.
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9507 */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9508 height = width = 0;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9509
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9510 if(eventbox)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9511 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
9512 int boxpad = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "_dw_boxpad"));
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9513 gtk_container_add(GTK_CONTAINER(eventbox), item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9514 gtk_container_set_border_width(GTK_CONTAINER(eventbox), boxpad);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9515 item = eventbox;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9516 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9517 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9518 else
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9519 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9520 /* Only show warning if item is not a box */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9521 warn = TRUE;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9522 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9523
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9524 /* Do some sanity bounds checking */
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9525 if(index < 0)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9526 index = 0;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9527 if(index > boxcount)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9528 index = boxcount;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9529
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9530 #if !GTK_CHECK_VERSION(3,10,0)
1656
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9531 /* Fix the index by taking into account empty cells */
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9532 if(boxtype == DW_VERT)
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9533 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9534 int z;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9535
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9536 for(z=0;z<index;z++)
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9537 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9538 if(!gtk_grid_get_child_at(GTK_GRID(box), 0, z))
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9539 index++;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9540 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9541 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9542 else
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9543 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9544 int z;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9545
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9546 for(z=0;z<index;z++)
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9547 {
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9548 if(!gtk_grid_get_child_at(GTK_GRID(box), z, 0))
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9549 index++;
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9550 }
01f59ba51e7f Take into account empty box cells created by dw_window_destroy() in GTK3
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1637
diff changeset
9551 }
1890
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
9552 #endif
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
9553
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9554 g_object_set_data(G_OBJECT(item), "_dw_table", box);
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9555 /* Set the expand attribute on the widgets now instead of the container */
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9556 gtk_widget_set_vexpand(item, vsize);
1127
ed7cbdc37a75 Widget GTK3 v/halign properties get set according to the sizing flags
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1126
diff changeset
9557 gtk_widget_set_valign(item, vsize ? GTK_ALIGN_FILL : GTK_ALIGN_START);
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9558 gtk_widget_set_hexpand(item, hsize);
1127
ed7cbdc37a75 Widget GTK3 v/halign properties get set according to the sizing flags
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1126
diff changeset
9559 gtk_widget_set_halign(item, hsize ? GTK_ALIGN_FILL : GTK_ALIGN_START);
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9560 /* Use the margin property as padding */
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9561 g_object_set(G_OBJECT(item), "margin", pad, NULL);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9562 /* Add to the grid using insert...
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9563 * rows for vertical boxes and columns for horizontal.
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9564 */
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9565 if(boxtype == DW_VERT)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9566 {
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9567 gtk_grid_insert_row(GTK_GRID(box), index);
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9568 gtk_grid_attach(GTK_GRID(box), item, 0, index, 1, 1);
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9569 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9570 else
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9571 {
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9572 gtk_grid_insert_column(GTK_GRID(box), index);
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9573 gtk_grid_attach(GTK_GRID(box), item, index, 0, 1, 1);
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
9574 }
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9575 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1));
1545
6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1539
diff changeset
9576 /* Special case for scrolled windows */
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9577 if(GTK_IS_SCROLLED_WINDOW(item))
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9578 {
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9579 gint scrolledwidth = 0, scrolledheight = 0;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9580
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9581 /* Pre-run the calculation code for MLE/Container/Tree if needed */
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9582 if((width < 1 && !hsize) || (height < 1 && !vsize))
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9583 _dw_get_scrolled_size(item, &scrolledwidth, &scrolledheight);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9584
1413
28210f7941c7 Safety checks for -1 parameter to dw_box_pack*() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1400
diff changeset
9585 if(width > 0)
28210f7941c7 Safety checks for -1 parameter to dw_box_pack*() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1400
diff changeset
9586 gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), width);
1539
b7136c130a66 Default scrolled items to 500x200 on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1528
diff changeset
9587 else if(!hsize)
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9588 gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(item), scrolledwidth);
1413
28210f7941c7 Safety checks for -1 parameter to dw_box_pack*() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1400
diff changeset
9589 if(height > 0)
28210f7941c7 Safety checks for -1 parameter to dw_box_pack*() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1400
diff changeset
9590 gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), height);
1539
b7136c130a66 Default scrolled items to 500x200 on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1528
diff changeset
9591 else if(!vsize)
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
9592 gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(item), scrolledheight);
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9593 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9594 else
1414
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1413
diff changeset
9595 {
1545
6edf3fce77f2 Initial support for container and MLE auto-sizing on GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1539
diff changeset
9596 /* Set the requested size of the widget */
1414
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1413
diff changeset
9597 if(width == -1 && (GTK_IS_COMBO_BOX(item) || GTK_IS_ENTRY(item)))
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1413
diff changeset
9598 gtk_widget_set_size_request(item, 150, height);
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1413
diff changeset
9599 else if(width == -1 && GTK_IS_SPIN_BUTTON(item))
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1413
diff changeset
9600 gtk_widget_set_size_request(item, 50, height);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9601 else
1414
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1413
diff changeset
9602 gtk_widget_set_size_request(item, width, height);
38c4484f5b90 Don't use natural size on GTK3 for entryfields, spinbuttons and comboboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1413
diff changeset
9603 }
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9604 if(GTK_IS_RADIO_BUTTON(item))
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9605 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9606 GSList *group;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9607 GtkWidget *groupstart = (GtkWidget *)g_object_get_data(G_OBJECT(box), "_dw_group");
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9608
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9609 if(groupstart)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9610 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9611 group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(groupstart));
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9612 gtk_radio_button_set_group(GTK_RADIO_BUTTON(item), group);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9613 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9614 else
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9615 g_object_set_data(G_OBJECT(box), "_dw_group", (gpointer)item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9616 }
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9617 /* If we previously incremented the reference count... drop it now that it is packed */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9618 if(g_object_get_data(G_OBJECT(item), "_dw_refed"))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9619 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9620 g_object_unref(G_OBJECT(item));
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9621 g_object_set_data(G_OBJECT(item), "_dw_refed", NULL);
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9622 }
1080
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9623 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9624 DW_MUTEX_UNLOCK;
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9625
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9626 if(warn)
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9627 {
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9628 if ( width == 0 && hsize == FALSE )
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9629 dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Width and expand Horizonal both unset for box: %x item: %x",box,item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9630 if ( height == 0 && vsize == FALSE )
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9631 dw_messagebox(funcname, DW_MB_OK|DW_MB_ERROR, "Height and expand Vertical both unset for box: %x item: %x",box,item);
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9632 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9633 }
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9634
27e9a063fbb5 Committing initial version of dw_box_pack_at_index() for GTK2 and GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1076
diff changeset
9635 /*
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9636 * Remove windows (widgets) from the box they are packed into.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9637 * Parameters:
1679
e19b93a8229b More comment cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1678
diff changeset
9638 * handle: Window handle of the packed item to be removed.
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9639 * Returns:
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9640 * DW_ERROR_NONE on success and DW_ERROR_GENERAL on failure.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9641 */
1769
d81bebc5c8cc Mark and I decided to change dw_box_remove*() to dw_box_unpack*() for consistency.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1747
diff changeset
9642 int API dw_box_unpack(HWND handle)
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9643 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
9644 int _dw_locked_by_me = FALSE, retcode = DW_ERROR_GENERAL;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9645
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9646 DW_MUTEX_LOCK;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9647 if(GTK_IS_WIDGET(handle))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9648 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9649 GtkWidget *box, *handle2 = handle;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9650 GtkWidget *eventbox = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_eventbox");
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9651
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9652 /* Handle the invisible event box if it exists */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9653 if(eventbox && GTK_IS_WIDGET(eventbox))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9654 handle2 = eventbox;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9655
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9656 /* Check if we are removing a widget from a box */
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9657 if((box = gtk_widget_get_parent(handle2)) && GTK_IS_GRID(box))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9658 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9659 /* Get the number of items in the box... */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9660 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9661 #if GTK_CHECK_VERSION(3,10,0)
1891
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9662 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9663 #endif
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9664
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9665 if(boxcount > 0)
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9666 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9667 /* Decrease the count by 1 */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9668 boxcount--;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9669 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount));
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9670 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9671 /* If we haven't incremented the reference count... raise it before removal */
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9672 if(!g_object_get_data(G_OBJECT(handle2), "_dw_refed"))
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9673 {
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9674 g_object_ref(G_OBJECT(handle2));
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9675 g_object_set_data(G_OBJECT(handle2), "_dw_refed", GINT_TO_POINTER(1));
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9676 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9677 /* Remove the widget from the box */
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9678 #if GTK_CHECK_VERSION(3,10,0)
1891
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9679 /* Figure out where in the grid this widget is and remove that row/column */
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9680 if(boxtype == DW_VERT)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9681 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9682 int z;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9683
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9684 for(z=0;z<boxcount;z++)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9685 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9686 if(gtk_grid_get_child_at(GTK_GRID(box), 0, z) == handle2)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9687 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9688 gtk_grid_remove_row(GTK_GRID(box), z);
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9689 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9690 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9691 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9692 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9693 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9694 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9695 int z;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9696
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9697 for(z=0;z<boxcount;z++)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9698 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9699 if(gtk_grid_get_child_at(GTK_GRID(box), z, 0) == handle2)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9700 {
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9701 gtk_grid_remove_column(GTK_GRID(box), z);
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9702 break;
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9703 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9704 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9705 }
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9706 #else
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9707 gtk_container_remove(GTK_CONTAINER(box), handle2);
1891
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9708 #endif
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9709 retcode = DW_ERROR_NONE;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9710 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9711 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9712 DW_MUTEX_UNLOCK;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9713 return retcode;
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9714 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9715
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9716 /*
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9717 * Remove windows (widgets) from a box at an arbitrary location.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9718 * Parameters:
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9719 * box: Window handle of the box to be removed from.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9720 * index: 0 based index of packed items.
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9721 * Returns:
1679
e19b93a8229b More comment cleanups.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1678
diff changeset
9722 * Handle to the removed item on success, 0 on failure or padding.
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9723 */
1769
d81bebc5c8cc Mark and I decided to change dw_box_remove*() to dw_box_unpack*() for consistency.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1747
diff changeset
9724 HWND API dw_box_unpack_at_index(HWND box, int index)
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9725 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
9726 int _dw_locked_by_me = FALSE;
1674
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9727 HWND retval = 0;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9728
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9729 DW_MUTEX_LOCK;
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9730 /* Check if we are removing a widget from a box */
1674
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9731 if(GTK_IS_GRID(box))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9732 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9733 /* Get the number of items in the box... */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9734 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount"));
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9735 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype"));
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9736 #if GTK_CHECK_VERSION(3,10,0)
1891
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9737 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);
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9738 #else
1674
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9739 GtkWidget *item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9740
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9741 /* Fix the index by taking into account empty cells */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9742 if(boxtype == DW_VERT)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9743 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9744 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9745
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9746 for(z=0;z<index;z++)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9747 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9748 if(!gtk_grid_get_child_at(GTK_GRID(box), 0, z))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9749 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9750 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9751 item = gtk_grid_get_child_at(GTK_GRID(box), 0, index);
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9752 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9753 else
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9754 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9755 int z;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9756
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9757 for(z=0;z<index;z++)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9758 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9759 if(!gtk_grid_get_child_at(GTK_GRID(box), z, 0))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9760 index++;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9761 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9762 item = gtk_grid_get_child_at(GTK_GRID(box), index, 0);
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9763 }
1890
0f3df50bfc4f Untested GTK3 change to use the new gtk_grid_remove_*()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1887
diff changeset
9764 #endif
1674
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9765
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9766 if(boxcount > 0)
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9767 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9768 /* Decrease the count by 1 */
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9769 boxcount--;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9770 g_object_set_data(G_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount));
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9771 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9772 /* If we haven't incremented the reference count... raise it before removal */
1891
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9773 if(item && g_object_get_data(G_OBJECT(item), "_dw_padding"))
1674
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9774 gtk_widget_destroy(item);
1891
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9775 else if(item)
1674
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9776 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9777 if(!g_object_get_data(G_OBJECT(item), "_dw_refed"))
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9778 {
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9779 g_object_ref(G_OBJECT(item));
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9780 g_object_set_data(G_OBJECT(item), "_dw_refed", GINT_TO_POINTER(1));
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9781 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9782 /* Remove the widget from the box */
1674
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9783 gtk_container_remove(GTK_CONTAINER(box), item);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9784 #if GTK_CHECK_VERSION(3,10,0)
1891
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9785 if(boxtype == DW_VERT)
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9786 gtk_grid_remove_row(GTK_GRID(box), index);
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9787 else
11a16c117748 Fixed build problems with the last GTK3 commit; tested with a live
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1890
diff changeset
9788 gtk_grid_remove_column(GTK_GRID(box), index);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9789 #endif
1674
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9790 retval = item;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9791 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9792 }
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9793 DW_MUTEX_UNLOCK;
923af93e4084 Implemented dw_box_remove_at_index() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1669
diff changeset
9794 return retval;
1669
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9795 }
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9796
36a090da4cb1 Initial implementation of dw_box_remove() for GTK2/3 and stub for dw_box_remove_at_index().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1656
diff changeset
9797 /*
1087
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9798 * Pack windows (widgets) into a box at an arbitrary location.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9799 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9800 * box: Window handle of the box to be packed into.
1678
896f377a47c7 Added exports for building with MinGW on Windows and Watcom on OS/2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1674
diff changeset
9801 * item: Window handle of the item to pack.
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
9802 * index: 0 based index of packed items.
1087
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9803 * width: Width in pixels of the item or -1 to be self determined.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9804 * height: Height in pixels of the item or -1 to be self determined.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9805 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9806 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9807 * pad: Number of pixels of padding around the item.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9808 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9809 void API dw_box_pack_at_index(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad)
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9810 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9811 _dw_box_pack(box, item, index, width, height, hsize, vsize, pad, "dw_box_pack_at_index()");
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9812 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9813
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9814 /*
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9815 * Pack windows (widgets) into a box from the start (or top).
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9816 * Parameters:
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9817 * box: Window handle of the box to be packed into.
1678
896f377a47c7 Added exports for building with MinGW on Windows and Watcom on OS/2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1674
diff changeset
9818 * item: Window handle of the item to pack.
1087
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9819 * width: Width in pixels of the item or -1 to be self determined.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9820 * height: Height in pixels of the item or -1 to be self determined.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9821 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9822 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9823 * pad: Number of pixels of padding around the item.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9824 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9825 void API dw_box_pack_start(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9826 {
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
9827 /* 65536 is the table limit on GTK...
1087
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9828 * seems like a high enough value we will never hit it here either.
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9829 */
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9830 _dw_box_pack(box, item, 65536, width, height, hsize, vsize, pad, "dw_box_pack_start()");
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9831 }
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9832
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9833 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9834 * Pack windows (widgets) into a box from the end (or bottom).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9835 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9836 * box: Window handle of the box to be packed into.
1678
896f377a47c7 Added exports for building with MinGW on Windows and Watcom on OS/2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1674
diff changeset
9837 * item: Window handle of the item to pack.
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9838 * width: Width in pixels of the item or -1 to be self determined.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9839 * height: Height in pixels of the item or -1 to be self determined.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9840 * hsize: TRUE if the window (widget) should expand horizontally to fill space given.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9841 * vsize: TRUE if the window (widget) should expand vertically to fill space given.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9842 * pad: Number of pixels of padding around the item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9843 */
1087
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9844 void API dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9845 {
173e49c2270f Merge all 3 box packing functions into one internal function on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1081
diff changeset
9846 _dw_box_pack(box, item, 0, width, height, hsize, vsize, pad, "dw_box_pack_end()");
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9847 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9848
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9849
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9850 union _dw_extents_union { guchar **gu_extents; unsigned long **extents; };
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9851 static GdkAtom _dw_extents_atom = 0;
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9852 static time_t _dw_extents_time = 0;
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9853
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9854 static gboolean _dw_property_notify(GtkWidget *window, GdkEventProperty* event, GdkWindow *gdkwindow)
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9855 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9856 /* Check to see if we got a property change */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9857 if(event->state == GDK_PROPERTY_NEW_VALUE && event->atom == _dw_extents_atom && event->window == gdkwindow)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9858 _dw_extents_time = 0;
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9859 return FALSE;
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9860 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9861
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9862 /* Internal function to figure out the frame extents of an unmapped window */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9863 void _dw_get_frame_extents(GtkWidget *window, int *vert, int *horz)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9864 {
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9865 if(gtk_window_get_decorated(GTK_WINDOW(window)))
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9866 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9867 const char *request = "_NET_REQUEST_FRAME_EXTENTS";
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9868 unsigned long *extents = NULL;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9869 union _dw_extents_union eu;
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9870 GdkAtom request_extents = gdk_atom_intern(request, FALSE);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9871 GdkWindow *gdkwindow = gtk_widget_get_window(window);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9872 GdkDisplay *display = gtk_widget_get_display(window);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9873
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9874 if(!_dw_extents_atom)
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9875 _dw_extents_atom = gdk_atom_intern("_NET_FRAME_EXTENTS", FALSE);
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9876
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9877 /* Set some rational defaults.. just in case */
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9878 *vert = 28;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9879 *horz = 12;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9880
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9881 /* See if the current window manager supports _NET_REQUEST_FRAME_EXTENTS */
2342
5437aed23151 GTK3: Isolate some X11 specific calls so it functions on Wayland.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2333
diff changeset
9882 if(display && GDK_IS_X11_DISPLAY(display) && gdk_x11_screen_supports_net_wm_hint(gdk_screen_get_default(), request_extents))
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9883 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9884 Display *xdisplay = GDK_DISPLAY_XDISPLAY(display);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9885 GdkWindow *root_window = gdk_get_default_root_window();
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9886 Window xroot_window = GDK_WINDOW_XID(root_window);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9887 Atom extents_request_atom = gdk_x11_get_xatom_by_name_for_display(display, request);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9888 unsigned long window_id = GDK_WINDOW_XID(gdkwindow);
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9889 XEvent xevent = {0};
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9890 time_t currtime;
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9891 gulong connid;
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9892
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9893 xevent.xclient.type = ClientMessage;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9894 xevent.xclient.message_type = extents_request_atom;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9895 xevent.xclient.display = xdisplay;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9896 xevent.xclient.window = window_id;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9897 xevent.xclient.format = 32;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9898
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9899 /* Send the property request */
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9900 XSendEvent(xdisplay, xroot_window, False,
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9901 (SubstructureRedirectMask | SubstructureNotifyMask),
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9902 &xevent);
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9903
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9904 /* Connect a signal to look for the property change */
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9905 connid = g_signal_connect(G_OBJECT(window), "property_notify_event", G_CALLBACK(_dw_property_notify), gdkwindow);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9906
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9907 /* Record the request time */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9908 time(&_dw_extents_time);
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9909
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9910 /* Look for the property notify event */
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9911 do
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9912 {
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9913 dw_main_iteration();
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9914 time(&currtime);
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9915 }
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9916 while(currtime - _dw_extents_time < 2);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9917
1510
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9918 /* Remove the signal handler now that we are done */
218c85939040 Ported fixes in previous commit from GTK2 to GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1506
diff changeset
9919 g_signal_handler_disconnect(G_OBJECT(window), connid);
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9920 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9921
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9922 /* Attempt to retrieve window's frame extents. */
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9923 eu.extents = &extents;
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9924 if(gdk_property_get(gdkwindow,
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
9925 _dw_extents_atom,
1482
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9926 gdk_atom_intern("CARDINAL", FALSE),
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9927 0, sizeof(unsigned long)*4, FALSE,
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9928 NULL, NULL, NULL, eu.gu_extents))
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9929 {
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9930 *horz = extents[0] + extents[1];
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9931 *vert = extents[2] + extents[3];
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9932 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9933 }
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9934 else
dd584f431f9f Even better workaround to Compiz bug on GTK... it only seems to happen
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1481
diff changeset
9935 *horz = *vert = 0;
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9936 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9937
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9938 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9939 * Sets the size of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9940 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9941 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9942 * width: New width in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9943 * height: New height in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9944 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9945 void dw_window_set_size(HWND handle, unsigned long width, unsigned long height)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9946 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
9947 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9948
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9949 if(!handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9950 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9951
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9952 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9953 if(GTK_IS_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9954 {
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9955 GdkWindow *window = gtk_widget_get_window(handle);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9956 int cx = 0, cy = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9957
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9958 /* Window is mapped query the frame size directly */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9959 if(window && gtk_widget_get_mapped(handle))
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9960 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9961 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9962 gint gwidth, gheight;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9963
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9964 /* Calculate the border size */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9965 gdk_window_get_frame_extents(window, &frame);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9966 gdk_window_get_geometry(window, NULL, NULL, &gwidth, &gheight);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
9967
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9968 cx = frame.width - gwidth;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9969 if(cx < 0)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9970 cx = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9971 cy = frame.height - gheight;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9972 if(cy < 0)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9973 cy = 0;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9974 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9975 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9976 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9977 /* Check if we have cached frame size values */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9978 if(!((cx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_frame_width"))) |
1471
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1470
diff changeset
9979 (cy = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_frame_height")))))
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9980 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9981 /* If not try to ask the window manager for the estimated size...
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9982 * and finally if all else fails, guess.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9983 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9984 _dw_get_frame_extents(handle, &cy, &cx);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9985 /* Cache values for later use */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9986 g_object_set_data(G_OBJECT(handle), "_dw_frame_width", GINT_TO_POINTER(cx));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9987 g_object_set_data(G_OBJECT(handle), "_dw_frame_height", GINT_TO_POINTER(cy));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9988 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9989 /* Save the size for when it is shown */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9990 g_object_set_data(G_OBJECT(handle), "_dw_width", GINT_TO_POINTER(width));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9991 g_object_set_data(G_OBJECT(handle), "_dw_height", GINT_TO_POINTER(height));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9992 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
9993 /* Resize minus the border size */
1471
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1470
diff changeset
9994 if(width > cx && height > cy)
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1470
diff changeset
9995 {
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1470
diff changeset
9996 gtk_window_resize(GTK_WINDOW(handle), width - cx , height - cy );
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1470
diff changeset
9997 gtk_window_set_default_size(GTK_WINDOW(handle), width - cx, height - cy);
26dbd11399d6 Don't attempt to set windows to an invalid size on GTK when
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1470
diff changeset
9998 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
9999 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10000 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10001 gtk_widget_set_size_request(handle, width, height);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10002 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10003 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10004
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10005 /*
1429
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10006 * Gets the size the system thinks the widget should be.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10007 * Parameters:
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10008 * handle: Window handle of the item to be back.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10009 * width: Width in pixels of the item or NULL if not needed.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10010 * height: Height in pixels of the item or NULL if not needed.
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10011 */
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10012 void API dw_window_get_preferred_size(HWND handle, int *width, int *height)
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10013 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10014 int _dw_locked_by_me = FALSE;
1429
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10015
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10016 DW_MUTEX_LOCK;
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10017 if(GTK_IS_SCROLLED_WINDOW(handle))
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10018 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10019 gint scrolledwidth, scrolledheight;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10020
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
10021 _dw_get_scrolled_size(handle, &scrolledwidth, &scrolledheight);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10022
1561
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10023 if(width)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10024 *width = scrolledwidth;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10025 if(height)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10026 *height = scrolledheight;
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10027 }
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10028 else
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10029 {
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10030 if(width)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10031 gtk_widget_get_preferred_width(handle, NULL, width);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10032 if(height)
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10033 gtk_widget_get_preferred_height(handle, NULL, height);
46e34bd92336 Implemented guessing size of MLE on GTK... not as accurate as the other platforms...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1556
diff changeset
10034 }
1429
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10035 DW_MUTEX_UNLOCK;
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10036 }
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10037
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10038 /* Internal version to simplify the code with multiple versions of GTK */
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10039 int _dw_screen_width(void)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10040 {
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10041 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10042 {
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10043 GdkDisplay *display = gdk_display_get_default();
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10044
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10045 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10046 {
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10047 GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10048
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10049 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10050 {
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10051 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10052 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10053 return rc.width;
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10054 }
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10055 }
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10056 }
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10057 return 0;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10058 #else
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10059 return gdk_screen_width();
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10060 #endif
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10061 }
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10062
1429
fbaec6e5df63 Added dw_window_get_preferred_size() which attempts to determine the size the system wants for the widget. This is useful when creating nice looking layouts.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1426
diff changeset
10063 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10064 * Returns the width of the screen.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10065 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10066 int dw_screen_width(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10067 {
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10068 int retval = 0;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10069 int _dw_locked_by_me = FALSE;
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10070
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10071 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10072 retval = _dw_screen_width();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10073 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10074 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10075 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10076
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10077 /* Internal version to simplify the code with multiple versions of GTK */
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10078 int _dw_screen_height(void)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10079 {
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10080 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10081 {
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10082 GdkDisplay *display = gdk_display_get_default();
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10083
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10084 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10085 {
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10086 GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10087
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10088 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10089 {
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10090 GdkRectangle rc = { 0, 0, 0 ,0 };
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10091 gdk_monitor_get_geometry(monitor, &rc);
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10092 return rc.height;
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10093 }
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10094 }
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10095 }
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10096 return 0;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10097 #else
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10098 return gdk_screen_height();
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10099 #endif
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10100 }
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10101
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10102 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10103 * Returns the height of the screen.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10104 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10105 int dw_screen_height(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10106 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10107 int retval;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10108 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10109
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10110 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10111 retval = _dw_screen_height();
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10112 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10113 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10114 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10115
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10116 /* This should return the current color depth */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10117 unsigned long dw_color_depth_get(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10118 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10119 int retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10120 GdkVisual *vis;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10121 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10122
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10123 DW_MUTEX_LOCK;
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10124 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10125 vis = gdk_screen_get_system_visual(gdk_screen_get_default());
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10126 #else
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10127 vis = gdk_visual_get_system();
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10128 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10129 retval = gdk_visual_get_depth(vis);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10130 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10131 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10132 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10133
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10134 /*
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10135 * Sets the gravity of a given window (widget).
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10136 * Gravity controls which corner of the screen and window the position is relative to.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10137 * Parameters:
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10138 * handle: Window (widget) handle.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10139 * horz: DW_GRAV_LEFT (default), DW_GRAV_RIGHT or DW_GRAV_CENTER.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10140 * vert: DW_GRAV_TOP (default), DW_GRAV_BOTTOM or DW_GRAV_CENTER.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10141 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10142 void API dw_window_set_gravity(HWND handle, int horz, int vert)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10143 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10144 dw_window_set_data(handle, "_dw_grav_horz", DW_INT_TO_POINTER(horz));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10145 dw_window_set_data(handle, "_dw_grav_vert", DW_INT_TO_POINTER(vert));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10146 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10147
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10148 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10149 * Sets the position of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10150 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10151 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10152 * x: X location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10153 * y: Y location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10154 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10155 void dw_window_set_pos(HWND handle, long x, long y)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10156 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10157 int _dw_locked_by_me = FALSE;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10158 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10159 GtkWidget *mdi;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10160 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10161
1121
fb92778105b2 Fixes some major window positioning problems in GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1118
diff changeset
10162 if(!handle)
fb92778105b2 Fixes some major window positioning problems in GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1118
diff changeset
10163 return;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10164
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10165 DW_MUTEX_LOCK;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10166 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10167 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10168 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10169 gtk_mdi_move(GTK_MDI(mdi), handle, x, y);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10170 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10171 else
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10172 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10173 {
1121
fb92778105b2 Fixes some major window positioning problems in GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1118
diff changeset
10174 GdkWindow *window = NULL;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10175
1121
fb92778105b2 Fixes some major window positioning problems in GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1118
diff changeset
10176 if(GTK_IS_WINDOW(handle))
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10177 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10178 GdkWindow *window = gtk_widget_get_window(handle);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10179 int horz = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_grav_horz"));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10180 int vert = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_grav_vert"));
1476
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10181 int cx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_frame_width"));
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10182 int cy = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_frame_height"));
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10183 int newx = x, newy = y, width = 0, height = 0;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10184
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10185 /* If the window is mapped */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10186 if(window && gtk_widget_get_mapped(handle))
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10187 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10188 /* If we need the width or height... */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10189 if(horz || vert)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10190 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10191 GdkRectangle frame;
1476
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10192 int count = 0;
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10193
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10194 /* Get the frame size */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10195 gdk_window_get_frame_extents(window, &frame);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10196
1476
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10197 /* FIXME: Sometimes we get returned an invalid 200x200
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10198 * result... so if we get this... try the call a second
1476
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10199 * time and hope for a better result.
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10200 */
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10201 while((frame.width == 200 || frame.width == (200 + cx)) &&
1476
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10202 (frame.height == 200 || frame.height == (200 + cy)) && count < 10)
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10203 {
1505
fcdd9e3c735a Use _dw_msleep() insetad of dw_main_sleep() when pausing to get the frame extents
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1501
diff changeset
10204 _dw_msleep(1);
1476
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10205 count++;
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10206 gdk_window_get_frame_extents(window, &frame);
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10207 }
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10208 width = frame.width;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10209 height = frame.height;
1470
a317c2ec1d4c On GTK2 gtk_window_move() needs to be called after mapping the window...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1469
diff changeset
10210 }
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10211 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10212 else
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10213 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10214 /* Check if we have cached frame size values */
1476
d76a36c9cff1 FIXME: Hacky fix to gdk_window_get_frame_extents() on GTK3 returning bogus
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1472
diff changeset
10215 if(!(cx | cy))
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10216 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10217 /* If not try to ask the window manager for the estimated size...
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10218 * and finally if all else fails, guess.
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10219 */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10220 _dw_get_frame_extents(handle, &cy, &cx);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10221 /* Cache values for later use */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10222 g_object_set_data(G_OBJECT(handle), "_dw_frame_width", GINT_TO_POINTER(cx));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10223 g_object_set_data(G_OBJECT(handle), "_dw_frame_height", GINT_TO_POINTER(cy));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10224 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10225 /* Save the positions for when it is shown */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10226 g_object_set_data(G_OBJECT(handle), "_dw_x", GINT_TO_POINTER(x));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10227 g_object_set_data(G_OBJECT(handle), "_dw_y", GINT_TO_POINTER(y));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10228 g_object_set_data(G_OBJECT(handle), "_dw_pos", GINT_TO_POINTER(1));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10229 /* Check to see if there is a pending size request too */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10230 width = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_width"));
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10231 height = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_height"));
1470
a317c2ec1d4c On GTK2 gtk_window_move() needs to be called after mapping the window...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1469
diff changeset
10232 if(!width || !height)
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10233 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10234 /* Ask what GTK is planning on suggesting for the window size */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10235 gtk_window_get_size(GTK_WINDOW(handle), !width ? &width : NULL, !height ? &height : NULL);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10236 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10237 /* Add the frame size to it */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10238 width += cx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10239 height += cy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10240 }
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10241 /* Do any gravity calculations */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10242 if(horz || vert)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10243 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10244 /* Handle horizontal center gravity */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10245 if((horz & 0xf) == DW_GRAV_CENTER)
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10246 newx += ((_dw_screen_width() / 2) - (width / 2));
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10247 /* Handle right gravity */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10248 else if((horz & 0xf) == DW_GRAV_RIGHT)
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10249 newx = _dw_screen_width() - width - x;
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10250 /* Handle vertical center gravity */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10251 if((vert & 0xf) == DW_GRAV_CENTER)
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10252 newy += ((_dw_screen_height() / 2) - (height / 2));
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10253 else if((vert & 0xf) == DW_GRAV_BOTTOM)
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10254 newy = _dw_screen_height() - height - y;
1499
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10255
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10256 #if GTK_CHECK_VERSION(3,3,8)
1499
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10257 /* Adjust the values to avoid Gnome bar if requested */
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10258 if((horz | vert) & DW_GRAV_OBSTACLES)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10259 {
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10260 GdkRectangle rect = { 0, 0, 0, 0 };
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10261 #if GTK_CHECK_VERSION(3,22,0)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10262 GdkDisplay *display = gdk_display_get_default();
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10263
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10264 if(display)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10265 {
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10266 GdkMonitor *monitor = gdk_display_get_primary_monitor(display);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10267
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10268 if(monitor)
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10269 gdk_monitor_get_workarea(monitor, &rect);
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10270 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10271 #else
1499
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10272 GdkScreen *screen = gdk_screen_get_default();
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10273
1499
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10274 gdk_screen_get_monitor_workarea(screen, 0, &rect);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10275 #endif
1499
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10276 if(horz & DW_GRAV_OBSTACLES)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10277 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10278 if((horz & 0xf) == DW_GRAV_LEFT)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10279 newx += rect.x;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10280 else if((horz & 0xf) == DW_GRAV_RIGHT)
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10281 newx -= _dw_screen_width() - (rect.x + rect.width);
1499
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10282 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10283 if(vert & DW_GRAV_OBSTACLES)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10284 {
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10285 if((vert & 0xf) == DW_GRAV_TOP)
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10286 newy += rect.y;
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10287 else if((vert & 0xf) == DW_GRAV_BOTTOM)
1929
25da63f0eddc Updates for supporting newer versions of GTK3....
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1926
diff changeset
10288 newy -= _dw_screen_height() - (rect.y + rect.height);
1499
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10289 }
97e5e8688fe1 Added gravity obstacle support for GTK 3.4 and later.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1491
diff changeset
10290 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10291 #endif
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10292 }
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10293 /* Finally move the window into place */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10294 gtk_window_move(GTK_WINDOW(handle), newx, newy);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10295 }
1121
fb92778105b2 Fixes some major window positioning problems in GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1118
diff changeset
10296 else if((window = gtk_widget_get_window(handle)))
fb92778105b2 Fixes some major window positioning problems in GTK3...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1118
diff changeset
10297 gdk_window_move(window, x, y);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10298 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10299 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10300 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10301
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10302 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10303 * Sets the position and size of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10304 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10305 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10306 * x: X location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10307 * y: Y location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10308 * width: Width of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10309 * height: Height of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10310 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10311 void dw_window_set_pos_size(HWND handle, long x, long y, unsigned long width, unsigned long height)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10312 {
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10313 dw_window_set_size(handle, width, height);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10314 dw_window_set_pos(handle, x, y);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10315 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10316
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10317 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10318 * Gets the position and size of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10319 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10320 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10321 * x: X location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10322 * y: Y location from the bottom left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10323 * width: Width of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10324 * height: Height of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10325 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10326 void dw_window_get_pos_size(HWND handle, long *x, long *y, ULONG *width, ULONG *height)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10327 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10328 int _dw_locked_by_me = FALSE;
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10329 gint gx = 0, gy = 0, gwidth = 0, gheight = 0;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10330 #ifdef DW_INCLUDE_DEPRECATED
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10331 GtkWidget *mdi;
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10332 #endif
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10333
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10334 DW_MUTEX_LOCK;
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10335 #ifdef DW_INCLUDE_DEPRECATED
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10336 /* If it is an MDI window query what we can */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10337 if((mdi = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_mdi")) && GTK_IS_MDI(mdi))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10338 {
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10339 gtk_mdi_get_pos(GTK_MDI(mdi), handle, &gx, &gy);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10340 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10341 else
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10342 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10343 {
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10344 GdkWindow *window;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10345
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10346 /* Can only query if the window is realized */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10347 if(handle && (window = gtk_widget_get_window(handle)))
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10348 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10349 /* If it is a toplevel window */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10350 if(GTK_IS_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10351 {
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10352 if(gtk_widget_get_mapped(handle))
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10353 {
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10354 GdkRectangle frame;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10355
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10356 /* Calculate the border rectangle */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10357 gdk_window_get_frame_extents(window, &frame);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10358 gx = frame.x;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10359 gy = frame.y;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10360 gwidth = frame.width;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10361 gheight = frame.height;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10362 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10363 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10364 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10365 {
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10366 /* Get an individual widget coordinates */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10367 gdk_window_get_geometry(window, &gx, &gy, &gwidth, &gheight);
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10368 gdk_window_get_root_origin(window, &gx, &gy);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10369 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10370 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10371 }
1469
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10372 /* Fill in the requested fields */
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10373 if(x)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10374 *x = gx;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10375 if(y)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10376 *y = gy;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10377 if(width)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10378 *width = gwidth;
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10379 if(height)
b9efb744cfbd Second try and window positioning for GTK2 and port to GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1463
diff changeset
10380 *height = gheight;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10381 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10382 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10383
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10384 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10385 * Sets the style of a given window (widget).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10386 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10387 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10388 * width: New width in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10389 * height: New height in pixels.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10390 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10391 void dw_window_set_style(HWND handle, unsigned long style, unsigned long mask)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10392 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10393 GtkWidget *handle2 = handle;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10394 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10395
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10396 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10397 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10398 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10399 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10400 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10401 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10402 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10403 else if(GTK_IS_FRAME(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10404 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10405 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_label");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10406 if(tmp && GTK_IS_LABEL(tmp))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10407 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10408 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10409 else if(GTK_IS_BUTTON(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10410 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10411 if(mask & DW_BS_NOBORDER)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10412 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10413 if(style & DW_BS_NOBORDER)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10414 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10415 gtk_button_set_relief((GtkButton *)handle, GTK_RELIEF_NONE);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10416 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10417 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10418 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10419 gtk_button_set_relief((GtkButton *)handle, GTK_RELIEF_NORMAL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10420 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10421 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10422 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10423 if ( GTK_IS_LABEL(handle2) )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10424 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10425 gfloat x=DW_LEFT, y=DW_CENTER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10426 /* horizontal... */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10427 if ( style & DW_DT_CENTER )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10428 x = DW_CENTER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10429 if ( style & DW_DT_RIGHT )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10430 x = DW_RIGHT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10431 if ( style & DW_DT_LEFT )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10432 x = DW_LEFT;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10433 /* vertical... */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10434 if ( style & DW_DT_VCENTER )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10435 y = DW_CENTER;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10436 if ( style & DW_DT_TOP )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10437 y = DW_TOP;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10438 if ( style & DW_DT_BOTTOM )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10439 y = DW_BOTTOM;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10440 #if GTK_CHECK_VERSION(3,16,0)
1913
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10441 gtk_label_set_xalign(GTK_LABEL(handle2), x);
5d32be499016 The GTK MDI code is filling up with deprecated calls
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1912
diff changeset
10442 gtk_label_set_yalign(GTK_LABEL(handle2), y);
1917
933b5f7005a9 Fix building on GTK3 versions older than 3.16.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1916
diff changeset
10443 #else
933b5f7005a9 Fix building on GTK3 versions older than 3.16.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1916
diff changeset
10444 gtk_misc_set_alignment(GTK_MISC(handle2), x, y);
933b5f7005a9 Fix building on GTK3 versions older than 3.16.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1916
diff changeset
10445 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10446 if ( style & DW_DT_WORDBREAK )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10447 gtk_label_set_line_wrap( GTK_LABEL(handle), TRUE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10448 }
1314
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10449 if ( GTK_IS_CHECK_MENU_ITEM(handle2) && (mask & (DW_MIS_CHECKED | DW_MIS_UNCHECKED)) )
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10450 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10451 int check = 0;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10452
1314
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10453 if ( style & DW_MIS_CHECKED )
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10454 check = 1;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10455
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10456 _dw_ignore_click = 1;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10457 if(gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(handle2)) != check)
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10458 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(handle2), check);
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10459 _dw_ignore_click = 0;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10460 }
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10461 if ( (GTK_IS_CHECK_MENU_ITEM(handle2) || GTK_IS_MENU_ITEM(handle2)) && (mask & (DW_MIS_ENABLED | DW_MIS_DISABLED) ))
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10462 {
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10463 _dw_ignore_click = 1;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10464 if ( style & DW_MIS_ENABLED )
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10465 gtk_widget_set_sensitive( handle2, TRUE );
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10466 else
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10467 gtk_widget_set_sensitive( handle2, FALSE );
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10468 _dw_ignore_click = 0;
c969db49606e Initial commit allowing dw_window_set_style() to work on menu item handles.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1308
diff changeset
10469 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10470 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10471 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10472
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10473 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10474 * Adds a new page to specified notebook.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10475 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10476 * handle: Window (widget) handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10477 * flags: Any additional page creation flags.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10478 * front: If TRUE page is added at the beginning.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10479 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10480 unsigned long dw_notebook_page_new(HWND handle, unsigned long flags, int front)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10481 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10482 int z;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10483 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10484 GtkWidget **pagearray;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10485
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10486 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10487 pagearray = (GtkWidget **)g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10488
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10489 if(pagearray)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10490 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10491 for(z=0;z<256;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10492 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10493 if(!pagearray[z])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10494 {
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
10495 char text[101] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10496 int num = z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10497
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10498 if(front)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10499 num |= 1 << 16;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10500
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
10501 snprintf(text, 100, "_dw_page%d", z);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10502 /* Save the real id and the creation flags */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10503 g_object_set_data(G_OBJECT(handle), text, GINT_TO_POINTER(num));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10504 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10505 return z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10506 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10507 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10508 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10509 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10510
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10511 /* Hopefully this won't happen. */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10512 return 256;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10513 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10514
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10515 /* Return the physical page id from the logical page id */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
10516 int _dw_get_physical_page(HWND handle, unsigned long pageid)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10517 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10518 int z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10519 GtkWidget *thispage, **pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10520
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10521 if(pagearray)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10522 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10523 for(z=0;z<256;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10524 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10525 if((thispage = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), z)))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10526 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10527 if(thispage == pagearray[pageid])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10528 return z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10529 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10530 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10531 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10532 return 256;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10533 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10534
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10535 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10536 * Remove a page from a notebook.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10537 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10538 * handle: Handle to the notebook widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10539 * pageid: ID of the page to be destroyed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10540 */
2909
3fe7641f027c WARNING: Fix an API inconsistency in dw_notebook_page_destroy/set()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2904
diff changeset
10541 void dw_notebook_page_destroy(HWND handle, unsigned long pageid)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10542 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10543 int realpage, _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10544 GtkWidget **pagearray;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10545
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10546 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
10547 realpage = _dw_get_physical_page(handle, pageid);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10548 if(realpage > -1 && realpage < 256)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10549 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10550 gtk_notebook_remove_page(GTK_NOTEBOOK(handle), realpage);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10551 if((pagearray = g_object_get_data(G_OBJECT(handle), "_dw_pagearray")))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10552 pagearray[pageid] = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10553 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10554 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10555 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10556
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10557 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10558 * Queries the currently visible page ID.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10559 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10560 * handle: Handle to the notebook widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10561 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10562 unsigned long dw_notebook_page_get(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10563 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10564 int retval, phys;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10565 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10566
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10567 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10568 phys = gtk_notebook_get_current_page(GTK_NOTEBOOK(handle));
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
10569 retval = _dw_get_logical_page(handle, phys);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10570 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10571 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10572 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10573
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10574 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10575 * Sets the currently visibale page ID.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10576 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10577 * handle: Handle to the notebook widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10578 * pageid: ID of the page to be made visible.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10579 */
2909
3fe7641f027c WARNING: Fix an API inconsistency in dw_notebook_page_destroy/set()
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2904
diff changeset
10580 void dw_notebook_page_set(HWND handle, unsigned long pageid)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10581 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10582 int realpage, _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10583
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10584 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
10585 realpage = _dw_get_physical_page(handle, pageid);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10586 if(realpage > -1 && realpage < 256)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10587 gtk_notebook_set_current_page(GTK_NOTEBOOK(handle), pageid);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10588 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10589 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10590
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10591
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10592 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10593 * Sets the text on the specified notebook tab.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10594 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10595 * handle: Notebook handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10596 * pageid: Page ID of the tab to set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10597 * text: Pointer to the text to set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10598 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
10599 void dw_notebook_page_set_text(HWND handle, unsigned long pageid, const char *text)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10600 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10601 GtkWidget *child;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10602 int realpage, _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10603
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10604 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
10605 realpage = _dw_get_physical_page(handle, pageid);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10606 if(realpage < 0 || realpage > 255)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10607 {
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
10608 char ptext[101] = {0};
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10609 int num;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10610
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
10611 snprintf(ptext, 100, "_dw_page%d", (int)pageid);
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
10612 num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), ptext));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10613 realpage = 0xFF & num;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10614 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10615
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10616 if(realpage > -1 && realpage < 256)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10617 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10618 child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), realpage);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10619 if(child)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10620 gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(handle), child, text);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10621 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10622 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10623 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10624
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10625 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10626 * Sets the text on the specified notebook tab status area.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10627 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10628 * handle: Notebook handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10629 * pageid: Page ID of the tab to set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10630 * text: Pointer to the text to set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10631 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
10632 void dw_notebook_page_set_status_text(HWND handle, unsigned long pageid, const char *text)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10633 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10634 /* TODO (if possible) */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10635 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10636
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10637 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10638 * Packs the specified box into the notebook page.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10639 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10640 * handle: Handle to the notebook to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10641 * pageid: Page ID in the notebook which is being packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10642 * page: Box handle to be packed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10643 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10644 void dw_notebook_pack(HWND handle, unsigned long pageid, HWND page)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10645 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10646 GtkWidget *label, *child, *oldlabel, **pagearray;
790
1822c8a71936 Removed a now unused helper function and fixed a discared qualifier error.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 789
diff changeset
10647 const gchar *text = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10648 int num, z, realpage = -1, pad, _dw_locked_by_me = FALSE;
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
10649 char ptext[101] = {0};
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
10650
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
10651 DW_MUTEX_LOCK;
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
10652 snprintf(ptext, 100, "_dw_page%d", (int)pageid);
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
10653 num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), ptext));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10654 g_object_set_data(G_OBJECT(handle), ptext, NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10655 pagearray = (GtkWidget **)g_object_get_data(G_OBJECT(handle), "_dw_pagearray");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10656
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10657 if(!pagearray)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10658 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10659 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10660 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10661 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10662
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10663 /* The page already exists... so get it's current page */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10664 if(pagearray[pageid])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10665 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10666 for(z=0;z<256;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10667 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10668 child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(handle), z);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10669 if(child == pagearray[pageid])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10670 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10671 oldlabel = gtk_notebook_get_tab_label(GTK_NOTEBOOK(handle), child);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10672 if(oldlabel)
789
8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 788
diff changeset
10673 text = gtk_label_get_text(GTK_LABEL(oldlabel));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10674 gtk_notebook_remove_page(GTK_NOTEBOOK(handle), z);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10675 realpage = z;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10676 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10677 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10678 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10679 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10680
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10681 pagearray[pageid] = page;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10682
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10683 label = gtk_label_new(text ? text : "");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10684
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
10685 if(GTK_IS_GRID(page))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10686 {
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
10687 pad = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(page), "_dw_boxpad"));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10688 gtk_container_set_border_width(GTK_CONTAINER(page), pad);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10689 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10690
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10691 if(realpage != -1)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10692 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, realpage);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10693 else if(num & ~(0xFF))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10694 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, 0);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10695 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10696 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, 256);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10697 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10698 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10699
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10700 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10701 * Appends the specified text to the listbox's (or combobox) entry list.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10702 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10703 * handle: Handle to the listbox to be appended to.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10704 * text: Text to append into listbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10705 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
10706 void dw_listbox_append(HWND handle, const char *text)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10707 {
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10708 dw_listbox_insert(handle, text, -1);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10709 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10710
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10711 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10712 * Inserts the specified text int the listbox's (or combobox) entry list at the
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10713 * position indicated.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10714 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10715 * handle: Handle to the listbox to be appended to.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10716 * text: Text to insert into listbox.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10717 * pos: 0-based index into listbox. -1 will append
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10718 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
10719 void dw_listbox_insert(HWND handle, const char *text, int pos)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10720 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10721 GtkWidget *handle2 = handle;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10722 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10723 int _dw_locked_by_me = FALSE;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10724
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10725 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10726 /* Get the inner handle for scrolled controls */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10727 if(GTK_IS_SCROLLED_WINDOW(handle))
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10728 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10729 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10730 if(tmp)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10731 handle2 = tmp;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10732 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10733 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10734 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10735 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10736
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10737 /* Make sure it is the correct tree type */
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10738 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10739 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10740 else if(GTK_IS_COMBO_BOX(handle2))
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10741 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10742
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10743 if(!store)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10744 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10745 DW_MUTEX_UNLOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10746 return;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10747 }
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10748
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10749 if(pos < 0)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10750 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10751 /* Insert an entry at the end */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10752 gtk_list_store_append(store, &iter);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10753 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10754 else
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10755 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10756 /* Insert at position */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10757 gtk_list_store_insert(store, &iter, pos);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10758 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10759 gtk_list_store_set (store, &iter, 0, text, -1);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10760 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10761 DW_MUTEX_UNLOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10762 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10763
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10764 /*
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10765 * Appends the specified text items to the listbox's (or combobox) entry list.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10766 * Parameters:
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10767 * handle: Handle to the listbox to be appended to.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10768 * text: Text strings to append into listbox.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10769 * count: Number of text strings to append
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10770 */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10771 void dw_listbox_list_append(HWND handle, char **text, int count)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10772 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10773 GtkWidget *handle2 = handle;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10774 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10775 int _dw_locked_by_me = FALSE;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10776
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10777 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10778 /* Get the inner handle for scrolled controls */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10779 if(GTK_IS_SCROLLED_WINDOW(handle))
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10780 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10781 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10782 if(tmp)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10783 handle2 = tmp;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10784 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10785 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10786 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10787 int z;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10788 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10789
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10790 /* Make sure it is the correct tree type */
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10791 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10792 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10793 else if(GTK_IS_COMBO_BOX(handle2))
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10794 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10795
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10796 if(!store)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10797 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10798 DW_MUTEX_UNLOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10799 return;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10800 }
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10801
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10802 /* Insert entries at the end */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10803 for(z=0;z<count;z++)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10804 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10805 gtk_list_store_append(store, &iter);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10806 gtk_list_store_set (store, &iter, 0, text[z], -1);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10807 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10808 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10809 DW_MUTEX_UNLOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10810 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10811
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10812 /*
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10813 * Clears the listbox's (or combobox) list of all entries.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10814 * Parameters:
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10815 * handle: Handle to the listbox to be cleared.
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10816 */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10817 void dw_listbox_clear(HWND handle)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10818 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10819 GtkWidget *handle2 = handle;
777
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10820 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10821 int _dw_locked_by_me = FALSE;
777
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10822
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10823 DW_MUTEX_LOCK;
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10824 /* Get the inner handle for scrolled controls */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10825 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10826 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10827 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10828 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10829 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10830 }
777
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10831 if(handle2)
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10832 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10833 /* Make sure it is the correct tree type */
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10834 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10835 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
777
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10836 else if(GTK_IS_COMBO_BOX(handle2))
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10837 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10838
777
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10839 if(!store)
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10840 {
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10841 DW_MUTEX_UNLOCK;
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10842 return;
c0e7200dad31 More work on comboboxes, listboxes and containers. Comboboxes now display the list properly.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 775
diff changeset
10843 }
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10844 /* Clear the list */
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10845 gtk_list_store_clear(store);
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10846 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10847 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10848 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10849
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10850 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10851 * Returns the listbox's item count.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10852 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10853 * handle: Handle to the listbox to be counted
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10854 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10855 int dw_listbox_count(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10856 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10857 GtkWidget *handle2 = handle;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10858 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10859 int _dw_locked_by_me = FALSE;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10860 int retval = 0;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10861
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10862 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10863 /* Get the inner handle for scrolled controls */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10864 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10865 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10866 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10867 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10868 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10869 }
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10870 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10871 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10872 /* Make sure it is the correct tree type */
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10873 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10874 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10875 else if(GTK_IS_COMBO_BOX(handle2))
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10876 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10877
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10878 if(store)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10879 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10880 /* Get the number of children at the top level */
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10881 retval = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10882 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10883 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10884 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10885 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10886 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10887
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10888 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10889 * Sets the topmost item in the viewport.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10890 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10891 * handle: Handle to the listbox to be cleared.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10892 * top: Index to the top item.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10893 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10894 void dw_listbox_set_top(HWND handle, int top)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10895 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10896 GtkWidget *handle2 = handle;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10897 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10898
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10899 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10900 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10901 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10902 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10903 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10904 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10905 }
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10906 /* Make sure it is the correct tree type */
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10907 if(handle2 && GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10908 {
1330
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1327
diff changeset
10909 GtkAdjustment *adjust = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(handle));
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10910 GtkListStore *store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10911
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10912 if(store && adjust)
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10913 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10914 /* Get the number of children at the top level */
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10915 gint rowcount = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
1330
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1327
diff changeset
10916 gdouble pagesize = gtk_adjustment_get_page_size(adjust);
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1327
diff changeset
10917 gdouble upper = gtk_adjustment_get_upper(adjust) - pagesize;
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10918 gdouble lower = gtk_adjustment_get_lower(adjust);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10919 gdouble change;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10920
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10921 /* Safety check */
1330
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1327
diff changeset
10922 if(rowcount < 2)
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10923 {
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10924 DW_MUTEX_UNLOCK;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10925 return;
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10926 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
10927
1330
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1327
diff changeset
10928 /* Verify the range */
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1327
diff changeset
10929 rowcount--;
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1327
diff changeset
10930 if(top > rowcount)
c63069148357 Mostly fixed dw_listbox_set_top() on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1327
diff changeset
10931 top = rowcount;
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10932
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10933 change = ((gdouble)top/(gdouble)rowcount) * (upper - lower);
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10934
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10935 gtk_adjustment_set_value(adjust, change + lower);
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10936 }
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
10937 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10938 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10939 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10940
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10941 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10942 * Copies the given index item's text into buffer.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10943 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10944 * handle: Handle to the listbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10945 * index: Index into the list to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10946 * buffer: Buffer where text will be copied.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10947 * length: Length of the buffer (including NULL).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10948 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10949 void dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10950 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10951 GtkWidget *handle2 = handle;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10952 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
10953 int _dw_locked_by_me = FALSE;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10954
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10955 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10956 /* Get the inner handle for scrolled controls */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10957 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10958 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10959 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10960 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10961 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10962 }
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10963 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10964 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10965 /* Make sure it is the correct tree type */
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10966 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10967 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10968 else if(GTK_IS_COMBO_BOX(handle2))
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10969 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10970
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10971 if(store && index < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10972 {
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
10973 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
10974
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10975 /* Get the nth child at the top level */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10976 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10977 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10978 /* Get the text */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10979 gchar *text;
1884
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
10980 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, _DW_DATA_TYPE_STRING, &text, -1);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
10981 if(text)
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
10982 {
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
10983 strncpy(buffer, text, length);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
10984 g_free(text);
71780cf68aa2 More container and tree changes on all platforms regarding memory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1881
diff changeset
10985 }
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10986 DW_MUTEX_UNLOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10987 return;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10988 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10989 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10990 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
10991 buffer[0] = '\0';
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10992 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10993 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10994
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10995 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10996 * Sets the text of a given listbox entry.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10997 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10998 * handle: Handle to the listbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
10999 * index: Index into the list to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11000 * buffer: Buffer where text will be copied.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11001 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
11002 void dw_listbox_set_text(HWND handle, unsigned int index, const char *buffer)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11003 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11004 GtkWidget *handle2 = handle;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11005 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11006 int _dw_locked_by_me = FALSE;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11007
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11008 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11009 /* Get the inner handle for scrolled controls */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11010 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11011 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11012 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11013 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11014 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11015 }
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11016 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11017 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11018 /* Make sure it is the correct tree type */
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11019 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11020 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11021 else if(GTK_IS_COMBO_BOX(handle2))
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11022 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11023
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11024 if(store && index < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11025 {
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11026 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11027
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11028 /* Get the nth child at the top level */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11029 if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11030 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11031 /* 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: 2663
diff changeset
11032 gtk_list_store_set(store, &iter, 0, buffer, -1);
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11033 }
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11034 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11035 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11036 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11037 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11038
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11039 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11040 * Returns the index to the current selected item or -1 when done.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11041 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11042 * handle: Handle to the listbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11043 * where: Either the previous return or -1 to restart.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11044 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11045 int dw_listbox_selected_multi(HWND handle, int where)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11046 {
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11047 GtkWidget *handle2;
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11048 GtkListStore *store = NULL;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11049 int retval = DW_LIT_NONE;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11050 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11051
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11052 DW_MUTEX_LOCK;
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11053 handle2 = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11054
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11055 /* Make sure it is the correct tree type */
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11056 if(handle2 && GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11057 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11058
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11059 if(store)
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11060 {
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11061 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(handle2));
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11062 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11063
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11064 if(list)
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11065 {
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11066 int counter = 0;
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11067 GtkTreePath *path = g_list_nth_data(list, 0);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11068
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11069 while(path)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11070 {
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11071 gint *indices = gtk_tree_path_get_indices(path);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11072
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11073 if(indices && indices[0] > where)
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11074 {
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11075 retval = indices[0];
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11076 break;
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11077 }
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11078
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11079 counter++;
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11080 path = g_list_nth_data(list, counter);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11081 }
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11082
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11083 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11084 g_list_free(list);
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11085 }
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
11086 }
1124
aff4aeca858f Experimental change to use GtkGrid instead of GtkTable for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1122
diff changeset
11087 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11088 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11089 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11090
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11091 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11092 * Returns the index to the item in the list currently selected.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11093 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11094 * handle: Handle to the listbox to be queried.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11095 */
986
87dc0f5f96d0 Fix return type of dw_listbox_selected() to be "int" instead of "unsigned int" to allow -1 return.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 976
diff changeset
11096 int dw_listbox_selected(HWND handle)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11097 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11098 GtkWidget *handle2 = handle;
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11099 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11100 int _dw_locked_by_me = FALSE;
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11101 unsigned int retval = 0;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11102
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11103 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11104 /* Get the inner handle for scrolled controls */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11105 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11106 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11107 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11108 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11109 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11110 }
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11111 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11112 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11113 /* Make sure it is the correct tree type */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11114 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11115 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11116 else if(GTK_IS_COMBO_BOX(handle2))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11117 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11118
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11119 if(store)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11120 {
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11121 if(GTK_IS_TREE_VIEW(handle2))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11122 {
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11123 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(handle2));
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11124 GList *list = gtk_tree_selection_get_selected_rows(sel, NULL);
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11125 if(list)
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11126 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11127 GtkTreePath *path = g_list_nth_data(list, 0);
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11128 gint *indices = gtk_tree_path_get_indices(path);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11129
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11130 if(indices)
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11131 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11132 retval = indices[0];
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11133 }
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11134
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11135 g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL);
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11136 g_list_free(list);
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11137 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11138 }
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11139 else
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11140 {
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11141 GtkTreeIter iter;
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11142 GtkTreePath *path;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11143
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11144 if(gtk_combo_box_get_active_iter(GTK_COMBO_BOX(handle2), &iter))
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11145 {
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11146 path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11147 if(path)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11148 {
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11149 gint *indices = gtk_tree_path_get_indices(path);
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11150
883
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11151 if(indices)
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11152 {
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11153 retval = indices[0];
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11154 }
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11155 gtk_tree_path_free(path);
63a8e77191c7 Experimental changes to the containers so filsystem icon and name are same column for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 877
diff changeset
11156 }
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11157 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11158 }
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11159 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11160 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11161 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11162 return retval;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11163 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11164
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11165 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11166 * Sets the selection state of a given index.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11167 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11168 * handle: Handle to the listbox to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11169 * index: Item index.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11170 * state: TRUE if selected FALSE if unselected.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11171 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11172 void dw_listbox_select(HWND handle, int index, int state)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11173 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11174 GtkWidget *handle2 = handle;
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11175 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11176 int _dw_locked_by_me = FALSE;
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11177
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11178 DW_MUTEX_LOCK;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11179 /* Get the inner handle for scrolled controls */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11180 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11181 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11182 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11183 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11184 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11185 }
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11186 if(handle2)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11187 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11188 /* Make sure it is the correct tree type */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11189 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11190 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11191 else if(GTK_IS_COMBO_BOX(handle2))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11192 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11193
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11194 if(store && index < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11195 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11196 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11197
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11198 /* Get the nth child at the top level */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11199 if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11200 {
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11201 if(GTK_IS_COMBO_BOX(handle2))
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11202 {
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11203 gtk_combo_box_set_active_iter(GTK_COMBO_BOX(handle2), &iter);
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11204 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11205 else
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11206 {
787
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11207 GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(handle2));
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11208 if(state)
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11209 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11210 /* Select the item */
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11211 gtk_tree_selection_select_iter(sel, &iter);
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11212 }
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11213 else
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11214 {
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11215 /* Deselect the item */
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11216 gtk_tree_selection_unselect_iter(sel, &iter);
098458f3bdfb Fixes some missing checks for combobox causing GTK warnings running HandyFTP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 786
diff changeset
11217 }
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11218 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11219 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11220 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11221 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11222 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11223 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11224
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11225 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11226 * Deletes the item with given index from the list.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11227 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11228 * handle: Handle to the listbox to be set.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11229 * index: Item index.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11230 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11231 void dw_listbox_delete(HWND handle, int index)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11232 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11233 GtkWidget *handle2 = handle;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11234 GtkListStore *store = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11235 int _dw_locked_by_me = FALSE;
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11236
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11237 DW_MUTEX_LOCK;
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11238 /* Get the inner handle for scrolled controls */
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11239 if(GTK_IS_SCROLLED_WINDOW(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11240 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11241 GtkWidget *tmp = (GtkWidget *)g_object_get_data(G_OBJECT(handle), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11242 if(tmp)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11243 handle2 = tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11244 }
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11245 if(handle2)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11246 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11247 /* Make sure it is the correct tree type */
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11248 if(GTK_IS_TREE_VIEW(handle2) && g_object_get_data(G_OBJECT(handle2), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX))
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11249 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(handle2));
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11250 else if(GTK_IS_COMBO_BOX(handle2))
780
fda93b441c4d Lots of listbox/combobox/container fixes. Things are starting to come together.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 779
diff changeset
11251 store = (GtkListStore *)gtk_combo_box_get_model(GTK_COMBO_BOX(handle2));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11252
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11253 if(store)
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11254 {
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11255 GtkTreeIter iter;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
11256
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11257 /* Get the nth child at the top level */
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11258 if (gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, index))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11259 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11260 gtk_list_store_remove(store, &iter);
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
11261 }
778
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11262 }
99ce0ea1f271 Implemented many of the dw_listbox_* functions using the new tree view for comboboxes and listboxes.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 777
diff changeset
11263 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11264 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11265 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11266
1353
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11267 /* Function to do delayed positioning */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
11268 gboolean _dw_splitbar_set_percent(gpointer data)
1353
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11269 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11270 GtkWidget *widget = data;
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11271 float *percent = (float *)g_object_get_data(G_OBJECT(widget), "_dw_percent");
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11272
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11273 if(percent)
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11274 {
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11275 GtkAllocation alloc;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
11276
1353
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11277 gtk_widget_get_allocation(widget, &alloc);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
11278
1583
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
11279 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(widget)) == GTK_ORIENTATION_HORIZONTAL)
1353
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11280 gtk_paned_set_position(GTK_PANED(widget), (int)(alloc.width * (*percent / 100.0)));
1583
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
11281 else
1353
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11282 gtk_paned_set_position(GTK_PANED(widget), (int)(alloc.height * (*percent / 100.0)));
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11283 g_object_set_data(G_OBJECT(widget), "_dw_percent", NULL);
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11284 free(percent);
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11285 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11286 return FALSE;
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11287 }
f4ad4ba39b61 Apparently it is unsafe to set properties in the GTK3 size allocate callback.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1352
diff changeset
11288
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11289 /* Reposition the bar according to the percentage */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
11290 static gint _dw_splitbar_size_allocate(GtkWidget *widget, GtkAllocation *event, gpointer data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11291 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11292 float *percent = (float *)g_object_get_data(G_OBJECT(widget), "_dw_percent");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11293
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11294 /* Prevent infinite recursion ;) */
1005
751522e9f3ac Switchted to using dw_paned_pack*() to pack the splitbar on GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1001
diff changeset
11295 if(!percent || event->width < 20 || event->height < 20)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11296 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11297
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
11298 g_idle_add(_dw_splitbar_set_percent, widget);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11299 return FALSE;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11300 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11301
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11302 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11303 * Creates a splitbar window (widget) with given parameters.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11304 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11305 * type: Value can be DW_VERT or DW_HORZ.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11306 * topleft: Handle to the window to be top or left.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11307 * bottomright: Handle to the window to be bottom or right.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11308 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11309 * A handle to a splitbar window or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11310 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11311 HWND dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11312 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11313 GtkWidget *tmp = NULL;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11314 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11315 float *percent = malloc(sizeof(float));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11316
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11317 DW_MUTEX_LOCK;
1575
58ed65820baf Eliminate even more deprecated APIs for GTK3... still more to go.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1566
diff changeset
11318 tmp = gtk_paned_new(type == DW_HORZ ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
1125
95d7eb4e85c6 The shrink flag on GtkPanded (splitbar) in GTK 3 causes tons
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1124
diff changeset
11319 gtk_paned_pack1(GTK_PANED(tmp), topleft, TRUE, FALSE);
95d7eb4e85c6 The shrink flag on GtkPanded (splitbar) in GTK 3 causes tons
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1124
diff changeset
11320 gtk_paned_pack2(GTK_PANED(tmp), bottomright, TRUE, FALSE);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11321 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11322 *percent = 50.0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11323 g_object_set_data(G_OBJECT(tmp), "_dw_percent", (gpointer)percent);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
11324 g_signal_connect(G_OBJECT(tmp), "size-allocate", G_CALLBACK(_dw_splitbar_size_allocate), NULL);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11325 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11326 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11327 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11328 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11329
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11330 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11331 * Sets the position of a splitbar (pecentage).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11332 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11333 * handle: The handle to the splitbar returned by dw_splitbar_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11334 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11335 void dw_splitbar_set(HWND handle, float percent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11336 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11337 float *mypercent = (float *)dw_window_get_data(handle, "_dw_percent");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11338 int size = 0, position;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11339
1583
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
11340 if(gtk_orientable_get_orientation(GTK_ORIENTABLE(handle)) == GTK_ORIENTATION_HORIZONTAL)
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
11341 size = gtk_widget_get_allocated_width(handle);
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
11342 else
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11343 size = gtk_widget_get_allocated_height(handle);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11344
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11345 if(mypercent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11346 *mypercent = percent;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11347
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11348 if(size > 10)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11349 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11350 position = (int)((float)size * (percent / 100.0));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11351
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11352 gtk_paned_set_position(GTK_PANED(handle), position);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11353 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11354 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11355
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11356 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11357 * Gets the position of a splitbar (pecentage).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11358 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11359 * handle: The handle to the splitbar returned by dw_splitbar_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11360 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11361 float dw_splitbar_get(HWND handle)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11362 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11363 float *percent = (float *)dw_window_get_data(handle, "_dw_percent");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11364
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11365 if(percent)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11366 return *percent;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11367 return 0.0;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11368 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11369
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11370 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11371 * Creates a calendar window (widget) with given parameters.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11372 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11373 * id: Unique identifier for calendar widget
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11374 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11375 * A handle to a calendar window or NULL on failure.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11376 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11377 HWND dw_calendar_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11378 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11379 GtkWidget *tmp;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11380 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11381 GtkCalendarDisplayOptions flags;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11382 time_t now;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11383 struct tm *tmdata;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11384
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11385 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11386 tmp = gtk_calendar_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11387 gtk_widget_show(tmp);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11388 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11389 /* select today */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11390 flags = GTK_CALENDAR_SHOW_HEADING|GTK_CALENDAR_SHOW_DAY_NAMES;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11391 gtk_calendar_set_display_options( GTK_CALENDAR(tmp), flags );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11392 now = time( NULL );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11393 tmdata = localtime( & now );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11394 gtk_calendar_select_month( GTK_CALENDAR(tmp), tmdata->tm_mon, 1900+tmdata->tm_year );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11395 gtk_calendar_select_day( GTK_CALENDAR(tmp), tmdata->tm_mday );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11396
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11397 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11398 return tmp;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11399 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11400
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11401 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11402 * Sets the current date of a calendar
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11403 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11404 * handle: The handle to the calendar returned by dw_calendar_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11405 * year...
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11406 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11407 void dw_calendar_set_date(HWND handle, unsigned int year, unsigned int month, unsigned int day)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11408 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11409 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11410
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11411 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11412 if(GTK_IS_CALENDAR(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11413 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11414 gtk_calendar_select_month(GTK_CALENDAR(handle),month-1,year);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11415 gtk_calendar_select_day(GTK_CALENDAR(handle), day);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11416 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11417 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11418 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11419 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11420
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11421 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11422 * Gets the position of a splitbar (pecentage).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11423 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11424 * handle: The handle to the splitbar returned by dw_splitbar_new().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11425 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11426 void dw_calendar_get_date(HWND handle, unsigned int *year, unsigned int *month, unsigned int *day)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11427 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11428 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11429
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11430 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11431 if(GTK_IS_CALENDAR(handle))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11432 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11433 gtk_calendar_get_date(GTK_CALENDAR(handle),year,month,day);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11434 *month = *month + 1;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11435 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11436 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11437 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11438 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11439
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11440 /*
1795
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11441 * Sets the current focus item for a window/dialog.
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11442 * Parameters:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11443 * handle: Handle to the dialog item to be focused.
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11444 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11445 * This is for use after showing the window/dialog.
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11446 */
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11447 void API dw_window_set_focus(HWND handle)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11448 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11449 int _dw_locked_by_me = FALSE;
1795
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11450
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11451 if(!handle)
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11452 return;
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11453
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11454 DW_MUTEX_LOCK;
1796
7f549994b633 Fixed tabs put in by TextMate 2... had to figure out how turn
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1795
diff changeset
11455 gtk_widget_grab_focus(handle);
1795
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11456 DW_MUTEX_UNLOCK;
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11457 }
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11458
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11459 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11460 * Sets the default focus item for a window/dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11461 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11462 * window: Toplevel window or dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11463 * defaultitem: Handle to the dialog item to be default.
1795
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11464 * Remarks:
9304241b7b33 Added new dw_window_set_focus() function and attempted to fix...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1793
diff changeset
11465 * This is for use before showing the window/dialog.
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11466 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11467 void dw_window_default(HWND window, HWND defaultitem)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11468 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11469 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11470
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11471 if(!window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11472 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11473
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11474 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11475 g_object_set_data(G_OBJECT(window), "_dw_defaultitem", (gpointer)defaultitem);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11476 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11477 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11478
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11479 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11480 * Sets window to click the default dialog item when an ENTER is pressed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11481 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11482 * window: Window (widget) to look for the ENTER press.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11483 * next: Window (widget) to move to next (or click)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11484 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11485 void dw_window_click_default(HWND window, HWND next)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11486 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11487 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11488
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11489 if(!window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11490 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11491
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11492 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
11493 g_signal_connect(G_OBJECT(window), "key_press_event", G_CALLBACK(_dw_default_key_press_event), next);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11494 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11495 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11496
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11497
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11498 /*
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11499 * Creates a new system notification if possible.
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11500 * Parameters:
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11501 * title: The short title of the notification.
2114
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11502 * imagepath: Path to an image to display or NULL if none.
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11503 * description: A longer description of the notification,
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11504 * or NULL if none is necessary.
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11505 * Returns:
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11506 * A handle to the notification which can be used to attach a "clicked" event if desired,
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11507 * or NULL if it fails or notifications are not supported by the system.
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11508 * Remarks:
2081
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11509 * This will create a system notification that will show in the notifaction panel
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11510 * on supported systems, which may be clicked to perform another task.
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11511 */
2114
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11512 HWND dw_notification_new(const char *title, const char *imagepath, const char *description, ...)
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11513 {
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11514 #if GLIB_CHECK_VERSION(2,40,0)
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11515 GNotification *notification = g_notification_new(title);
2081
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11516
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11517 if(notification)
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11518 {
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11519 if(description)
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11520 {
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11521 va_list args;
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11522 char outbuf[1025] = {0};
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11523
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11524 va_start(args, description);
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11525 vsnprintf(outbuf, 1024, description, args);
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11526 va_end(args);
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11527
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11528 g_notification_set_body(notification, outbuf);
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11529 }
2209
0b6e1b5c8b5e GTK: Fix building with glib versions 2.40 to 2.51.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2208
diff changeset
11530 #if GLIB_CHECK_VERSION(2,52,0)
2118
c3f088266bcd GTK: Remove access() test for the image file in dw_notiication_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2117
diff changeset
11531 if(imagepath)
2114
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11532 {
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11533 GFile *file = g_file_new_for_path(imagepath);
2117
37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2115
diff changeset
11534 GBytes *bytes = g_file_load_bytes(file, NULL, NULL, NULL);
2114
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11535
2117
37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2115
diff changeset
11536 if(bytes)
37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2115
diff changeset
11537 {
37060de79102 GTK: Versions of Glib prior to May 2019 don't support GFileIcon for
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2115
diff changeset
11538 GIcon *icon = g_bytes_icon_new(bytes);
2114
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11539
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11540 if(icon)
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11541 g_notification_set_icon(notification, G_ICON(icon));
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11542 }
251d050d306b Change dw_notification_new() to take an image path instead of an in-memory HPIXMAP.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2113
diff changeset
11543 }
2209
0b6e1b5c8b5e GTK: Fix building with glib versions 2.40 to 2.51.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2208
diff changeset
11544 #endif
2133
2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2132
diff changeset
11545 g_notification_set_default_action_and_target(notification, "app.notification", "t",
2090d7f46de5 GTK: Fix warnings on OpenSolaris using the new macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2132
diff changeset
11546 (guint64)DW_POINTER_TO_ULONGLONG(notification));
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11547 }
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11548 return (HWND)notification;
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11549 #else
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11550 return NULL;
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11551 #endif
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11552 }
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11553
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11554 /*
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11555 * Sends a notification created by dw_notification_new() after attaching signal handler.
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11556 * Parameters:
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11557 * notification: The handle to the notification returned by dw_notification_new().
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11558 * Returns:
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11559 * DW_ERROR_NONE on success, DW_ERROR_UNKNOWN on error or not supported.
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11560 */
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11561 int dw_notification_send(HWND notification)
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11562 {
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11563 #if GLIB_CHECK_VERSION(2,40,0)
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11564 if(notification)
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11565 {
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11566 char id[101] = {0};
2081
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11567
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11568 /* Generate a unique ID based on the notification handle,
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11569 * so we can use it to remove the notification in dw_window_destroy().
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11570 */
2132
42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2127
diff changeset
11571 snprintf(id, 100, "dw-notification-%llu", DW_POINTER_TO_ULONGLONG(notification));
2066
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11572 g_application_send_notification(_DWApp, id, (GNotification *)notification);
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11573 return DW_ERROR_NONE;
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11574 }
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11575 #endif
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11576 return DW_ERROR_UNKNOWN;
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11577 }
2c2530f8cbef Initial design for system notification support on GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2063
diff changeset
11578
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11579 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11580 * Returns some information about the current operating environment.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11581 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11582 * env: Pointer to a DWEnv struct.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11583 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11584 void dw_environment_query(DWEnv *env)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11585 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11586 struct utsname name;
2210
7677e1083d07 Increase _DW_ENV_STRING_SIZE to 257 bytes, this is the maximum size the
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2209
diff changeset
11587 char tempbuf[_DW_ENV_STRING_SIZE] = { 0 }, *dot;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11588
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11589 uname(&name);
2063
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11590 memset(env, '\0', sizeof(DWEnv));
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11591 strncpy(env->osName, name.sysname, sizeof(env->osName)-1);
2210
7677e1083d07 Increase _DW_ENV_STRING_SIZE to 257 bytes, this is the maximum size the
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2209
diff changeset
11592 strncpy(tempbuf, name.release, sizeof(tempbuf)-1);
2063
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11593
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11594 strncpy(env->buildDate, __DATE__, sizeof(env->buildDate)-1);
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11595 strncpy(env->buildTime, __TIME__, sizeof(env->buildTime)-1);
2081
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11596 #ifdef USE_WEBKIT
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11597 # ifdef USE_WEBKIT2
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11598 strncpy(env->htmlEngine, "WEBKIT2", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11599 # else
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11600 strncpy(env->htmlEngine, "WEBKIT", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11601 # endif
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11602 #else
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11603 strncpy(env->htmlEngine, "N/A", sizeof(env->htmlEngine)-1);
24875681eec5 Added htmlEngine to DWEnv
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2071
diff changeset
11604 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11605 env->DWMajorVersion = DW_MAJOR_VERSION;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11606 env->DWMinorVersion = DW_MINOR_VERSION;
1160
924c8087a755 Attempt to use the subversion revision number as the sub version number.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1158
diff changeset
11607 #ifdef VER_REV
1161
e4b13cd7a002 Update configure script and fix a miscommit of the GTK3 code.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1160
diff changeset
11608 env->DWSubVersion = VER_REV;
1160
924c8087a755 Attempt to use the subversion revision number as the sub version number.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1158
diff changeset
11609 #else
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11610 env->DWSubVersion = DW_SUB_VERSION;
1160
924c8087a755 Attempt to use the subversion revision number as the sub version number.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1158
diff changeset
11611 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11612
2063
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11613 if((dot = strchr(tempbuf, '.')) != NULL)
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11614 {
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11615 *dot = '\0';
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11616 env->MajorVersion = atoi(tempbuf);
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11617 env->MinorVersion = atoi(&dot[1]);
f7c462f27829 GTK: Update ancient unsafe code in dw_environment_query() on Unix.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2057
diff changeset
11618 return;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11619 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11620 env->MajorVersion = atoi(tempbuf);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11621 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11622
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11623 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11624 * Opens a file dialog and queries user selection.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11625 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11626 * title: Title bar text for dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11627 * defpath: The default path of the open dialog.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11628 * ext: Default file extention.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11629 * flags: DW_FILE_OPEN or DW_FILE_SAVE or DW_DIRECTORY_OPEN
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11630 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11631 * NULL on error. A malloced buffer containing
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11632 * the file path on success.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11633 *
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11634 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
11635 char *dw_file_browse(const char *title, const char *defpath, const char *ext, int flags)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11636 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11637 GtkWidget *filew;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11638
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11639 GtkFileChooserAction action;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11640 GtkFileFilter *filter1 = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11641 GtkFileFilter *filter2 = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11642 gchar *button;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11643 char *filename = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11644 char buf[1000];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11645 char mypath[PATH_MAX+1];
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11646
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11647 switch (flags )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11648 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11649 case DW_DIRECTORY_OPEN:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11650 action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
11651 button = _("_Open");
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11652 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11653 case DW_FILE_OPEN:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11654 action = GTK_FILE_CHOOSER_ACTION_OPEN;
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
11655 button = _("_Open");
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11656 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11657 case DW_FILE_SAVE:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11658 action = GTK_FILE_CHOOSER_ACTION_SAVE;
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
11659 button = _("_Save");
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11660 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11661 default:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11662 dw_messagebox( "Coding error", DW_MB_OK|DW_MB_ERROR, "dw_file_browse() flags argument invalid.");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11663 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11664 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11665 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11666
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11667 filew = gtk_file_chooser_dialog_new ( title,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11668 NULL,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11669 action,
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
11670 _("_Cancel"), GTK_RESPONSE_CANCEL,
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11671 button, GTK_RESPONSE_ACCEPT,
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11672 NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11673
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11674 if ( flags == DW_FILE_SAVE )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11675 gtk_file_chooser_set_do_overwrite_confirmation( GTK_FILE_CHOOSER( filew ), TRUE );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11676
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11677 if ( ext )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11678 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11679 filter1 = gtk_file_filter_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11680 sprintf( buf, "*.%s", ext );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11681 gtk_file_filter_add_pattern( filter1, (gchar *)buf );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11682 sprintf( buf, "\"%s\" files", ext );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11683 gtk_file_filter_set_name( filter1, (gchar *)buf );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11684 filter2 = gtk_file_filter_new();
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11685 gtk_file_filter_add_pattern( filter2, (gchar *)"*" );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11686 gtk_file_filter_set_name( filter2, (gchar *)"All Files" );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11687 gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( filew ), filter1 );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11688 gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( filew ), filter2 );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11689 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11690
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11691 if ( defpath )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11692 {
1295
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11693 struct stat buf;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
11694
877
d3693ceec9b1 Implemented dw_listbox_set_top() for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 876
diff changeset
11695 if ( g_path_is_absolute( defpath ) || !realpath(defpath, mypath))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11696 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11697 strcpy( mypath, defpath );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11698 }
1295
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11699
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
11700 /* See if the path exists */
1295
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11701 if(stat(mypath, &buf) == 0)
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11702 {
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11703 /* If the path is a directory... set the current folder */
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11704 if(buf.st_mode & S_IFDIR)
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11705 gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER( filew ), mypath );
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11706 else if(flags == DW_FILE_SAVE) /* Otherwise set the filename */
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11707 gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( filew ), mypath );
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11708 else if(flags == DW_FILE_OPEN)
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11709 gtk_file_chooser_select_filename( GTK_FILE_CHOOSER( filew), mypath );
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11710 }
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11711 else if(flags == DW_FILE_SAVE)
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11712 {
1300
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11713 if(strchr(mypath, '/'))
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11714 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11715 unsigned long x = strlen(mypath) - 1;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
11716
1300
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11717 /* Trim off the filename */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11718 while(x > 0 && mypath[x] != '/')
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11719 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11720 x--;
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11721 }
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11722 if(mypath[x] == '/')
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11723 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11724 char *file = NULL;
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11725 char temp[PATH_MAX+1];
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
11726
1300
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11727 /* Save the original path in temp */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11728 strcpy(temp, mypath);
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11729 mypath[x] = 0;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
11730
1300
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11731 /* Check to make sure the trimmed piece is a directory */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11732 if(realpath(mypath, temp) && stat(temp, &buf) == 0)
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11733 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11734 if(buf.st_mode & S_IFDIR)
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11735 {
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11736 /* We now have it split */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11737 file = &mypath[x+1];
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11738 }
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11739 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
11740
1300
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11741 /* Select folder... */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11742 gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(filew), temp );
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11743 /* ... and file separately */
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11744 if(file)
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11745 gtk_file_chooser_set_current_name( GTK_FILE_CHOOSER(filew), file );
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11746 }
9c8de9cccc07 Fix for file and folder not being selected on GTK if file does not exist.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1295
diff changeset
11747 }
1295
d0c9d4d0ff3b Implement default filename support for GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1291
diff changeset
11748 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11749 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11750
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11751 if ( gtk_dialog_run( GTK_DIALOG( filew ) ) == GTK_RESPONSE_ACCEPT )
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11752 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11753 filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( filew ) );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11754 /*g_free (filename);*/
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11755 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11756
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11757 gtk_widget_destroy( filew );
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11758 return filename;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11759 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11760
2348
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11761 #if GLIB_CHECK_VERSION(2,36,0)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11762 static void _dw_exec_launched(GAppLaunchContext *context, GAppInfo *info, GVariant *platform_data, gpointer data)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11763 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11764 g_variant_lookup(platform_data, "pid", "i", data);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11765 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11766 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11767
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11768 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11769 * Execute and external program in a seperate session.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11770 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11771 * program: Program name with optional path.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11772 * type: Either DW_EXEC_CON or DW_EXEC_GUI.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11773 * params: An array of pointers to string arguements.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11774 * Returns:
2348
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11775 * DW_ERROR_UNKNOWN on error.
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11776 */
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11777 int API dw_exec(const char *program, int type, char **params)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11778 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11779 GAppInfo *appinfo = NULL;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11780 char *commandline;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11781 int retval = DW_ERROR_UNKNOWN;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11782
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11783 /* Generate a command line from the parameters */
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11784 if(params && *params)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11785 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11786 int z = 0, len = 0;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11787
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11788 while(params[z])
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11789 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11790 len+=strlen(params[z]) + 1;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11791 z++;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11792 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11793 z=1;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11794 commandline = calloc(1, len);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11795 strcpy(commandline, params[0]);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11796 while(params[z])
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11797 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11798 strcat(commandline, " ");
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11799 strcat(commandline, params[z]);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11800 z++;
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11801 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11802 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11803 else
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11804 commandline = strdup(program);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11805
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11806 /* Attempt to use app preferences to launch the application, using the selected Terminal if necessary */
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11807 if((appinfo = g_app_info_create_from_commandline(commandline, NULL,
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11808 type == DW_EXEC_CON ? G_APP_INFO_CREATE_NEEDS_TERMINAL : G_APP_INFO_CREATE_NONE, NULL)))
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11809 {
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11810 GAppLaunchContext *context = g_app_launch_context_new();
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11811
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11812 #if GLIB_CHECK_VERSION(2,36,0)
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11813 g_signal_connect(G_OBJECT(context), "launched", G_CALLBACK(_dw_exec_launched), (gpointer)&retval);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11814 #endif
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11815
2349
123e22827a82 GTK2/3: If the PID did not get returned set return to DW_ERROR_NONE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2348
diff changeset
11816 if(g_app_info_launch(appinfo, NULL, context, NULL) && retval == DW_ERROR_UNKNOWN)
123e22827a82 GTK2/3: If the PID did not get returned set return to DW_ERROR_NONE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2348
diff changeset
11817 retval = DW_ERROR_NONE;
2348
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11818
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11819 g_object_unref(appinfo);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11820 g_object_unref(context);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11821 }
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11822 free(commandline);
e3d2058ea96a GTK3: Port new dw_exec() from GTK4 with additional GLib version checks.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2344
diff changeset
11823 return retval;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11824 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11825
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11826 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11827 * Loads a web browser pointed at the given URL.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11828 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11829 * url: Uniform resource locator.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11830 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
11831 int dw_browse(const char *url)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11832 {
1118
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11833 /* If possible load the URL/URI using gvfs... */
2158
df3ee6273557 GTK3: Fix deprecation warning by switching to gtk_show_uri_on_window() in 3.22.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2133
diff changeset
11834 #if GTK_CHECK_VERSION(3,22,0)
df3ee6273557 GTK3: Fix deprecation warning by switching to gtk_show_uri_on_window() in 3.22.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2133
diff changeset
11835 if(gtk_show_uri_on_window(NULL, url, GDK_CURRENT_TIME, NULL))
df3ee6273557 GTK3: Fix deprecation warning by switching to gtk_show_uri_on_window() in 3.22.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2133
diff changeset
11836 #else
1118
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11837 if(gtk_show_uri(gdk_screen_get_default(), url, GDK_CURRENT_TIME, NULL))
2158
df3ee6273557 GTK3: Fix deprecation warning by switching to gtk_show_uri_on_window() in 3.22.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2133
diff changeset
11838 #endif
1118
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11839 {
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11840 return DW_ERROR_NONE;
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11841 }
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11842 else
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11843 {
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11844 /* Otherwise just fall back to executing firefox...
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11845 * or the browser defined by the DW_BROWSER variable.
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11846 */
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11847 char *execargs[3], *browser = "firefox", *tmp;
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11848
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11849 tmp = getenv( "DW_BROWSER" );
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11850 if(tmp) browser = tmp;
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11851 execargs[0] = browser;
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
11852 execargs[1] = (char *)url;
1118
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11853 execargs[2] = NULL;
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11854
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11855 return dw_exec(browser, DW_EXEC_GUI, execargs);
63dd52ba9a8f Added support for attempting to launch a browser using a
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1116
diff changeset
11856 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11857 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11858
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11859 #ifdef USE_WEBKIT
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11860 /* Helper function to get the web view handle */
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11861 WebKitWebView *_dw_html_web_view(GtkWidget *widget)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11862 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11863 if(widget)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11864 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11865 WebKitWebView *web_view = (WebKitWebView *)widget;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11866 if(WEBKIT_IS_WEB_VIEW(web_view))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11867 return web_view;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
11868 #ifndef USE_WEBKIT2
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11869 web_view = (WebKitWebView *)g_object_get_data(G_OBJECT(widget), "_dw_web_view");
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11870 if(WEBKIT_IS_WEB_VIEW(web_view))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11871 return web_view;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
11872 #endif
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11873 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11874 return NULL;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11875 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11876 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11877 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11878 * Causes the embedded HTML widget to take action.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11879 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11880 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11881 * action: One of the DW_HTML_* constants.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11882 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11883 void dw_html_action(HWND handle, int action)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11884 {
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
11885 #ifdef USE_WEBKIT
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11886 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11887 WebKitWebView *web_view;
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11888
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11889 DW_MUTEX_LOCK;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
11890
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11891 if((web_view = _dw_html_web_view(handle)))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11892 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11893 switch(action)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11894 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11895 case DW_HTML_GOBACK:
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11896 webkit_web_view_go_back(web_view);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11897 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11898 case DW_HTML_GOFORWARD:
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11899 webkit_web_view_go_forward(web_view);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11900 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11901 case DW_HTML_GOHOME:
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11902 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11903 webkit_web_view_load_uri(web_view, DW_HOME_URL);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11904 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11905 webkit_web_view_open(web_view, DW_HOME_URL);
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
11906 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11907 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11908 case DW_HTML_RELOAD:
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11909 webkit_web_view_reload(web_view);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11910 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11911 case DW_HTML_STOP:
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11912 webkit_web_view_stop_loading(web_view);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11913 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11914 case DW_HTML_PRINT:
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11915 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11916 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11917 WebKitPrintOperation *operation = webkit_print_operation_new(web_view);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11918 webkit_print_operation_run_dialog(operation, NULL);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
11919 g_object_unref(operation);
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
11920 #else
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11921 WebKitWebFrame *frame = webkit_web_view_get_focused_frame(web_view);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11922 webkit_web_frame_print(frame);
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
11923 #endif
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11924 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11925 break;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11926 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11927 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11928 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11929 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11930 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11931
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11932 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11933 * Render raw HTML code in the embedded HTML widget..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11934 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11935 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11936 * string: String buffer containt HTML code to
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11937 * be rendered.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11938 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11939 * 0 on success.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11940 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
11941 int dw_html_raw(HWND handle, const char *string)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11942 {
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
11943 #ifdef USE_WEBKIT
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11944 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11945 WebKitWebView *web_view;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11946
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11947 DW_MUTEX_LOCK;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11948 if((web_view = _dw_html_web_view(handle)))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11949 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11950 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11951 webkit_web_view_load_html(web_view, string, "file:///");
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
11952 #else
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11953 webkit_web_view_load_html_string(web_view, string, "file:///");
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
11954 #endif
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11955 gtk_widget_show(GTK_WIDGET(handle));
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11956 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11957 DW_MUTEX_UNLOCK;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11958 return DW_ERROR_NONE;
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
11959 #else
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11960 return DW_ERROR_UNKNOWN;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11961 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11962 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11963
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11964 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11965 * Render file or web page in the embedded HTML widget..
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11966 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11967 * handle: Handle to the window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11968 * url: Universal Resource Locator of the web or
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11969 * file object to be rendered.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11970 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11971 * 0 on success.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11972 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
11973 int dw_html_url(HWND handle, const char *url)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11974 {
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
11975 #ifdef USE_WEBKIT
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
11976 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11977 WebKitWebView *web_view;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11978
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11979 DW_MUTEX_LOCK;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11980 if((web_view = _dw_html_web_view(handle)))
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11981 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11982 #ifdef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11983 webkit_web_view_load_uri(web_view, url);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11984 #else
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11985 webkit_web_view_open(web_view, url);
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
11986 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11987 gtk_widget_show(GTK_WIDGET(handle));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11988 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
11989 DW_MUTEX_UNLOCK;
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11990 return DW_ERROR_NONE;
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
11991 #else
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11992 return DW_ERROR_UNKNOWN;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11993 #endif
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11994 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
11995
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
11996 /*
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
11997 * Executes the javascript contained in "script" in the HTML window.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
11998 * Parameters:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
11999 * handle: Handle to the HTML window.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12000 * script: Javascript code to execute.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12001 * scriptdata: Data passed to the signal handler.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12002 * Notes: A DW_SIGNAL_HTML_RESULT event will be raised with scriptdata.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12003 * Returns:
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12004 * DW_ERROR_NONE (0) on success.
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12005 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12006 int dw_html_javascript_run(HWND handle, const char *script, void *scriptdata)
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12007 {
2007
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2006
diff changeset
12008 #ifdef USE_WEBKIT
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12009 int _dw_locked_by_me = FALSE;
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12010 WebKitWebView *web_view;
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
12011
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12012 DW_MUTEX_LOCK;
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
12013 if(script && (web_view = _dw_html_web_view(handle)))
2007
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2006
diff changeset
12014 #ifdef USE_WEBKIT2
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
12015 #if WEBKIT_CHECK_VERSION(2, 40, 0)
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
12016 webkit_web_view_evaluate_javascript(web_view, script, strlen(script), NULL, NULL, NULL, _dw_html_result_event, scriptdata);
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
12017 #else
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12018 webkit_web_view_run_javascript(web_view, script, NULL, _dw_html_result_event, scriptdata);
2990
9220cbf90ed3 GTK3: Fix deprecation warnings in WebKit2GTK 2.40 by switching to new
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2989
diff changeset
12019 #endif
2007
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2006
diff changeset
12020 #else
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2006
diff changeset
12021 webkit_web_view_execute_script(web_view, script);
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2006
diff changeset
12022 #endif
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12023 DW_MUTEX_UNLOCK;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12024 return DW_ERROR_NONE;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12025 #else
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12026 return DW_ERROR_UNKNOWN;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12027 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12028 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12029
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12030 /* Free the name when the signal disconnects */
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12031 void _dw_html_message_disconnect(gpointer gdata, GClosure *closure)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12032 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12033 gpointer *data = (gpointer *)gdata;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12034
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12035 if(data)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12036 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12037 gchar *name = (gchar *)data[1];
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12038
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12039 if(name)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12040 g_free(name);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12041 free(data);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12042 }
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12043 }
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12044
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12045 /*
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12046 * Install a javascript function with name that can call native code.
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12047 * Parameters:
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12048 * handle: Handle to the HTML window.
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12049 * name: Javascript function name.
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12050 * Notes: A DW_SIGNAL_HTML_MESSAGE event will be raised with scriptdata.
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12051 * Returns:
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12052 * DW_ERROR_NONE (0) on success.
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12053 */
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12054 int API dw_html_javascript_add(HWND handle, const char *name)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12055 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12056 #ifdef USE_WEBKIT2
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12057 WebKitWebView *web_view= _dw_html_web_view(handle);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12058 WebKitUserContentManager *manager;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12059
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12060 if(web_view && (manager = webkit_web_view_get_user_content_manager(web_view)) && name)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12061 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12062 /* Script to inject that will call the handler we are adding */
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12063 gchar *script = g_strdup_printf("function %s(body) {window.webkit.messageHandlers.%s.postMessage(body);}",
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12064 name, name);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12065 gchar *signal = g_strdup_printf("script-message-received::%s", name);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12066 WebKitUserScript *userscript = webkit_user_script_new(script, WEBKIT_USER_CONTENT_INJECT_ALL_FRAMES,
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12067 WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START, NULL, NULL);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12068 gpointer *data = calloc(sizeof(gpointer), 2);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12069
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12070 data[0] = handle;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12071 data[1] = g_strdup(name);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12072 g_signal_connect_data(manager, signal, G_CALLBACK(_dw_html_message_event), data, _dw_html_message_disconnect, 0);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12073 webkit_user_content_manager_register_script_message_handler(manager, name);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12074 webkit_user_content_manager_add_script(manager, userscript);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12075
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12076 g_free(script);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12077 g_free(signal);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12078 return DW_ERROR_NONE;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12079 }
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12080 #endif
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12081 return DW_ERROR_UNKNOWN;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12082 }
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12083
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12084 #if defined(USE_WEBKIT) && !defined(USE_WEBKIT2)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12085 static void _dw_html_print_cb(GtkWidget *widget, gpointer *data)
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12086 {
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12087 WebKitWebView *web_view = WEBKIT_WEB_VIEW(data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12088 WebKitWebFrame *frame;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12089
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12090 frame = webkit_web_view_get_focused_frame(web_view);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12091 webkit_web_frame_print(frame);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12092 }
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12093
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12094 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12095 * Fired when the user right-clicks to get the popup-menu on the HTML widget
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12096 * We add a "Print" menu item to enable printing
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12097 * user_data is not used
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12098 */
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12099 static void _dw_html_populate_popup_cb(WebKitWebView *web_view, GtkMenu *menu, gpointer user_data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12100 {
1892
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
12101 GtkWidget *item = gtk_menu_item_new_with_mnemonic( _("_Print") );
c4a6ef8291be Fix deprecation warnings by switching to newly available methods for 3.10.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1891
diff changeset
12102
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12103 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12104 g_signal_connect(item, "activate", G_CALLBACK(_dw_html_print_cb), web_view);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12105 gtk_widget_show(item);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12106 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12107 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12108
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12109 /*
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12110 * Create a new HTML window (widget) to be packed.
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12111 * Parameters:
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12112 * id: An ID to be used with dw_window_from_id() or 0L.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12113 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12114 HWND dw_html_new(unsigned long id)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12115 {
1355
dd252596227b Removed a now unused variable on GTK in dw_html_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1354
diff changeset
12116 GtkWidget *widget = NULL;
1320
6bebcfa03b2b Added support for dw_font_set_default() on GTK for appropriate widgets.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1314
diff changeset
12117 #ifdef USE_WEBKIT
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12118 int _dw_locked_by_me = FALSE;
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12119 WebKitWebView *web_view;
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12120 #ifdef USE_WEBKIT2
2007
3a26e6f6691d GTK3: Enable javascript and use webkit_web_view_execute_script() when using
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2006
diff changeset
12121 WebKitSettings *settings;
2989
fed8a986d565 GTK3: Fix compiling with pre-2.22 WebKit2GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2986
diff changeset
12122 WebKitUserContentManager *manager;
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12123 #else
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12124 WebKitWebSettings *settings;
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12125 #endif
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12126
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12127 DW_MUTEX_LOCK;
2989
fed8a986d565 GTK3: Fix compiling with pre-2.22 WebKit2GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2986
diff changeset
12128 #ifdef USE_WEBKIT2
fed8a986d565 GTK3: Fix compiling with pre-2.22 WebKit2GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2986
diff changeset
12129 manager = webkit_user_content_manager_new();
fed8a986d565 GTK3: Fix compiling with pre-2.22 WebKit2GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2986
diff changeset
12130 web_view = (WebKitWebView *)webkit_web_view_new_with_user_content_manager(manager);
fed8a986d565 GTK3: Fix compiling with pre-2.22 WebKit2GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2986
diff changeset
12131 #else
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12132 web_view = (WebKitWebView *)webkit_web_view_new();
2989
fed8a986d565 GTK3: Fix compiling with pre-2.22 WebKit2GTK.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2986
diff changeset
12133 #endif
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12134 /* WebKit2 no longer requires a scrolled window...
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12135 * So only create a scrolled window and pack it in older versions.
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12136 */
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12137 #ifndef USE_WEBKIT2
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12138 widget = gtk_scrolled_window_new(NULL, NULL);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12139 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12140 gtk_container_add(GTK_CONTAINER (widget), GTK_WIDGET(web_view));
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12141 gtk_widget_show(GTK_WIDGET(web_view));
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12142 g_object_set_data(G_OBJECT(widget), "_dw_web_view", (gpointer)web_view);
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12143 g_signal_connect(web_view, "populate-popup", G_CALLBACK(_dw_html_populate_popup_cb), NULL);
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12144 /* Create a new websettings and enable java script */
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12145 settings = webkit_web_settings_new();
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12146 g_object_set(G_OBJECT(settings), "enable-scripts", TRUE, NULL);
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12147 webkit_web_view_set_settings(WEBKIT_WEB_VIEW(web_view), settings);
2040
2c56a8e245e8 Move saved_thread so it compiles on non-webkit2
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2036
diff changeset
12148 #else
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12149 settings = webkit_web_view_get_settings(web_view);
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12150 /* Make sure java script is enabled */
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12151 webkit_settings_set_enable_javascript(settings, TRUE);
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12152 webkit_web_view_set_settings(web_view, settings);
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12153 widget = (GtkWidget *)web_view;
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12154 #endif
1354
1f22addc2722 Changed the behavior of dw_html_new() to return NULL on failure like the documentation indicates...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1353
diff changeset
12155 gtk_widget_show(widget);
2005
a17cc1958369 GTK: Added WebKit2 support for GTK3. Remove dead code from GTK2.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1937
diff changeset
12156 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12157 #else
1358
2f5e54b0c5c4 dw_debug() lines in dw_html_new() should end with a newline.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1355
diff changeset
12158 dw_debug( "HTML widget not available; you do not have access to webkit.\n" );
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12159 #endif
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12160 return widget;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12161 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12162
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12163 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12164 * Gets the contents of the default clipboard as text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12165 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12166 * None.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12167 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12168 * Pointer to an allocated string of text or NULL if clipboard empty or contents could not
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12169 * be converted to text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12170 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12171 char *dw_clipboard_get_text()
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12172 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12173 int _dw_locked_by_me = FALSE;
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12174 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12175 char *ret = NULL;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
12176
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12177 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12178 if((clipboard_object = gtk_clipboard_get( GDK_SELECTION_CLIPBOARD )))
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12179 {
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12180 gchar *clipboard_contents;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
12181
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12182 if((clipboard_contents = gtk_clipboard_wait_for_text( clipboard_object )))
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12183 {
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12184 ret = strdup((char *)clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12185 g_free(clipboard_contents);
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12186 }
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12187 }
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12188 DW_MUTEX_UNLOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12189 return ret;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12190 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12191
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12192 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12193 * Sets the contents of the default clipboard to the supplied text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12194 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12195 * Text.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12196 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12197 void dw_clipboard_set_text(const char *str, int len)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12198 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12199 int _dw_locked_by_me = FALSE;
971
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12200 GtkClipboard *clipboard_object;
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12201
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12202 DW_MUTEX_LOCK;
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12203 if((clipboard_object = gtk_clipboard_get( GDK_SELECTION_CLIPBOARD )))
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12204 {
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12205 gtk_clipboard_set_text( clipboard_object, str, len );
2a21915684d1 Step 1 in modernizing the GTK3 module.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 959
diff changeset
12206 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12207 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12208 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12209
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12210 /* Internal function to create the drawable pixmap and call the function */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12211 static void _dw_draw_page(GtkPrintOperation *operation, GtkPrintContext *context, int page_nr)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12212 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12213 cairo_t *cr = gtk_print_context_get_cairo_context(context);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12214 void *drawdata = g_object_get_data(G_OBJECT(operation), "_dw_drawdata");
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12215 int (*drawfunc)(HPRINT, HPIXMAP, int, void *) = g_object_get_data(G_OBJECT(operation), "_dw_drawfunc");
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12216 int result = 0;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12217 HPIXMAP pixmap;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12218
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12219 if(cr && drawfunc && (pixmap = calloc(1,sizeof(struct _hpixmap))))
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12220 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12221 pixmap->image = cairo_get_group_target(cr);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12222 pixmap->handle = (HWND)operation;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12223 pixmap->width = gtk_print_context_get_width(context);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12224 pixmap->height = gtk_print_context_get_height(context);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12225 result = drawfunc((HPRINT)operation, pixmap, page_nr, drawdata);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12226 if(result)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12227 gtk_print_operation_draw_page_finish(operation);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12228 free(pixmap);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12229 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12230 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12231
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12232 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12233 * Creates a new print object.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12234 * Parameters:
1152
58b5374355ab Added print jobname parameter to dw_print_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1149
diff changeset
12235 * jobname: Name of the print job to show in the queue.
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12236 * flags: Flags to initially configure the print object.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12237 * pages: Number of pages to print.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12238 * drawfunc: The pointer to the function to be used as the callback.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12239 * drawdata: User data to be passed to the handler function.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12240 * Returns:
1137
e24e5a13ff2c Added code to test the new print functions in dwtest.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1136
diff changeset
12241 * A handle to the print object or NULL on failure.
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12242 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12243 HPRINT API dw_print_new(const char *jobname, unsigned long flags, unsigned int pages, void *drawfunc, void *drawdata)
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12244 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12245 GtkPrintOperation *op;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12246 int _dw_locked_by_me = FALSE;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12247
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12248 if(!drawfunc)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12249 return NULL;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12250
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12251 DW_MUTEX_LOCK;
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12252 if((op = gtk_print_operation_new()))
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12253 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12254 gtk_print_operation_set_n_pages(op, pages);
1152
58b5374355ab Added print jobname parameter to dw_print_new().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1149
diff changeset
12255 gtk_print_operation_set_job_name(op, jobname ? jobname : "Dynamic Windows Print Job");
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12256 g_object_set_data(G_OBJECT(op), "_dw_drawfunc", drawfunc);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12257 g_object_set_data(G_OBJECT(op), "_dw_drawdata", drawdata);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12258 g_signal_connect(op, "draw_page", G_CALLBACK(_dw_draw_page), NULL);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12259 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12260 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12261 return (HPRINT)op;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12262 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12263
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12264 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12265 * Runs the print job, causing the draw page callbacks to fire.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12266 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12267 * print: Handle to the print object returned by dw_print_new().
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12268 * flags: Flags to run the print job.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12269 * Returns:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12270 * DW_ERROR_UNKNOWN on error or DW_ERROR_NONE on success.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12271 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12272 int API dw_print_run(HPRINT print, unsigned long flags)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12273 {
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12274 GtkPrintOperationResult res;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12275 GtkPrintOperation *op = (GtkPrintOperation *)print;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12276 int _dw_locked_by_me = FALSE;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12277
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12278 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12279 res = gtk_print_operation_run(op, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, NULL, NULL);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12280 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12281 return (res == GTK_PRINT_OPERATION_RESULT_ERROR ? DW_ERROR_UNKNOWN : DW_ERROR_NONE);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12282 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12283
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12284 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12285 * Cancels the print job, typically called from a draw page callback.
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12286 * Parameters:
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12287 * print: Handle to the print object returned by dw_print_new().
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12288 */
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12289 void API dw_print_cancel(HPRINT print)
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12290 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12291 int _dw_locked_by_me = FALSE;
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12292 GtkPrintOperation *op = (GtkPrintOperation *)print;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12293
1136
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12294 DW_MUTEX_LOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12295 gtk_print_operation_cancel(op);
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12296 DW_MUTEX_UNLOCK;
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12297 }
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12298
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12299 /*
1a5b0908659b Initial implementation of the DynamicWindows Print object for GTK3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1127
diff changeset
12300 * Returns a pointer to a static buffer which contains the
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12301 * current user directory. Or the root directory (C:\ on
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12302 * OS/2 and Windows).
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12303 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12304 char *dw_user_dir(void)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12305 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12306 static char _user_dir[1024] = "";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12307
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12308 if(!_user_dir[0])
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12309 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12310 char *home = getenv("HOME");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12311
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12312 if(home)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12313 strcpy(_user_dir, home);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12314 else
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12315 strcpy(_user_dir, "/");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12316 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12317 return _user_dir;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12318 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12319
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12320 /*
1384
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
12321 * Returns a pointer to a static buffer which containes the
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12322 * private application data directory.
1384
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
12323 */
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
12324 char * API dw_app_dir(void)
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
12325 {
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
12326 return _dw_share_path;
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
12327 }
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
12328
156e32814c83 Cleanup of the previous commits and added Unix support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1373
diff changeset
12329 /*
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12330 * Sets the application ID used by this Dynamic Windows application instance.
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12331 * Parameters:
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12332 * appid: A string typically in the form: com.company.division.application
2088
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2081
diff changeset
12333 * appname: The application name used on Windows or NULL.
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12334 * Returns:
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12335 * DW_ERROR_NONE after successfully setting the application ID.
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12336 * DW_ERROR_UNKNOWN if unsupported on this system.
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12337 * DW_ERROR_GENERAL if the application ID is not allowed.
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12338 * Remarks:
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12339 * This must be called before dw_init(). If dw_init() is called first
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12340 * it will create a unique ID in the form: org.dbsoft.dwindows.application
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12341 * or if the application name cannot be detected: org.dbsoft.dwindows.pid.#
2088
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2081
diff changeset
12342 * The appname is only required on Windows. If NULL is passed the detected
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2081
diff changeset
12343 * application name will be used, but a prettier name may be desired.
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2081
diff changeset
12344 */
94ea915bd917 Win: Initial implementation of notifications on Windows. Currently using WinToast.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2081
diff changeset
12345 int dw_app_id_set(const char *appid, const char *appname)
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12346 {
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12347 #if GLIB_CHECK_VERSION(2,28,0)
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12348 if(g_application_id_is_valid(appid))
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12349 {
2127
663467f6eee4 Code cleanup: Add constants to header for dark mode, buffer sizes and Unicode support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2118
diff changeset
12350 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: 2330
diff changeset
12351 if(appname)
d0f884083c63 GTK: Use appname in dw_app_id_set() to set g_set_application_name().
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2330
diff changeset
12352 g_set_application_name(appname);
2071
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12353 return DW_ERROR_NONE;
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12354 }
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12355 return DW_ERROR_GENERAL;
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12356 #else
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12357 return DW_ERROR_UNKNOWN;
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12358 #endif
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12359 }
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12360
c2f13c5eefac GTK: Add dw_app_id_set() and reconfigure based on the new code path.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2066
diff changeset
12361 /*
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12362 * Call a function from the window (widget)'s context.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12363 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12364 * handle: Window handle of the widget.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12365 * function: Function pointer to be called.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12366 * data: Pointer to the data to be passed to the function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12367 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12368 void dw_window_function(HWND handle, void *function, void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12369 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12370 void (* windowfunc)(void *);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12371
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12372 windowfunc = function;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12373
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12374 if(windowfunc)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12375 windowfunc(data);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12376 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12377
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12378 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12379 * Add a named user data item to a window handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12380 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12381 * window: Window handle of signal to be called back.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12382 * dataname: A string pointer identifying which signal to be hooked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12383 * data: User data to be passed to the handler function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12384 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12385 void dw_window_set_data(HWND window, const char *dataname, void *data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12386 {
784
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12387 HWND thiswindow = window;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12388 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12389
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12390 if(!window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12391 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12392
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12393 DW_MUTEX_LOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12394 if(GTK_IS_SCROLLED_WINDOW(window))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12395 {
784
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12396 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12397 }
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12398 if(thiswindow && G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12399 g_object_set_data(G_OBJECT(thiswindow), dataname, (gpointer)data);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12400 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12401 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12402
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12403 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12404 * Gets a named user data item to a window handle.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12405 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12406 * window: Window handle of signal to be called back.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12407 * dataname: A string pointer identifying which signal to be hooked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12408 * data: User data to be passed to the handler function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12409 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12410 void *dw_window_get_data(HWND window, const char *dataname)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12411 {
784
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12412 HWND thiswindow = window;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12413 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12414 void *ret = NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12415
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12416 if(!window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12417 return NULL;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12418
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12419 DW_MUTEX_LOCK;
784
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12420 if(GTK_IS_SCROLLED_WINDOW(window))
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12421 {
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12422 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12423 }
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12424 if(G_IS_OBJECT(thiswindow))
fb21fdd6b839 Slight code cleanup.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 783
diff changeset
12425 ret = (void *)g_object_get_data(G_OBJECT(thiswindow), dataname);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12426 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12427 return ret;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12428 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12429
2532
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2509
diff changeset
12430 /*
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2509
diff changeset
12431 * 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: 2509
diff changeset
12432 * Parameters:
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2509
diff changeset
12433 * 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: 2509
diff changeset
12434 * 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: 2509
diff changeset
12435 * Returns:
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2509
diff changeset
12436 * 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: 2509
diff changeset
12437 */
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2509
diff changeset
12438 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: 2509
diff changeset
12439 {
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2509
diff changeset
12440 /* 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: 2509
diff changeset
12441 * 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: 2509
diff changeset
12442 */
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2509
diff changeset
12443 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: 2509
diff changeset
12444 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: 2509
diff changeset
12445 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: 2509
diff changeset
12446 }
457c91634881 Added dw_window_compare() to check if two window handles refer to the same object.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2509
diff changeset
12447
874
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12448 /* Internal function to get the state of the timer before firing */
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12449 gboolean _dw_timer_func(gpointer data)
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12450 {
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12451 void (*sigfunc)(void *data) = NULL;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12452 void *sdata;
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
12453 char tmpbuf[31] = {0};
874
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12454 int *tag = data;
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
12455
874
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12456 if(tag)
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12457 {
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12458 snprintf(tmpbuf, 30, "_dw_timer%d", *tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12459 sigfunc = g_object_get_data(G_OBJECT(_DWObject), tmpbuf);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12460 snprintf(tmpbuf, 30, "_dw_timerdata%d", *tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12461 sdata = g_object_get_data(G_OBJECT(_DWObject), tmpbuf);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12462 }
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12463 if(!sigfunc)
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12464 {
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12465 if(tag)
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12466 free(tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12467 return FALSE;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12468 }
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12469 sigfunc(sdata);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12470 return TRUE;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12471 }
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12472
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12473 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12474 * Add a callback to a timer event.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12475 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12476 * interval: Milliseconds to delay between calls.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12477 * sigfunc: The pointer to the function to be used as the callback.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12478 * data: User data to be passed to the handler function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12479 * Returns:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12480 * Timer ID for use with dw_timer_disconnect(), 0 on error.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12481 */
2584
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2532
diff changeset
12482 HTIMER API dw_timer_connect(int interval, void *sigfunc, void *data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12483 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12484 int *tag, _dw_locked_by_me = FALSE;
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
12485 char tmpbuf[31] = {0};
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
12486
874
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12487 tag = calloc(1, sizeof(int));
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
12488
874
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12489 DW_MUTEX_LOCK;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12490 *tag = g_timeout_add(interval, (GSourceFunc)_dw_timer_func, (gpointer)tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12491 snprintf(tmpbuf, 30, "_dw_timer%d", *tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12492 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, sigfunc);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12493 snprintf(tmpbuf, 30, "_dw_timerdata%d", *tag);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12494 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, data);
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12495 DW_MUTEX_UNLOCK;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12496 return *tag;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12497 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12498
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12499 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12500 * Removes timer callback.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12501 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12502 * id: Timer ID returned by dw_timer_connect().
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12503 */
2584
2acc7ba5dea0 Add HTIMER type and change dw_timer_() functions to use it.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2532
diff changeset
12504 void API dw_timer_disconnect(HTIMER id)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12505 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12506 int _dw_locked_by_me = FALSE;
1306
dbd507f42947 Added dw_debug() logging function which will output a message to the debugging console.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1300
diff changeset
12507 char tmpbuf[31] = {0};
876
13442724eb5d One last change... use 30 bytes instead of 20... don't want to overflow.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 875
diff changeset
12508
13442724eb5d One last change... use 30 bytes instead of 20... don't want to overflow.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 875
diff changeset
12509 snprintf(tmpbuf, 30, "_dw_timer%d", id);
874
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12510 DW_MUTEX_LOCK;
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12511 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, NULL);
876
13442724eb5d One last change... use 30 bytes instead of 20... don't want to overflow.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 875
diff changeset
12512 snprintf(tmpbuf, 30, "_dw_timerdata%d", id);
875
e1afa43261d9 After thinking about it... probably need to get rid of the saved data to so we don't leak.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 874
diff changeset
12513 g_object_set_data(G_OBJECT(_DWObject), tmpbuf, NULL);
874
18eab415ff0c Rewrote the timers for GTK3. Due to the removal of the timer remove by ID function.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 861
diff changeset
12514 DW_MUTEX_UNLOCK;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12515 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12516
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12517 /* Get the actual signal window handle not the user window handle
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12518 * Should mimic the code in dw_signal_connect() below.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12519 */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12520 static HWND _dw_find_signal_window(HWND window, const char *signame)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12521 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12522 HWND thiswindow = window;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12523
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12524 if(GTK_IS_SCROLLED_WINDOW(thiswindow))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12525 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
1583
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
12526 else if(GTK_IS_SCALE(thiswindow) || GTK_IS_SCROLLBAR(thiswindow) || GTK_IS_SPIN_BUTTON(thiswindow))
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12527 thiswindow = (GtkWidget *)g_object_get_data(G_OBJECT(thiswindow), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12528 else if(GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_SELECT) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12529 thiswindow = (GtkWidget *)gtk_tree_view_get_selection(GTK_TREE_VIEW(thiswindow));
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12530 return thiswindow;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12531 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12532
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12533 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12534 * Add a callback to a window event.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12535 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12536 * window: Window handle of signal to be called back.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12537 * signame: A string pointer identifying which signal to be hooked.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12538 * sigfunc: The pointer to the function to be used as the callback.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12539 * data: User data to be passed to the handler function.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12540 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12541 void dw_signal_connect(HWND window, const char *signame, void *sigfunc, void *data)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12542 {
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12543 dw_signal_connect_data(window, signame, sigfunc, NULL, data);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12544 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12545
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12546 /* Internal function to free any allocated signal data..
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12547 * and call any required function to free additional memory.
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12548 */
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12549 static void _dw_signal_disconnect(gpointer data, GClosure *closure)
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12550 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12551 if(data)
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12552 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12553 void **params = (void **)data;
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12554 void (*discfunc)(HWND, void *) = params[1];
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12555
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12556 if(discfunc)
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12557 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12558 DWSignalHandler work = _dw_get_signal_handler(data);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12559
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12560 if(work.window)
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12561 {
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12562 discfunc(work.window, work.data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12563 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12564 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12565 free(data);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12566 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12567 }
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12568
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12569 #define _DW_INTERNAL_CALLBACK_PARAMS 4
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12570
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12571 /*
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12572 * Add a callback to a window event with a closure callback.
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12573 * Parameters:
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12574 * window: Window handle of signal to be called back.
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12575 * signame: A string pointer identifying which signal to be hooked.
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12576 * sigfunc: The pointer to the function to be used as the callback.
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12577 * discfunc: The pointer to the function called when this handler is removed.
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12578 * data: User data to be passed to the handler function.
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12579 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12580 void dw_signal_connect_data(HWND window, const char *signame, void *sigfunc, void *discfunc, void *data)
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12581 {
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12582 DWSignalList signal = _dw_findsignal(signame);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12583 void *thisfunc = signal.func;
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12584 char *thisname = (char *)signame;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12585 HWND thiswindow = window;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12586 int sigid, _dw_locked_by_me = FALSE;
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12587 void **params = calloc(_DW_INTERNAL_CALLBACK_PARAMS, sizeof(void *));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12588 gint cid;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12589
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12590 /* Save the disconnect function pointer */
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12591 params[1] = discfunc;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12592
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12593 DW_MUTEX_LOCK;
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12594 #if GLIB_CHECK_VERSION(2,40,0)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12595 /* Special case for handling notification signals, which aren't really signals */
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12596 if (G_IS_NOTIFICATION(thiswindow) && strcmp(signame, DW_SIGNAL_CLICKED) == 0)
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12597 {
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12598 char textbuf[101] = {0};
2132
42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2127
diff changeset
12599 snprintf(textbuf, 100, "dw-notification-%llu-func", DW_POINTER_TO_ULONGLONG(thiswindow));
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12600 g_object_set_data(G_OBJECT(_DWApp), textbuf, DW_POINTER(sigfunc));
2132
42f8ad7a89e8 Added DW_POINTER_TO_(U)LONGLONG and DW_(U)LONGLONG_TO_POINTER macros.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2127
diff changeset
12601 snprintf(textbuf, 100, "dw-notification-%llu-data", DW_POINTER_TO_ULONGLONG(thiswindow));
2112
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12602 g_object_set_data(G_OBJECT(_DWApp), textbuf, DW_POINTER(data));
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12603 DW_MUTEX_UNLOCK;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12604 return;
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12605 }
b33d020b04e7 GTK3: Attempt at getting clicked callbacks on notifications working.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2091
diff changeset
12606 #endif
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12607 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12608 * If the window we are setting the signal on is a scrolled window we need to get
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12609 * the "real" widget type. thiswindow is the "real" widget type
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12610 */
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12611 if (GTK_IS_SCROLLED_WINDOW(thiswindow)
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12612 #ifdef USE_WEBKIT
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12613 && !(thiswindow = (HWND)_dw_html_web_view(thiswindow))
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12614 #endif
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12615 )
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12616 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12617 thiswindow = (HWND)g_object_get_data(G_OBJECT(window), "_dw_user");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12618 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12619
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12620 if (strcmp(signame, DW_SIGNAL_EXPOSE) == 0)
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12621 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12622 thisname = "draw";
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12623 }
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12624 else if (GTK_IS_MENU_ITEM(thiswindow) && strcmp(signame, DW_SIGNAL_CLICKED) == 0)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12625 {
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12626 DWSignalList signal = _dw_findsignal(signame);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12627 thisname = "activate";
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12628 thisfunc = signal.func;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12629 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12630 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_CONTEXT) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12631 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12632 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12633 params[0] = GINT_TO_POINTER(sigid);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12634 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12635 cid = g_signal_connect_data(G_OBJECT(thiswindow), "button_press_event", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12636 _dw_set_signal_handler_id(thiswindow, sigid, cid);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12637
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12638 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12639 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12640 }
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
12641 else if ((GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_SELECT) == 0) ||
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
12642 (GTK_IS_COMBO_BOX(thiswindow) && strcmp(signame, DW_SIGNAL_LIST_SELECT) == 0))
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12643 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12644 GtkWidget *widget = thiswindow;
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12645
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12646 thisname = "changed";
1096
5261439c7227 Fix bug with setting up container on 64bit platform.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1092
diff changeset
12647
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12648 sigid = _dw_set_signal_handler(widget, window, sigfunc, data, thisfunc, discfunc);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12649 params[0] = GINT_TO_POINTER(sigid);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12650 params[2] = (void *)thiswindow;
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12651 if(GTK_IS_TREE_VIEW(thiswindow))
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12652 {
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12653 thiswindow = (GtkWidget *)gtk_tree_view_get_selection(GTK_TREE_VIEW(thiswindow));
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12654 cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
785
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
12655 }
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
12656 else
a86c54519de0 Implemented list select event for both combobox and listbox (implemented via the tree view).
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 784
diff changeset
12657 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12658 cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(_dw_combobox_select_event), params, _dw_signal_disconnect, 0);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12659 }
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12660 _dw_set_signal_handler_id(widget, sigid, cid);
779
d67d2f626c33 More code and cleanups for listboxes/combobox and event handling...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 778
diff changeset
12661
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12662 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12663 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12664 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12665 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_TREE_EXPAND) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12666 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12667 thisname = "row-expanded";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12668 }
783
9ef49898a5e6 Container events now working except for column-click.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 782
diff changeset
12669 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_ENTER) == 0)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12670 {
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12671 DWSignalList signal = _dw_findsignal(DW_SIGNAL_ITEM_ENTER);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12672 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_container_enter_event, discfunc);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12673 params[0] = GINT_TO_POINTER(sigid);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12674 params[2] = (void *)thiswindow;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12675 cid = g_signal_connect_data(G_OBJECT(thiswindow), "key_press_event", G_CALLBACK(_dw_container_enter_event), params, _dw_signal_disconnect, 0);
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12676 _dw_set_signal_handler_id(thiswindow, sigid, cid);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12677
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12678 params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12679
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12680 thisname = "button_press_event";
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12681 thisfunc = signal.func;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12682 }
786
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
12683 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_COLUMN_CLICK) == 0)
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
12684 {
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
12685 /* We don't actually need a signal handler here... just need to assign the handler ID
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
12686 * Since the handlers for the columns were already created in _dw_container_setup()
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
12687 */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12688 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_column_click_event, discfunc);
788
f8f4f72d6462 Implemented dw_listbox_selected_multi() however need to do some testing to make sure this works in all cases.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 787
diff changeset
12689 g_object_set_data(G_OBJECT(thiswindow), "_dw_column_click_id", GINT_TO_POINTER(sigid+1));
786
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
12690 DW_MUTEX_UNLOCK;
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
12691 return;
0e251c2f5d08 Implemented the column click event handler...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 785
diff changeset
12692 }
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12693 else if (strcmp(signame, DW_SIGNAL_SET_FOCUS) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12694 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12695 thisname = "focus-in-event";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12696 if (GTK_IS_COMBO_BOX(thiswindow))
789
8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 788
diff changeset
12697 thiswindow = gtk_bin_get_child(GTK_BIN(thiswindow));
8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 788
diff changeset
12698 }
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12699 #ifdef USE_WEBKIT
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12700 else if (WEBKIT_IS_WEB_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_HTML_CHANGED) == 0)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12701 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12702 #ifdef USE_WEBKIT2
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12703 thisname = "load-changed";
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12704 #else
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12705 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12706 params[0] = GINT_TO_POINTER(sigid);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12707 params[2] = (void *)thiswindow;
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12708 params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_STARTED);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12709 cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-started", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12710 _dw_set_signal_handler_id(thiswindow, sigid, cid);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12711
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12712 params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12713
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12714 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12715 params[0] = GINT_TO_POINTER(sigid);
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12716 params[2] = (void *)thiswindow;
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12717 params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_LOADING);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12718 cid = g_signal_connect_data(G_OBJECT(thiswindow), "load-committed", G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12719 _dw_set_signal_handler_id(thiswindow, sigid, cid);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12720
2008
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12721 params = calloc(sizeof(void *), _DW_INTERNAL_CALLBACK_PARAMS);
74facb490f5a GTK: Fix html changed callbacks when using webkit1.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2007
diff changeset
12722 params[3] = GINT_TO_POINTER(DW_HTML_CHANGE_COMPLETE);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12723
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12724 thisname = "load-finished";
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12725 #endif
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12726 }
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12727 else if (WEBKIT_IS_WEB_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_HTML_RESULT) == 0)
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12728 {
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12729 /* We don't actually need a signal handler here... just need to assign the handler ID
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12730 * Since the handler is created in dw_html_javasript_run()
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12731 */
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12732 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_html_result_event, discfunc);
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12733 g_object_set_data(G_OBJECT(thiswindow), "_dw_html_result_id", GINT_TO_POINTER(sigid+1));
2051
a3fbe505307a GTK3: Warn that DW_SIGNAL_HTML_RESULT will not be generated when connecting
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2040
diff changeset
12734 #ifndef USE_WEBKIT2
a3fbe505307a GTK3: Warn that DW_SIGNAL_HTML_RESULT will not be generated when connecting
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2040
diff changeset
12735 dw_debug("WARNING: DW_SIGNAL_HTML_RESULT will not be generated unless using webkit2gtk!\n");
a3fbe505307a GTK3: Warn that DW_SIGNAL_HTML_RESULT will not be generated when connecting
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2040
diff changeset
12736 #endif
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12737 DW_MUTEX_UNLOCK;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12738 return;
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12739 }
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12740 #ifdef USE_WEBKIT2
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12741 else if (WEBKIT_IS_WEB_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_HTML_MESSAGE) == 0)
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12742 {
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12743 /* We don't actually need a signal handler here... just need to assign the handler ID
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12744 * Since the handler is created in dw_html_javasript_add()
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12745 */
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12746 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, _dw_html_message_event, discfunc);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12747 g_object_set_data(G_OBJECT(thiswindow), "_dw_html_message_id", GINT_TO_POINTER(sigid+1));
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12748 DW_MUTEX_UNLOCK;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12749 return;
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12750 }
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12751 #endif
2006
6f1adc77de02 GTK: Added DW_SIGNAL_HTML_CHANGED and DW_SIGNAL_HTML_RESULT.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2005
diff changeset
12752 #endif
789
8fe51d916b36 Reenabled the set-focus code that was disabled due to combobox issues.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 788
diff changeset
12753 #if 0
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12754 else if (strcmp(signame, DW_SIGNAL_LOSE_FOCUS) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12755 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12756 thisname = "focus-out-event";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12757 if(GTK_IS_COMBO_BOX(thiswindow))
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12758 thiswindow = GTK_COMBO_BOX(thiswindow)->entry;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12759 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12760 #endif
1583
525c4c9d04c6 After switching to non-deprecated functions in GTK3 like...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1579
diff changeset
12761 else if (GTK_IS_SCALE(thiswindow) || GTK_IS_SCROLLBAR(thiswindow) || GTK_IS_SPIN_BUTTON(thiswindow) )
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12762 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12763 thiswindow = (GtkWidget *)g_object_get_data(G_OBJECT(thiswindow), "_dw_adjustment");
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12764 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12765 else if (GTK_IS_NOTEBOOK(thiswindow) && strcmp(signame, DW_SIGNAL_SWITCH_PAGE) == 0)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12766 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12767 thisname = "switch-page";
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12768 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12769
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12770 if (!thisfunc || !thiswindow)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12771 {
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12772 free(params);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12773 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12774 return;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12775 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12776
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12777 sigid = _dw_set_signal_handler(thiswindow, window, sigfunc, data, thisfunc, discfunc);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12778 params[0] = GINT_TO_POINTER(sigid);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12779 params[2] = (void *)thiswindow;
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12780 cid = g_signal_connect_data(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc), params, _dw_signal_disconnect, 0);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12781 _dw_set_signal_handler_id(thiswindow, sigid, cid);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12782 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12783 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12784
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12785 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12786 * Removes callbacks for a given window with given name.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12787 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12788 * window: Window handle of callback to be removed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12789 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12790 void dw_signal_disconnect_by_name(HWND window, const char *signame)
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12791 {
2979
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12792 DWSignalList signal = _dw_findsignal(signame);
b59103280114 GTK3: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2950
diff changeset
12793 void *thisfunc = signal.func;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12794 int z, count;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12795 int _dw_locked_by_me = FALSE;
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12796 void **params = alloca(sizeof(void *) * 3);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12797
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12798 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12799 params[2] = _dw_find_signal_window(window, signame);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12800 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(params[2]), "_dw_sigcounter"));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12801
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12802 for(z=0;z<count;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12803 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12804 DWSignalHandler sh;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12805
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12806 params[0] = GINT_TO_POINTER(z);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12807 sh = _dw_get_signal_handler(params);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12808
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12809 if(sh.intfunc == thisfunc)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12810 _dw_remove_signal_handler((HWND)params[2], z);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12811 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12812 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12813 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12814
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12815 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12816 * Removes all callbacks for a given window.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12817 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12818 * window: Window handle of callback to be removed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12819 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12820 void dw_signal_disconnect_by_window(HWND window)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12821 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12822 HWND thiswindow;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12823 int z, count;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12824 int _dw_locked_by_me = FALSE;
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12825
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12826 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12827 thiswindow = _dw_find_signal_window(window, NULL);
1092
0fc7387abfd1 Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1087
diff changeset
12828 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter"));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12829
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12830 for(z=0;z<count;z++)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12831 _dw_remove_signal_handler(thiswindow, z);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12832 g_object_set_data(G_OBJECT(thiswindow), "_dw_sigcounter", NULL);
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12833 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12834 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12835
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12836 /*
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12837 * Removes all callbacks for a given window with specified data.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12838 * Parameters:
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12839 * window: Window handle of callback to be removed.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12840 * data: Pointer to the data to be compared against.
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12841 */
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12842 void dw_signal_disconnect_by_data(HWND window, void *data)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12843 {
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12844 int z, count;
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12845 int _dw_locked_by_me = FALSE;
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12846 void **params = alloca(sizeof(void *) * 3);
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12847
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12848 DW_MUTEX_LOCK;
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12849 params[2] = _dw_find_signal_window(window, NULL);
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12850 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(params[2]), "_dw_sigcounter"));
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12851
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12852 for(z=0;z<count;z++)
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12853 {
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12854 DWSignalHandler sh;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12855
1853
4790589f52a9 Initial commit for new dw_signal_connect_data() function...
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1847
diff changeset
12856 params[0] = GINT_TO_POINTER(z);
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12857 sh = _dw_get_signal_handler(params);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12858
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12859 if(sh.data == data)
2626
401a3b9f21ba Massive continuation of code style standardization.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2618
diff changeset
12860 _dw_remove_signal_handler((HWND)params[2], z);
775
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12861 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12862 DW_MUTEX_UNLOCK;
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12863 }
5ec50e403a8a Added initial support for GTK 3.0. Split it off into its own directory.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents:
diff changeset
12864
1785
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12865 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12866 * Converts a UTF-8 encoded string into a wide string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12867 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12868 * utf8string: UTF-8 encoded source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12869 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12870 * Wide string that needs to be freed with dw_free()
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12871 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12872 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12873 wchar_t * API dw_utf8_to_wchar(const char *utf8string)
1785
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12874 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12875 wchar_t *retval = NULL, *freeme;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12876
1785
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12877 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12878 freeme = retval = (wchar_t *)g_utf8_to_ucs4(utf8string, -1, NULL, NULL, NULL);
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12879 else if(sizeof(wchar_t) == sizeof(gunichar2))
1785
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12880 freeme = retval = (wchar_t *)g_utf8_to_utf16(utf8string, -1, NULL, NULL, NULL);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12881 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12882 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12883 retval = wcsdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12884 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12885 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12886 return retval;
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12887 }
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12888
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12889 /*
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12890 * Converts a wide string into a UTF-8 encoded string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12891 * Parameters:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12892 * wstring: Wide source string.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12893 * Returns:
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12894 * UTF-8 encoded string that needs to be freed with dw_free()
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12895 * or NULL on failure.
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12896 */
2036
48b91f535f82 GTK: More const changes... a few more commits to finish.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2030
diff changeset
12897 char * API dw_wchar_to_utf8(const wchar_t *wstring)
1785
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12898 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12899 char *retval = NULL, *freeme;
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12900
1785
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12901 if(sizeof(wchar_t) == sizeof(gunichar))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12902 freeme = retval = g_ucs4_to_utf8((gunichar *)wstring, -1, NULL, NULL, NULL);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12903 else if(sizeof(wchar_t) == sizeof(gunichar2))
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12904 freeme = retval = g_utf16_to_utf8((gunichar2 *)wstring, -1, NULL, NULL, NULL);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12905 if(retval)
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12906 {
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12907 retval = strdup(retval);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12908 g_free(freeme);
c5ea64e8b436 Added UTF8/Wide conversion for GTK2/3.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1769
diff changeset
12909 }
1933
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12910 return retval;
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12911 }
758f49e54566 Enable dw_windows_get_text() to return value of label under GTK.
mhessling@81767d24-ef19-dc11-ae90-00e081727c95
parents: 1931
diff changeset
12912
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12913 /*
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12914 * Gets the state of the requested library feature.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12915 * Parameters:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12916 * feature: The requested feature for example DW_FEATURE_DARK_MODE
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12917 * Returns:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12918 * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12919 * DW_FEATURE_DISABLED if the feature is supported but disabled.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12920 * DW_FEATURE_ENABLED if the feature is supported and enabled.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12921 * Other value greater than 1, same as enabled but with extra info.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12922 */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12923 int API dw_feature_get(DWFEATURE feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12924 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12925 switch(feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12926 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12927 #ifdef USE_WEBKIT
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12928 case DW_FEATURE_HTML:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12929 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12930 #ifdef USE_WEBKIT2
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12931 case DW_FEATURE_HTML_RESULT:
2980
7e273fec75ae GTK3/4: Add feature support for DW_FEATURE_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2979
diff changeset
12932 case DW_FEATURE_HTML_MESSAGE:
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12933 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12934 #if GLIB_CHECK_VERSION(2,40,0)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12935 case DW_FEATURE_NOTIFICATION:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12936 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12937 #ifdef DW_INCLUDE_DEPRECATED
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12938 case DW_FEATURE_MDI:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12939 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12940 #if !GTK_CHECK_VERSION(3,14,0)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12941 case DW_FEATURE_CONTAINER_STRIPE:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12942 #endif
2284
3361ce6070ce Add DW_FEATURE_TASK_BAR to the feature tests, for taskbar icon support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2260
diff changeset
12943 case DW_FEATURE_TASK_BAR:
2127
663467f6eee4 Code cleanup: Add constants to header for dark mode, buffer sizes and Unicode support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2118
diff changeset
12944 case DW_FEATURE_UTF8_UNICODE:
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12945 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: 2365
diff changeset
12946 case DW_FEATURE_TREE:
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12947 return DW_FEATURE_ENABLED;
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
12948 case DW_FEATURE_RENDER_SAFE:
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
12949 return _dw_render_safe_mode;
2506
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12950 #ifdef GDK_WINDOWING_X11
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12951 case DW_FEATURE_WINDOW_PLACEMENT:
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12952 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
12953 int _dw_locked_by_me = FALSE, retval = DW_FEATURE_UNSUPPORTED;
2506
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12954 GdkDisplay *display;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12955
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12956 DW_MUTEX_LOCK;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12957 display = gdk_display_get_default();
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12958
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12959 if(display && GDK_IS_X11_DISPLAY(display))
2509
eaac1317b851 GTK3: Fix incorrect return value.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2506
diff changeset
12960 retval = DW_FEATURE_ENABLED;
2506
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12961 DW_MUTEX_UNLOCK;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12962 return retval;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12963 }
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
12964 #endif
2091
68f1924fdd13 Restructure feature switch so fallback return is in the default case.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2090
diff changeset
12965 default:
68f1924fdd13 Restructure feature switch so fallback return is in the default case.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2090
diff changeset
12966 return DW_FEATURE_UNSUPPORTED;
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12967 }
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12968 }
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12969
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12970 /*
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12971 * Sets the state of the requested library feature.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12972 * Parameters:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12973 * feature: The requested feature for example DW_FEATURE_DARK_MODE
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12974 * state: DW_FEATURE_DISABLED, DW_FEATURE_ENABLED or any value greater than 1.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12975 * Returns:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12976 * DW_FEATURE_UNSUPPORTED if the library or OS does not support the feature.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12977 * DW_ERROR_NONE if the feature is supported and successfully configured.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12978 * DW_ERROR_GENERAL if the feature is supported but could not be configured.
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12979 * Remarks:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12980 * These settings are typically used during dw_init() so issue before
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12981 * setting up the library with dw_init().
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12982 */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12983 int API dw_feature_set(DWFEATURE feature, int state)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12984 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12985 switch(feature)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12986 {
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12987 /* These features are supported but not configurable */
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12988 #ifdef USE_WEBKIT
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12989 case DW_FEATURE_HTML:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12990 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12991 #ifdef USE_WEBKIT2
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12992 case DW_FEATURE_HTML_RESULT:
2980
7e273fec75ae GTK3/4: Add feature support for DW_FEATURE_HTML_MESSAGE.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2979
diff changeset
12993 case DW_FEATURE_HTML_MESSAGE:
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12994 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12995 #if GLIB_CHECK_VERSION(2,40,0)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12996 case DW_FEATURE_NOTIFICATION:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12997 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12998 #ifdef DW_INCLUDE_DEPRECATED
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
12999 case DW_FEATURE_MDI:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
13000 #endif
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
13001 #if !GTK_CHECK_VERSION(3,14,0)
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
13002 case DW_FEATURE_CONTAINER_STRIPE:
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
13003 #endif
2284
3361ce6070ce Add DW_FEATURE_TASK_BAR to the feature tests, for taskbar icon support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2260
diff changeset
13004 case DW_FEATURE_TASK_BAR:
2127
663467f6eee4 Code cleanup: Add constants to header for dark mode, buffer sizes and Unicode support.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2118
diff changeset
13005 case DW_FEATURE_UTF8_UNICODE:
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
13006 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: 2365
diff changeset
13007 case DW_FEATURE_TREE:
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
13008 return DW_ERROR_GENERAL;
2506
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13009 #ifdef GDK_WINDOWING_X11
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13010 case DW_FEATURE_WINDOW_PLACEMENT:
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13011 {
2749
1f2c4f7aca4b GTK2/3: Fix warnings calling pthread_setspecific() with a non-pointer value
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2744
diff changeset
13012 int _dw_locked_by_me = FALSE, retval = DW_FEATURE_UNSUPPORTED;
2506
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13013 GdkDisplay *display;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13014
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13015 DW_MUTEX_LOCK;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13016 display = gdk_display_get_default();
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13017
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13018 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: 2471
diff changeset
13019 retval = DW_ERROR_GENERAL;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13020 DW_MUTEX_UNLOCK;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13021 return retval;
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13022 }
fa976a5bc7bd Add DW_FEATURE_WINDOW_PLACEMENT for platforms supporting arbitrary window placement.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2471
diff changeset
13023 #endif
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
13024 /* These features are supported and configurable */
2997
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
13025 case DW_FEATURE_RENDER_SAFE:
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
13026 {
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
13027 if(state == DW_FEATURE_ENABLED || state == DW_FEATURE_DISABLED)
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
13028 {
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
13029 _dw_render_safe_mode = state;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
13030 return DW_ERROR_NONE;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
13031 }
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
13032 return DW_ERROR_GENERAL;
8450b87e960c GTK2/3/4: Implement DW_FEATURE_RENDER_SAFE. GTK2: Disabled by default.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2990
diff changeset
13033 }
2091
68f1924fdd13 Restructure feature switch so fallback return is in the default case.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2090
diff changeset
13034 default:
68f1924fdd13 Restructure feature switch so fallback return is in the default case.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2090
diff changeset
13035 return DW_FEATURE_UNSUPPORTED;
2090
cdb94c6fd611 Added initial implmentation of dw_feature_get/set() on all platforms.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2088
diff changeset
13036 }
2091
68f1924fdd13 Restructure feature switch so fallback return is in the default case.
bsmith@81767d24-ef19-dc11-ae90-00e081727c95
parents: 2090
diff changeset
13037 }