Sun, 15 Mar 2026 12:06:03 +0100
copy appname in ui_init
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
1 | /* |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
3 | * |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
4 | * Copyright 2023 Olaf Wintermann. All rights reserved. |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
5 | * |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
8 | * |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
11 | * |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
15 | * |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
27 | */ |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
28 | |
|
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
29 | #include "pch.h" |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
30 | |
|
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
31 | #include "toolkit.h" |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
32 | |
|
179
34f4d78647be
add ui common to vs build system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
33 | #include <cx/allocator.h> |
|
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
34 | #include <cx/mempool.h> |
|
179
34f4d78647be
add ui common to vs build system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
177
diff
changeset
|
35 | |
|
1075
be89ffebd4f3
copy appname in ui_init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
956
diff
changeset
|
36 | #include <stdlib.h> |
|
be89ffebd4f3
copy appname in ui_init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
956
diff
changeset
|
37 | #include <string.h> |
|
be89ffebd4f3
copy appname in ui_init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
956
diff
changeset
|
38 | |
|
189
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
39 | #include "../common/context.h" |
|
232
e2b33055113f
fix list binding not copied correctly when attaching a document
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
229
diff
changeset
|
40 | #include "../common/document.h" |
|
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
41 | #include "../common/toolbar.h" |
|
379
958bae372271
implement ui_dialog_window (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
373
diff
changeset
|
42 | #include "../common/properties.h" |
|
956
4cdfbfd2038d
move startup/exit func stuff to common
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
795
diff
changeset
|
43 | #include "../common/app.h" |
|
189
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
44 | |
|
213
7e39db525fd9
add icons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
45 | #include "icons.h" |
|
7e39db525fd9
add icons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
212
diff
changeset
|
46 | |
|
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
47 | #include "MainWindow.xaml.h" |
|
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
48 | |
|
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
49 | #include "App.xaml.h" |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
50 | |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
51 | using namespace winrt; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
52 | using namespace Microsoft::UI::Xaml; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
53 | using namespace Microsoft::UI::Xaml::Controls; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
54 | using namespace Microsoft::UI::Xaml::XamlTypeInfo; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
55 | using namespace Microsoft::UI::Xaml::Markup; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
56 | using namespace Windows::UI::Xaml::Interop; |
|
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
57 | using namespace winrt::Windows::Foundation; |
|
234
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
58 | using namespace Windows::UI::Core; |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
59 | |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
60 | static const char* application_name; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
61 | |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
62 | static ui_callback appclose_fnc; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
63 | |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
64 | static void* appclose_udata; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
65 | |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
66 | |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
67 | static UiObject* active_window; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
68 | |
|
234
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
69 | static winrt::Microsoft::UI::Dispatching::DispatcherQueue uiDispatcherQueue = { nullptr }; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
70 | |
|
209
770b3548906c
use generated App class (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
71 | void ui_app_run_startup() { |
|
234
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
72 | uiDispatcherQueue = winrt::Microsoft::UI::Dispatching::DispatcherQueue::GetForCurrentThread(); |
|
956
4cdfbfd2038d
move startup/exit func stuff to common
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
795
diff
changeset
|
73 | uic_application_startup(NULL); |
|
209
770b3548906c
use generated App class (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
74 | } |
| 173 | 75 | |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
76 | class App : public ApplicationT<App, IXamlMetadataProvider> { |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
77 | public: |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
78 | void OnLaunched(LaunchActivatedEventArgs const&) { |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
79 | Resources().MergedDictionaries().Append(XamlControlsResources()); |
|
956
4cdfbfd2038d
move startup/exit func stuff to common
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
795
diff
changeset
|
80 | uic_application_startup(NULL); |
|
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
81 | |
|
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
82 | //auto window = make<winui::implementation::MainWindow>(); |
|
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
83 | //window.Activate(); |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
84 | } |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
85 | IXamlType GetXamlType(TypeName const& type) { |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
86 | return provider.GetXamlType(type); |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
87 | } |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
88 | IXamlType GetXamlType(hstring const& fullname) { |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
89 | return provider.GetXamlType(fullname); |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
90 | } |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
91 | com_array<XmlnsDefinition> GetXmlnsDefinitions() { |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
92 | return provider.GetXmlnsDefinitions(); |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
93 | } |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
94 | private: |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
95 | XamlControlsXamlMetaDataProvider provider; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
96 | }; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
97 | |
|
183
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
98 | UiWidget::UiWidget(winrt::Microsoft::UI::Xaml::UIElement& elm) : uielement(elm) {} |
|
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
99 | |
|
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
100 | extern "C" void destroy_ui_window_wrapper(void* ptr) { |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
101 | UiWindow* win = (UiWindow*)ptr; |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
102 | delete win; |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
103 | } |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
104 | |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
105 | extern "C" void destroy_ui_widget_wrapper(void* ptr) { |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
106 | UiWidget* widget = (UiWidget*)ptr; |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
107 | delete widget; |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
108 | } |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
109 | |
|
212
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
110 | extern "C" void destroy_ui_container_wrapper(void* ptr) { |
|
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
111 | UiContainer* ctn = (UiContainer*)ptr; |
|
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
112 | delete ctn; |
|
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
113 | } |
|
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
114 | |
|
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
115 | void ui_context_add_window_destructor(UiContext* ctx, UiWindow* win) { |
|
212
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
116 | cxMempoolRegister(ctx->mp, win, destroy_ui_window_wrapper); |
|
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
117 | } |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
118 | |
|
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
119 | void ui_context_add_widget_destructor(UiContext* ctx, UiWidget* widget) { |
|
212
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
120 | cxMempoolRegister(ctx->mp, widget, destroy_ui_widget_wrapper); |
|
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
121 | } |
|
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
122 | |
|
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
123 | void ui_context_add_container_destructor(UiContext* ctx, UiContainer *container) { |
|
ad5c74af14c4
add cleanup code for wrapper objects (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
209
diff
changeset
|
124 | cxMempoolRegister(ctx->mp, container, destroy_ui_container_wrapper); |
|
184
8c9b4b28aaa9
implement ui_button (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
183
diff
changeset
|
125 | } |
|
183
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
126 | |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
127 | |
|
189
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
128 | UiEvent ui_create_int_event(UiObject* obj, int64_t i) { |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
129 | UiEvent evt; |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
130 | evt.obj = obj; |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
131 | evt.window = obj->window; |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
132 | evt.document = obj->ctx->document; |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
133 | evt.eventdata = nullptr; |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
134 | evt.intval = i; |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
135 | return evt; |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
136 | } |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
137 | |
|
4daddc326877
add onchange event for toggle buttons (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
184
diff
changeset
|
138 | |
|
207
93b9f502cb88
add toolbar appmenu and menu buttons
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
205
diff
changeset
|
139 | #include <MddBootstrap.h> |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
140 | |
| 208 | 141 | void ui_appsdk_bootstrap(void) { |
| 142 | const UINT32 majorMinorVersion{ 0x00010002 }; | |
| 143 | PCWSTR versionTag{ L"" }; | |
| 144 | const PACKAGE_VERSION minVersion{}; | |
| 145 | ||
| 146 | const HRESULT hr = MddBootstrapInitialize(majorMinorVersion, versionTag, minVersion); | |
| 147 | if (FAILED(hr)) { | |
| 148 | exit(102); | |
| 149 | } | |
| 150 | } | |
| 151 | ||
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
152 | void ui_init(const char* appname, int argc, char** argv) { |
|
1075
be89ffebd4f3
copy appname in ui_init
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
956
diff
changeset
|
153 | application_name = appname ? strdup(appname) : NULL; |
|
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
154 | |
| 208 | 155 | //ui_appsdk_bootstrap(); |
| 156 | ||
|
229
a952760955b4
add menu item list (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
221
diff
changeset
|
157 | uic_init_global_context(); |
|
388
473c03f85197
add menu builder API
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
382
diff
changeset
|
158 | uic_menu_init(); |
|
205
b1ac0dd1d38b
new winui vs project, add toolbar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
189
diff
changeset
|
159 | uic_toolbar_init(); |
|
379
958bae372271
implement ui_dialog_window (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
373
diff
changeset
|
160 | |
|
958bae372271
implement ui_dialog_window (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
373
diff
changeset
|
161 | uic_load_app_properties(); |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
162 | } |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
163 | |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
164 | const char* ui_appname() { |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
165 | return application_name; |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
166 | } |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
167 | |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
168 | void ui_main() { |
|
221
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
169 | /* |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
170 | init_apartment(); |
|
209
770b3548906c
use generated App class (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
171 | //Application::Start([](auto&&) {make<App>(); }); |
|
770b3548906c
use generated App class (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
172 | |
|
770b3548906c
use generated App class (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
173 | ::winrt::Microsoft::UI::Xaml::Application::Start( |
|
770b3548906c
use generated App class (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
174 | [](auto&&) |
|
770b3548906c
use generated App class (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
175 | { |
|
770b3548906c
use generated App class (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
176 | ::winrt::make<::winrt::winui::implementation::App>(); |
|
770b3548906c
use generated App class (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
208
diff
changeset
|
177 | }); |
|
221
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
178 | */ |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
179 | { |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
180 | void (WINAPI * pfnXamlCheckProcessRequirements)(); |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
181 | auto module = ::LoadLibrary(L"Microsoft.ui.xaml.dll"); |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
182 | if (module) |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
183 | { |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
184 | pfnXamlCheckProcessRequirements = reinterpret_cast<decltype(pfnXamlCheckProcessRequirements)>(GetProcAddress(module, "XamlCheckProcessRequirements")); |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
185 | if (pfnXamlCheckProcessRequirements) |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
186 | { |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
187 | (*pfnXamlCheckProcessRequirements)(); |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
188 | } |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
189 | |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
190 | ::FreeLibrary(module); |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
191 | } |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
192 | } |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
193 | |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
194 | winrt::init_apartment(winrt::apartment_type::single_threaded); |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
195 | ::winrt::Microsoft::UI::Xaml::Application::Start( |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
196 | [](auto&&) |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
197 | { |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
198 | ::winrt::make<::winrt::winui::implementation::App>(); |
|
a82d9beaa94a
add semi-functional pathbar (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
213
diff
changeset
|
199 | }); |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
200 | } |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
201 | |
|
183
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
202 | class UiWin { |
|
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
203 | public: |
|
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
204 | Window window; |
|
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
205 | }; |
|
3ce2eb11913b
create WinUI wrapper classes for usage in UiObject and widget creation functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
181
diff
changeset
|
206 | |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
207 | void ui_show(UiObject* obj) { |
|
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
208 | if (obj->wobj) { |
|
477
be34594ee942
implement window reference counting (WINUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
209 | if (!obj->wobj->window.Visible()) { |
|
be34594ee942
implement window reference counting (WINUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
210 | obj->wobj->window.Activate(); |
|
be34594ee942
implement window reference counting (WINUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
211 | obj->ref++; |
|
be34594ee942
implement window reference counting (WINUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
212 | } |
|
379
958bae372271
implement ui_dialog_window (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
373
diff
changeset
|
213 | } else if(obj->widget && obj->widget->Show) { |
|
958bae372271
implement ui_dialog_window (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
373
diff
changeset
|
214 | obj->widget->Show(); |
|
477
be34594ee942
implement window reference counting (WINUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
388
diff
changeset
|
215 | obj->ref++; // TODO: should we check if the widget is already visible? |
|
181
c52d88ea020b
redefine UIWIDGET, remove widget abstraction class (WinUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
179
diff
changeset
|
216 | } |
|
177
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
217 | } |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
218 | |
|
e79a60b3a7cb
minimal working winui app
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
173
diff
changeset
|
219 | void ui_close(UiObject* obj) { |
|
373
2eede3d98aba
implement windows condvar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
220 | if (obj->wobj) { |
|
2eede3d98aba
implement windows condvar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
221 | obj->wobj->window.Close(); |
|
2eede3d98aba
implement windows condvar
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
222 | } |
|
234
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
223 | } |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
224 | |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
225 | static void ui_job_thread(UiJob* job) { |
|
235
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
226 | if (!job->job_func(job->job_data) && job->finish_callback) { |
|
234
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
227 | bool isQueued = uiDispatcherQueue.TryEnqueue([job]() |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
228 | { |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
229 | UiEvent event; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
230 | event.obj = job->obj; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
231 | event.window = job->obj->window; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
232 | event.document = job->obj->ctx->document; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
233 | event.intval = 0; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
234 | event.eventdata = NULL; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
235 | job->finish_callback(&event, job->finish_data); |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
236 | delete job; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
237 | }); |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
238 | if (!isQueued) { |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
239 | // TODO: error or try again? |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
240 | exit(-1); |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
241 | } |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
242 | } |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
243 | else { |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
244 | delete job; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
245 | } |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
246 | } |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
247 | |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
248 | UIEXPORT void ui_job(UiObject* obj, ui_threadfunc tf, void* td, ui_callback f, void* fd) { |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
249 | UiJob* job = new UiJob; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
250 | job->obj = obj; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
251 | job->job_func = tf; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
252 | job->job_data = td; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
253 | job->finish_callback = f; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
254 | job->finish_data = fd; |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
255 | |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
256 | std::thread jobThread(ui_job_thread, job); |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
257 | jobThread.detach(); |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
258 | } |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
259 | |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
260 | UIEXPORT void ui_call_mainthread(ui_threadfunc tf, void* td) { |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
261 | bool isQueued = uiDispatcherQueue.TryEnqueue([tf, td]() |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
262 | { |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
263 | (void)tf(td); |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
264 | }); |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
265 | if (!isQueued) { |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
266 | // TODO: error or try again? |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
267 | exit(-1); |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
268 | } |
|
9036b346cd66
implement ui_job() and add ui_call_mainthread (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
232
diff
changeset
|
269 | } |
|
235
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
270 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
271 | static UiJob kill_job; // &kill_job indicates to stop the thread |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
272 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
273 | static void ui_threadpool_run(UiThreadpool* pool) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
274 | for (;;) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
275 | UiJob* job = pool->GetJob(); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
276 | if (job == &kill_job) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
277 | return; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
278 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
279 | else if (job) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
280 | ui_job_thread(job); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
281 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
282 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
283 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
284 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
285 | UiThreadpool::UiThreadpool(int nthreads) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
286 | for (int i = 0; i < nthreads; i++) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
287 | std::thread thread(ui_threadpool_run, this); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
288 | thread.detach(); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
289 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
290 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
291 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
292 | void UiThreadpool::EnqueueJob(UiJob* job) |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
293 | { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
294 | std::unique_lock<std::mutex> lock(mutex); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
295 | queue.push(job); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
296 | lock.unlock(); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
297 | condition.notify_one(); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
298 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
299 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
300 | UiJob* UiThreadpool::GetJob() { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
301 | std::unique_lock<std::mutex> lock(mutex); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
302 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
303 | UiJob* job = nullptr; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
304 | while (!job) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
305 | if (queue.empty()) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
306 | condition.wait(lock); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
307 | continue; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
308 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
309 | else |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
310 | { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
311 | job = queue.front(); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
312 | queue.pop(); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
313 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
314 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
315 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
316 | return job; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
317 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
318 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
319 | UIEXPORT UiThreadpool* ui_threadpool_create(int nthreads) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
320 | return new UiThreadpool(nthreads); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
321 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
322 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
323 | UIEXPORT void ui_threadpool_destroy(UiThreadpool* pool) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
324 | // TODO |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
325 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
326 | |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
327 | UIEXPORT void ui_threadpool_job(UiThreadpool* pool, UiObject* obj, ui_threadfunc tf, void* td, ui_callback f, void* fd) { |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
328 | UiJob* job = new UiJob; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
329 | job->obj = obj; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
330 | job->job_func = tf; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
331 | job->job_data = td; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
332 | job->finish_callback = f; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
333 | job->finish_data = fd; |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
334 | pool->EnqueueJob(job); |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
335 | } |
|
9c79f00fbf36
add threadpool (WinUI3)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
234
diff
changeset
|
336 | |
|
382
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
337 | |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
338 | |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
339 | void ui_set_widget_groups(UiContext *ctx, UIWIDGET widget, const int *groups) { |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
340 | if(!groups) { |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
341 | return; |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
342 | } |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
343 | size_t ngroups = uic_group_array_size(groups); |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
344 | ui_set_widget_ngroups(ctx, widget, groups, ngroups); |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
345 | } |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
346 | |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
347 | void ui_set_widget_ngroups(UiContext *ctx, UIWIDGET widget, const int *groups, size_t ngroups) { |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
348 | if(ngroups > 0) { |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
349 | uic_add_group_widget_i(ctx, widget, (ui_enablefunc)ui_set_enabled, groups, ngroups); |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
350 | ui_set_enabled(widget, FALSE); |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
351 | } |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
352 | } |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
353 | |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
354 | |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
355 | UIEXPORT void ui_set_enabled(UIWIDGET widget, int enabled) { |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
356 | Control ctrl = widget->uielement.as<Control>(); |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
357 | if (ctrl) { |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
358 | ctrl.IsEnabled(enabled); |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
359 | } |
|
de653b07050b
implement ui groups/states (WINUI)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
379
diff
changeset
|
360 | } |