Sun, 07 Dec 2025 12:12:02 +0100
use new common app funcs in cocoa
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
4 | * Copyright 2024 Olaf Wintermann. All rights reserved. |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
29 | #import "toolkit.h" |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
31 | #include "../common/document.h" |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
32 | #include "../common/properties.h" |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
33 | #include "../common/menu.h" |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
34 | #include "../common/toolbar.h" |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
35 | #include "../common/threadpool.h" |
|
963
90b349cdd47f
use new common app funcs in cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
870
diff
changeset
|
36 | #include "../common/app.h" |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | |
|
687
d43b4fcd3d8c
add support for toolbar icons (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
677
diff
changeset
|
38 | #import "image.h" |
|
541
63289f61fb7f
add basic code structure for cocoa menu implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
404
diff
changeset
|
39 | #import "menu.h" |
|
677
04bcb1930fbf
semi functional toolbar (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
40 | #import "Toolbar.h" |
|
721
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
41 | #import "UiThread.h" |
|
541
63289f61fb7f
add basic code structure for cocoa menu implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
404
diff
changeset
|
42 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
43 | #import "AppDelegate.h" |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
45 | static const char *application_name; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
46 | |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
47 | static int app_argc; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
48 | static const char **app_argv; |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | |
|
674
51670b0bc625
implement ui_app_exit_on_shutdown for Motif, Qt, Cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
50 | static UiBool exit_on_shutdown; |
|
29
c96169444d88
added locale support (Cocoa) and ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
26
diff
changeset
|
51 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
52 | /* ------------------- App Init / Event Loop functions ------------------- */ |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | |
| 870 | 54 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
55 | void ui_init(const char *appname, int argc, char **argv) { |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
56 | application_name = appname; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
57 | app_argc = argc; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
58 | app_argv = (const char**)argv; |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
60 | uic_init_global_context(); |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
61 | |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
62 | uic_menu_init(); |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
63 | uic_toolbar_init(); |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
64 | |
|
24
06bceda81a03
added application properties
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
23
diff
changeset
|
65 | uic_load_app_properties(); |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
66 | |
| 870 | 67 | NSApplication *app = [NSApplication sharedApplication]; |
| 68 | //[app setActivationPolicy:NSApplicationActivationPolicyRegular]; | |
| 69 | ||
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
70 | //[NSBundle loadNibNamed:@"MainMenu" owner:NSApp ]; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
71 | //[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:&topLevelObjects]; |
|
677
04bcb1930fbf
semi functional toolbar (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
72 | |
|
687
d43b4fcd3d8c
add support for toolbar icons (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
677
diff
changeset
|
73 | ui_icon_init(); |
|
677
04bcb1930fbf
semi functional toolbar (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
674
diff
changeset
|
74 | ui_toolbar_init(); |
|
687
d43b4fcd3d8c
add support for toolbar icons (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
677
diff
changeset
|
75 | |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | } |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
78 | const char* ui_appname() { |
|
25
78ae3efe463f
added groups for toolbar items (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
79 | return application_name; |
|
78ae3efe463f
added groups for toolbar items (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
80 | } |
|
78ae3efe463f
added groups for toolbar items (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
24
diff
changeset
|
81 | |
|
674
51670b0bc625
implement ui_app_exit_on_shutdown for Motif, Qt, Cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
82 | void ui_app_exit_on_shutdown(UiBool exitapp) { |
|
51670b0bc625
implement ui_app_exit_on_shutdown for Motif, Qt, Cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
83 | exit_on_shutdown = exitapp; |
|
51670b0bc625
implement ui_app_exit_on_shutdown for Motif, Qt, Cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
84 | } |
|
51670b0bc625
implement ui_app_exit_on_shutdown for Motif, Qt, Cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
85 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
86 | void ui_cocoa_onstartup(void) { |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
87 | UiEvent e; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
88 | e.obj = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
89 | e.window = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
90 | e.document = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
91 | e.eventdata = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
92 | e.intval = 0; |
|
963
90b349cdd47f
use new common app funcs in cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
870
diff
changeset
|
93 | uic_application_startup(&e); |
|
26
a137277f9173
added copy & paste (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
94 | } |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
95 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
96 | void ui_cocoa_onopen(const char *file) { |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
97 | UiEvent e; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
98 | e.obj = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
99 | e.window = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
100 | e.document = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
101 | e.eventdata = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
102 | e.intval = 0; |
|
963
90b349cdd47f
use new common app funcs in cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
870
diff
changeset
|
103 | uic_application_open(&e); |
|
7
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
104 | } |
|
431dde3c5fbe
added Cocoa implementation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
105 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
106 | void ui_cocoa_onexit(void) { |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
107 | UiEvent e; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
108 | e.obj = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
109 | e.window = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
110 | e.document = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
111 | e.eventdata = NULL; |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
112 | e.intval = 0; |
|
963
90b349cdd47f
use new common app funcs in cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
870
diff
changeset
|
113 | uic_application_exit(&e); |
|
48
0b8ac9d6d473
added threads (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
31
diff
changeset
|
114 | } |
|
0b8ac9d6d473
added threads (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
31
diff
changeset
|
115 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
116 | void ui_main(void) { |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
117 | NSApplicationMain(app_argc, app_argv); |
|
674
51670b0bc625
implement ui_app_exit_on_shutdown for Motif, Qt, Cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
118 | if(exit_on_shutdown) { |
|
51670b0bc625
implement ui_app_exit_on_shutdown for Motif, Qt, Cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
119 | exit(0); |
|
51670b0bc625
implement ui_app_exit_on_shutdown for Motif, Qt, Cocoa
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
541
diff
changeset
|
120 | } |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
121 | } |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
122 | |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
123 | /* ------------------- Window Visibility functions ------------------- */ |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
124 | |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
125 | void ui_show(UiObject *obj) { |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
126 | if(obj->wobj) { |
|
864
d39301e8f962
add dialog window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
851
diff
changeset
|
127 | id<UiToplevelObject> window = (__bridge id<UiToplevelObject>)obj->wobj; |
|
851
367b2bbbc07e
add tabview (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
800
diff
changeset
|
128 | |
|
864
d39301e8f962
add dialog window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
851
diff
changeset
|
129 | if(![window getIsVisible]) { |
|
851
367b2bbbc07e
add tabview (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
800
diff
changeset
|
130 | obj->ref++; |
|
367b2bbbc07e
add tabview (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
800
diff
changeset
|
131 | } |
|
367b2bbbc07e
add tabview (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
800
diff
changeset
|
132 | |
|
864
d39301e8f962
add dialog window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
851
diff
changeset
|
133 | [window setVisible:YES]; |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
134 | } |
|
48
0b8ac9d6d473
added threads (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
31
diff
changeset
|
135 | } |
|
0b8ac9d6d473
added threads (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
31
diff
changeset
|
136 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
137 | void ui_close(UiObject *obj) { |
|
851
367b2bbbc07e
add tabview (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
800
diff
changeset
|
138 | // TODO: unref, window close, ... |
|
864
d39301e8f962
add dialog window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
851
diff
changeset
|
139 | if(obj->wobj) { |
|
d39301e8f962
add dialog window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
851
diff
changeset
|
140 | id<UiToplevelObject> window = (__bridge id<UiToplevelObject>)obj->wobj; |
|
d39301e8f962
add dialog window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
851
diff
changeset
|
141 | [window setVisible:NO]; |
|
d39301e8f962
add dialog window (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
851
diff
changeset
|
142 | } |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
143 | } |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
144 | |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
145 | /* ------------------- Job Control / Threadpool functions ------------------- */ |
|
48
0b8ac9d6d473
added threads (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
31
diff
changeset
|
146 | |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
147 | void ui_job(UiObject *obj, ui_threadfunc tf, void *td, ui_callback f, void *fd) { |
|
720
6fa3c629000f
implement ui_job (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
148 | UiThread *thread = [[UiThread alloc]init:obj jobfunc:tf jobdata:td]; |
|
6fa3c629000f
implement ui_job (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
149 | thread.finish_callback = f; |
|
6fa3c629000f
implement ui_job (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
150 | thread.finish_userdata = fd; |
|
6fa3c629000f
implement ui_job (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
151 | [thread start]; |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
152 | } |
|
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
153 | |
|
721
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
154 | @implementation UiAppCallback |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
155 | |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
156 | - (id) initWithCallback:(ui_threadfunc)func userdata:(void*)userdata { |
|
868
be3df094f8db
fix cocoa makefile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
864
diff
changeset
|
157 | _callback = func; |
|
be3df094f8db
fix cocoa makefile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
864
diff
changeset
|
158 | _userdata = userdata; |
|
721
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
159 | return self; |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
160 | } |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
161 | |
|
721
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
162 | - (void) callMainThread { |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
163 | [self performSelectorOnMainThread:@selector(mainThread:) |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
164 | withObject:nil |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
165 | waitUntilDone:NO]; |
|
404
384f6d1f5784
add first working cocoa code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
49
diff
changeset
|
166 | } |
|
721
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
167 | |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
168 | - (void) mainThread:(id)n { |
|
868
be3df094f8db
fix cocoa makefile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
864
diff
changeset
|
169 | if(_callback) { |
|
be3df094f8db
fix cocoa makefile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
864
diff
changeset
|
170 | _callback(_userdata); |
|
be3df094f8db
fix cocoa makefile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
864
diff
changeset
|
171 | } |
|
721
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
172 | } |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
173 | |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
174 | @end |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
175 | |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
176 | void ui_call_mainthread(ui_threadfunc tf, void* td) { |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
177 | UiAppCallback *cb = [[UiAppCallback alloc]initWithCallback:tf userdata:td]; |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
178 | [cb callMainThread]; |
|
e9f655afc7ed
implement ui_call_mainthread (Cocoa)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
720
diff
changeset
|
179 | } |