ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.206 by root, Mon May 15 17:45:29 2006 UTC vs.
Revision 1.406 by root, Sat Jul 21 23:17:35 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
25 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
26 34
27 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
28 36
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 37 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 38
31 $TOOLTIP->set_tooltip_from ($widget); 39 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 40 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 41 }
43 42
44 return; 43 return;
45 } 44 }
46 } 45 }
47 } 46 }
48 47
49 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51});
52
53sub get_layout {
54 my $layout;
55
56 for (grep { $_->{name} } values %WIDGET) {
57 my $win = $layout->{$_->{name}} = { };
58
59 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63
64 $win->{show} = $_->{visible} && $_->{is_toplevel};
65 }
66
67 $layout
68}
69
70sub set_layout {
71 my ($layout) = @_;
72
73 $LAYOUT = $layout;
51} 74}
52 75
53# class methods for events 76# class methods for events
54sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 78 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 79 if $FOCUS;
57} 80}
58 81
59sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 83 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 84 if $FOCUS;
85}
86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
62} 98}
63 99
64sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
65 my ($ev) = @_; 101 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
67 103
68 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
69 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
70 108
71 $GRAB = $widget; 109 $GRAB = $widget;
72 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
73 111
74 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
75 } 113 }
76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 114
79 if ($GRAB) { 115 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y); 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
82 } 128 }
83} 129}
84 130
85sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
86 my ($ev) = @_; 132 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y});
88 133
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
90 135
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 137
93 if ($GRAB) { 138 $GRAB->emit (button_up => $ev)
94 ($x, $y) = $GRAB->coord2local ($x, $y); 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 140
98 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 143 $grab->update if $grab;
101 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
102 145
103 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
104 } 148 }
105} 149}
106 150
107sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
108 my ($ev) = @_; 152 my ($ev) = @_;
109 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
110 154
111 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
112 156
113 if ($widget != $HOVER) { 157 check_hover $widget;
114 my $hover = $HOVER; $HOVER = $widget;
115 158
116 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
117 $HOVER->update if $HOVER && $HOVER->{can_hover};
118
119 check_tooltip;
120 }
121
122 if ($HOVER) { 160 if $HOVER;
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
126} 161}
127 162
128# convert position array to integers 163# convert position array to integers
129sub harmonize { 164sub harmonize {
130 my ($vals) = @_; 165 my ($vals) = @_;
… …
136 $rem += $_ - $i; 171 $rem += $_ - $i;
137 $_ = $i; 172 $_ = $i;
138 } 173 }
139} 174}
140 175
176sub full_refresh {
177 # make a copy, otherwise for complains about freed values.
178 my @widgets = values %WIDGET;
179
180 $_->update
181 for @widgets;
182}
183
184sub reconfigure_widgets {
185 # make a copy, otherwise C<for> complains about freed values.
186 my @widgets = values %WIDGET;
187
188 $_->reconfigure
189 for @widgets;
190}
191
141# call when resolution changes etc. 192# call when resolution changes etc.
142sub rescale_widgets { 193sub rescale_widgets {
143 my ($sx, $sy) = @_; 194 my ($sx, $sy) = @_;
144 195
145 for my $widget (values %WIDGET) { 196 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 197 if ($widget->{is_toplevel}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 203 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 204 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 205 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 206 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 207
208 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
209 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
210
155 } 211 }
156
157 $widget->reconfigure;
158 } 212 }
213
214 reconfigure_widgets;
159} 215}
160 216
161############################################################################# 217#############################################################################
162 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
163package CFClient::UI::Base; 227package CFPlus::UI::Base;
164 228
165use strict; 229use strict;
166 230
167use CFClient::OpenGL; 231use CFPlus::OpenGL;
168 232
169sub new { 233sub new {
170 my $class = shift; 234 my $class = shift;
171 235
172 my $self = bless { 236 my $self = bless {
173 x => 0, 237 x => "center",
174 y => 0, 238 y => "center",
175 z => 0, 239 z => 0,
240 w => undef,
241 h => undef,
176 can_events => 1, 242 can_events => 1,
177 @_ 243 @_
178 }, $class; 244 }, $class;
179 245
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
247
180 for (keys %$self) { 248 for (keys %$self) {
181 if (/^connect_(.*)$/) { 249 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
183 } 251 }
184 } 252 }
185 253
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
259
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262
263 $self->show if $layout->{show};
264 }
187 265
188 $self 266 $self
189} 267}
190 268
191sub destroy { 269sub destroy {
192 my ($self) = @_; 270 my ($self) = @_;
193 271
194 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
195 %$self = (); 274 %$self = ();
196} 275}
197 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
198sub show { 281sub show {
199 my ($self) = @_; 282 my ($self) = @_;
200 283
201 return if $self->{parent}; 284 return if $self->{parent};
202 285
203 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
204} 287}
205 288
206sub hide { 289sub set_visible {
207 my ($self) = @_; 290 my ($self) = @_;
291
292 return if $self->{visible};
293
294 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1;
296
297 $self->emit (visibility_change => 1);
298
299 $self->realloc if !exists $self->{req_w};
300
301 $_->set_visible for $self->children;
302}
303
304sub set_invisible {
305 my ($self) = @_;
306
307 return unless $self->{visible};
308
309 $_->set_invisible for $self->children;
310
311 delete $self->{visible};
312 delete $self->{root};
208 313
209 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
211 316
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
318 if $TOOLTIP->{owner} == $self;
319
320 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0);
322}
323
324sub set_visibility {
325 my ($self, $visible) = @_;
326
327 return if $self->{visible} == $visible;
328
329 $visible ? $self->show
330 : $self->hide;
331}
332
333sub toggle_visibility {
334 my ($self) = @_;
335
336 $self->{visible}
337 ? $self->hide
338 : $self->show;
339}
340
341sub hide {
342 my ($self) = @_;
343
344 $self->set_invisible;
345
212 $self->{parent}->remove ($self) 346 $self->{parent}->remove ($self)
213 if $self->{parent}; 347 if $self->{parent};
214} 348}
215 349
216sub move { 350sub move_abs {
217 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
218 352
219 $self->{x} = int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
220 $self->{y} = int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
221 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
222 356
223 $self->update; 357 $self->update;
224} 358}
225 359
226sub set_size { 360sub set_size {
227 my ($self, $w, $h) = @_; 361 my ($self, $w, $h) = @_;
228 362
229 $self->{user_w} = $w; 363 $self->{force_w} = $w;
230 $self->{user_h} = $h; 364 $self->{force_h} = $h;
231 365
232 $self->check_size; 366 $self->realloc;
233} 367}
234 368
235sub size_request { 369sub size_request {
236 require Carp; 370 require Carp;
237 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
238} 372}
239 373
374sub baseline_shift {
375 0
376}
377
240sub configure { 378sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
242 380
243 if ($self->{aspect}) { 381 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h);
383
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
246 386
247 # use alignment to adjust x, y 387 # use alignment to adjust x, y
248 388
249 $x += int +($w - $w2) * 0.5; 389 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 390 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 391 }
254 392
255 if ($self->{x} != $x || $self->{y} != $y) { 393 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 394 $self->{x} = $x;
257 $self->{y} = $y; 395 $self->{y} = $y;
258 $self->update; 396 $self->update;
259 } 397 }
260 398
261 if ($self->{w} != $w || $self->{h} != $h) { 399 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 400 return unless $self->{visible};
263 }
264}
265 401
266sub size_allocate { 402 $self->{alloc_w} = $w;
267 # nothing to be done 403 $self->{alloc_h} = $h;
268}
269 404
270sub reconfigure { 405 $self->{root}{size_alloc}{$self+0} = $self;
271 my ($self) = @_; 406 }
272
273 $self->check_size (1);
274 $self->update;
275} 407}
276 408
277sub children { 409sub children {
410 # nop
411}
412
413sub visible_children {
414 $_[0]->children
278} 415}
279 416
280sub set_max_size { 417sub set_max_size {
281 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
282 419
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 420 $self->{max_w} = int $w if defined $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 421 $self->{max_h} = int $h if defined $h;
422
423 $self->realloc;
424}
425
426sub set_tooltip {
427 my ($self, $tooltip) = @_;
428
429 $tooltip =~ s/^\s+//;
430 $tooltip =~ s/\s+$//;
431
432 return if $self->{tooltip} eq $tooltip;
433
434 $self->{tooltip} = $tooltip;
435
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
439 }
285} 440}
286 441
287# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
288sub coord2local { 443sub coord2local {
289 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
290 445
446 Carp::confess unless $self->{parent};#d#
447
291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
292} 449}
293 450
294# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
295sub coord2global { 452sub coord2global {
296 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
297 454
455 Carp::confess unless $self->{parent};#d#
456
298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
299} 458}
300 459
301sub focus_in { 460sub invoke_focus_in {
302 my ($self) = @_; 461 my ($self) = @_;
303 462
304 return if $FOCUS == $self; 463 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
306 465
307 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
308 467
309 $self->emit (focus_in => $focus); 468 $self->update;
310 469
311 $focus->update if $focus; 470 0
312 $FOCUS->update;
313} 471}
314 472
315sub focus_out { 473sub invoke_focus_out {
316 my ($self) = @_; 474 my ($self) = @_;
317 475
318 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
319 477
320 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
321 479
322 $self->emit (focus_out => $focus); 480 $self->update;
323 481
324 $focus->update if $focus; #? 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
325} 483 unless $FOCUS;
326 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
327sub mouse_motion { } 495sub invoke_mouse_motion { 0 }
328sub button_up { } 496sub invoke_button_up { 0 }
329sub key_down { } 497sub invoke_key_down { 0 }
330sub key_up { } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
331 500
332sub button_down { 501sub invoke_button_down {
333 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
334 503
335 $self->focus_in; 504 $self->grab_focus;
336}
337 505
338sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 506 0
339sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 507}
340sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
341sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
342sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
343 508
344sub draw { 509sub connect {
510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
345 my ($self) = @_; 521 my ($self, $signal) = @_;
346 522
347 return unless $self->{h} && $self->{w}; 523 delete $self->{signal_cb}{$signal};
348
349 glPushMatrix;
350 glTranslate $self->{x}, $self->{y}, 0;
351 $self->_draw;
352 glPopMatrix;
353
354 if ($self == $HOVER && $self->{can_hover}) {
355 my ($x, $y) = @$self{qw(x y)};
356
357 glColor 1, 0.8, 0.5, 0.2;
358 glEnable GL_BLEND;
359 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
360 glBegin GL_QUADS;
361 glVertex $x , $y;
362 glVertex $x + $self->{w}, $y;
363 glVertex $x + $self->{w}, $y + $self->{h};
364 glVertex $x , $y + $self->{h};
365 glEnd;
366 glDisable GL_BLEND;
367 }
368
369 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix;
371 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0;
375 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h};
378 glEnd;
379 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 }
382} 524}
383 525
384sub _draw { 526my %has_coords = (
385 my ($self) = @_; 527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
386 532
387 warn "no draw defined for $self\n"; 533sub emit {
388} 534 my ($self, $signal, @args) = @_;
389 535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
390sub find_widget { 556#sub find_widget {
391 my ($self, $x, $y) = @_; 557# in .xs
392
393 return () unless $self->{can_events};
394
395 return $self
396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
398
399 ()
400}
401 558
402sub set_parent { 559sub set_parent {
403 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
404 561
405 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
406 563 $self->set_visible if $parent->{visible};
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
410} 564}
411 565
412sub check_size { 566sub realloc {
413 my ($self, $forced) = @_; 567 my ($self) = @_;
414 568
415 $self->{force_alloc} = 1 if $forced; 569 if ($self->{visible}) {
416 $CFClient::UI::ROOT->{check_size}{$self} = $self; 570 return if $self->{root}{realloc}{$self+0};
571
572 $self->{root}{realloc}{$self+0} = $self;
573 $self->{root}->update;
574 } else {
575 delete $self->{req_w};
576 delete $self->{req_h};
577 }
417} 578}
418 579
419sub update { 580sub update {
420 my ($self) = @_; 581 my ($self) = @_;
421 582
422 $self->{parent}->update 583 $self->{parent}->update
423 if $self->{parent}; 584 if $self->{parent};
424} 585}
425 586
426sub connect { 587sub reconfigure {
427 my ($self, $signal, $cb) = @_; 588 my ($self) = @_;
428 589
429 push @{ $self->{signal_cb}{$signal} }, $cb; 590 $self->realloc;
591 $self->update;
430} 592}
431 593
432sub emit { 594# using global variables seems a bit hacky, but passing through all drawing
433 my ($self, $signal, @args) = @_; 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
434 597
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 598#sub draw {
599#CFPlus.xs
600
601sub _draw {
602 my ($self) = @_;
603
604 warn "no draw defined for $self\n";
436} 605}
437 606
438sub DESTROY { 607sub DESTROY {
439 my ($self) = @_; 608 my ($self) = @_;
440 609
610 return if CFPlus::in_destruct;
611
612 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
441 delete $WIDGET{$self+0}; 615 delete $WIDGET{$self+0};
442 #$self->deactivate;
443} 616}
444 617
445############################################################################# 618#############################################################################
446 619
447package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
448 621
449our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
450 623
451use strict; 624use strict;
452use CFClient::OpenGL; 625use CFPlus::OpenGL;
453 626
454sub new { 627sub new {
455 my $class = shift; 628 my $class = shift;
456 629
457 # range [value, low, high, page] 630 # range [value, low, high, page]
458 631
459 $class->SUPER::new ( 632 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 633 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 634 #active_bg => [1, 1, 1, 0.5],
462 @_ 635 @_
463 ) 636 )
464} 637}
465 638
466sub _draw { 639sub _draw {
467 my ($self) = @_; 640 my ($self) = @_;
468 641
469 my ($w, $h) = @$self{qw(w h)}; 642 my $color = $FOCUS == $self && $self->{active_bg}
643 ? $self->{active_bg}
644 : $self->{bg};
470 645
471 glEnable GL_BLEND; 646 if ($color && (@$color < 4 || $color->[3])) {
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
474
475 glBegin GL_QUADS;
476 glVertex 0 , 0;
477 glVertex 0 , $h;
478 glVertex $w, $h;
479 glVertex $w, 0;
480 glEnd;
481
482 glDisable GL_BLEND;
483}
484
485#############################################################################
486
487package CFClient::UI::Empty;
488
489our @ISA = CFClient::UI::Base::;
490
491sub new {
492 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg);
494}
495
496sub size_request {
497 (0, 0)
498}
499
500sub draw { }
501
502#############################################################################
503
504package CFClient::UI::Container;
505
506our @ISA = CFClient::UI::Base::;
507
508sub new {
509 my ($class, %arg) = @_;
510
511 my $children = delete $arg{children} || [];
512
513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
518 $self->add ($_) for @$children;
519
520 $self
521}
522
523sub add {
524 my ($self, @widgets) = @_;
525
526 $_->set_parent ($self)
527 for @widgets;
528
529 use sort 'stable';
530
531 $self->{children} = [
532 sort { $a->{z} <=> $b->{z} }
533 @{$self->{children}}, @widgets
534 ];
535
536 $self->check_size (1);
537 $self->update;
538}
539
540sub children {
541 @{ $_[0]{children} }
542}
543
544sub remove {
545 my ($self, $child) = @_;
546
547 delete $child->{parent};
548 $child->hide;
549
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551
552 $self->check_size;
553 $self->update;
554}
555
556sub clear {
557 my ($self) = @_;
558
559 my $children = delete $self->{children};
560 $self->{children} = [];
561
562 for (@$children) {
563 delete $_->{parent};
564 $_->hide;
565 }
566
567 $self->check_size;
568 $self->update;
569}
570
571sub find_widget {
572 my ($self, $x, $y) = @_;
573
574 $x -= $self->{x};
575 $y -= $self->{y};
576
577 my $res;
578
579 for (reverse @{ $self->{children} }) {
580 $res = $_->find_widget ($x, $y)
581 and return $res;
582 }
583
584 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
585}
586
587sub _draw {
588 my ($self) = @_;
589
590 $_->draw for @{$self->{children}};
591}
592
593#############################################################################
594
595package CFClient::UI::Bin;
596
597our @ISA = CFClient::UI::Container::;
598
599sub new {
600 my ($class, %arg) = @_;
601
602 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
603
604 $class->SUPER::new (children => [$child], %arg)
605}
606
607sub add {
608 my ($self, $child) = @_;
609
610 $self->{children} = [];
611
612 $self->SUPER::add ($child);
613}
614
615sub remove {
616 my ($self, $widget) = @_;
617
618 $self->SUPER::remove ($widget);
619
620 $self->{children} = [new CFClient::UI::Empty]
621 unless @{$self->{children}};
622}
623
624sub child { $_[0]->{children}[0] }
625
626sub size_request {
627 $_[0]{children}[0]->size_request
628}
629
630sub size_allocate {
631 my ($self, $w, $h) = @_;
632
633 $self->{children}[0]->configure (0, 0, $w, $h);
634}
635
636#############################################################################
637
638package CFClient::UI::Window;
639
640our @ISA = CFClient::UI::Bin::;
641
642use CFClient::OpenGL;
643
644sub new {
645 my ($class, %arg) = @_;
646
647 my $self = $class->SUPER::new (%arg);
648}
649
650sub update {
651 my ($self) = @_;
652
653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
654 $self->SUPER::update;
655}
656
657sub size_allocate {
658 my ($self, $w, $h) = @_;
659
660 $self->SUPER::size_allocate ($w, $h);
661 $self->update;
662}
663
664sub _render {
665 $_[0]{children}[0]->draw;
666}
667
668sub render_child {
669 my ($self) = @_;
670
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT;
674
675 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 };
684}
685
686sub _draw {
687 my ($self) = @_;
688
689 my ($w, $h) = ($self->w, $self->h);
690
691 my $tex = $self->{texture}
692 or return;
693
694 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
697
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699
700 glDisable GL_TEXTURE_2D;
701}
702
703#############################################################################
704
705package CFClient::UI::ViewPort;
706
707our @ISA = CFClient::UI::Window::;
708
709sub size_request {
710 my ($self) = @_;
711
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714
715 @$self{qw(child_w child_h)}
716}
717
718sub size_allocate {
719 my ($self, $w, $h) = @_;
720
721 $self->update;
722}
723
724sub set_offset {
725 my ($self, $x, $y) = @_;
726
727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
729
730 $self->update;
731}
732
733# hmm, this does not work for topleft of $self... but we should not ask for that
734sub coord2local {
735 my ($self, $x, $y) = @_;
736
737 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
738}
739
740sub coord2global {
741 my ($self, $x, $y) = @_;
742
743 $x = List::Util::min $self->{w}, $x - $self->{view_x};
744 $y = List::Util::min $self->{h}, $y - $self->{view_y};
745
746 $self->SUPER::coord2global ($x, $y)
747}
748
749sub find_widget {
750 my ($self, $x, $y) = @_;
751
752 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
753 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
754 ) {
755 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
756 } else {
757 $self->CFClient::UI::Base::find_widget ($x, $y)
758 }
759}
760
761sub _render {
762 my ($self) = @_;
763
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765
766 $self->SUPER::_render;
767}
768
769#############################################################################
770
771package CFClient::UI::ScrolledWindow;
772
773our @ISA = CFClient::UI::HBox::;
774
775sub new {
776 my $class = shift;
777
778 my $self;
779
780 my $slider = new CFClient::UI::Slider
781 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 },
786 ;
787
788 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort),
790 slider => $slider,
791 @_,
792 );
793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
798 $self
799}
800
801#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll
803
804#############################################################################
805
806package CFClient::UI::Frame;
807
808our @ISA = CFClient::UI::Bin::;
809
810use CFClient::OpenGL;
811
812sub new {
813 my $class = shift;
814
815 $class->SUPER::new (
816 bg => undef,
817 @_,
818 )
819}
820
821sub _draw {
822 my ($self) = @_;
823
824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)}; 647 my ($w, $h) = @$self{qw(w h)};
826 648
827 glEnable GL_BLEND; 649 glEnable GL_BLEND;
828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
829 glColor @{ $self->{bg} }; 651 glColor_premultiply @$color;
830 652
831 glBegin GL_QUADS; 653 glBegin GL_QUADS;
832 glVertex 0 , 0; 654 glVertex 0 , 0;
833 glVertex 0 , $h; 655 glVertex 0 , $h;
834 glVertex $w, $h; 656 glVertex $w, $h;
835 glVertex $w, 0; 657 glVertex $w, 0;
836 glEnd; 658 glEnd;
837 659
838 glDisable GL_BLEND; 660 glDisable GL_BLEND;
839 } 661 }
840
841 $self->SUPER::_draw;
842} 662}
843 663
844############################################################################# 664#############################################################################
845 665
846package CFClient::UI::FancyFrame; 666package CFPlus::UI::Empty;
847 667
668our @ISA = CFPlus::UI::Base::;
669
670sub new {
671 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg);
673}
674
675sub size_request {
676 my ($self) = @_;
677
678 ($self->{w} + 0, $self->{h} + 0)
679}
680
681sub draw { }
682
683#############################################################################
684
685package CFPlus::UI::Container;
686
687our @ISA = CFPlus::UI::Base::;
688
689sub new {
690 my ($class, %arg) = @_;
691
692 my $children = delete $arg{children};
693
694 my $self = $class->SUPER::new (
695 children => [],
696 can_events => 0,
697 %arg,
698 );
699
700 $self->add (@$children)
701 if $children && @$children;
702
703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
712}
713
714sub add {
715 my ($self, @widgets) = @_;
716
717 $_->set_parent ($self)
718 for @widgets;
719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
721 use sort 'stable';
722
723 $self->{children} = [
724 sort { $a->{z} <=> $b->{z} }
725 @{$self->{children}}, @widgets
726 ];
727
728 $self->realloc;
729
730 map $_+0, @widgets
731}
732
733sub children {
734 @{ $_[0]{children} }
735}
736
737sub remove {
738 my ($self, $child) = @_;
739
740 delete $child->{parent};
741 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
744
745 $self->realloc;
746}
747
748sub clear {
749 my ($self) = @_;
750
751 my $children = $self->{children};
752 $self->{children} = [];
753
754 for (@$children) {
755 delete $_->{parent};
756 $_->hide;
757 }
758
759 $self->realloc;
760}
761
762sub find_widget {
763 my ($self, $x, $y) = @_;
764
765 $x -= $self->{x};
766 $y -= $self->{y};
767
768 my $res;
769
770 for (reverse $self->visible_children) {
771 $res = $_->find_widget ($x, $y)
772 and return $res;
773 }
774
775 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
776}
777
778sub _draw {
779 my ($self) = @_;
780
781 $_->draw for @{$self->{children}};
782}
783
784#############################################################################
785
786package CFPlus::UI::Bin;
787
788our @ISA = CFPlus::UI::Container::;
789
790sub new {
791 my ($class, %arg) = @_;
792
793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
794
795 $class->SUPER::new (children => [$child], %arg)
796}
797
798sub add {
799 my ($self, $child) = @_;
800
801 $self->SUPER::remove ($_) for @{ $self->{children} };
802 $self->SUPER::add ($child);
803}
804
805sub remove {
806 my ($self, $widget) = @_;
807
808 $self->SUPER::remove ($widget);
809
810 $self->{children} = [new CFPlus::UI::Empty]
811 unless @{$self->{children}};
812}
813
814sub child { $_[0]->{children}[0] }
815
816sub size_request {
817 $_[0]{children}[0]->size_request
818}
819
820sub invoke_size_allocate {
821 my ($self, $w, $h) = @_;
822
823 $self->{children}[0]->configure (0, 0, $w, $h);
824
825 1
826}
827
828#############################################################################
829
830# back-buffered drawing area
831
832package CFPlus::UI::Window;
833
848our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
849 835
850use CFClient::OpenGL; 836use CFPlus::OpenGL;
851 837
852my @tex = 838sub new {
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 839 my ($class, %arg) = @_;
854 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 840
841 my $self = $class->SUPER::new (%arg);
842}
843
844sub update {
845 my ($self) = @_;
846
847 $ROOT->on_post_alloc ($self => sub { $self->render_child });
848 $self->SUPER::update;
849}
850
851sub invoke_size_allocate {
852 my ($self, $w, $h) = @_;
853
854 $self->update;
855
856 $self->SUPER::invoke_size_allocate ($w, $h)
857}
858
859sub _render {
860 my ($self) = @_;
861
862 $self->{children}[0]->draw;
863}
864
865sub render_child {
866 my ($self) = @_;
867
868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
869 glClearColor 0, 0, 0, 0;
870 glClear GL_COLOR_BUFFER_BIT;
871
872 {
873 package CFPlus::UI::Base;
874
875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
879 }
880 };
881}
882
883sub _draw {
884 my ($self) = @_;
885
886 my $tex = $self->{texture}
887 or return;
888
889 glEnable GL_TEXTURE_2D;
890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
891 glColor 0, 0, 0, 1;
892
893 $tex->draw_quad_alpha_premultiplied (0, 0);
894
895 glDisable GL_TEXTURE_2D;
896}
897
898#############################################################################
899
900package CFPlus::UI::ViewPort;
901
902use List::Util qw(min max);
903
904our @ISA = CFPlus::UI::Window::;
855 905
856sub new { 906sub new {
857 my $class = shift; 907 my $class = shift;
858 908
859 # TODO: user_x, user_y, overwrite moveto? 909 $class->SUPER::new (
910 scroll_x => 0,
911 scroll_y => 1,
912 @_,
913 )
914}
915
916sub size_request {
917 my ($self) = @_;
918
919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
920
921 $w = 1 if $self->{scroll_x};
922 $h = 1 if $self->{scroll_y};
923
924 ($w, $h)
925}
926
927sub invoke_size_allocate {
928 my ($self, $w, $h) = @_;
929
930 my $child = $self->child;
931
932 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
933 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
934
935 $self->child->configure (0, 0, $w, $h);
936 $self->update;
937
938 1
939}
940
941sub set_offset {
942 my ($self, $x, $y) = @_;
943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
948 $self->{view_x} = $x;
949 $self->{view_y} = $y;
950
951 $self->emit (changed => $x, $y);
952 $self->update;
953 }
954}
955
956# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local {
958 my ($self, $x, $y) = @_;
959
960 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
961}
962
963sub coord2global {
964 my ($self, $x, $y) = @_;
965
966 $x = List::Util::min $self->{w}, $x - $self->{view_x};
967 $y = List::Util::min $self->{h}, $y - $self->{view_y};
968
969 $self->SUPER::coord2global ($x, $y)
970}
971
972sub find_widget {
973 my ($self, $x, $y) = @_;
974
975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
977 ) {
978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979 } else {
980 $self->CFPlus::UI::Base::find_widget ($x, $y)
981 }
982}
983
984sub _render {
985 my ($self) = @_;
986
987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
989
990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991
992 $self->SUPER::_render;
993}
994
995#############################################################################
996
997package CFPlus::UI::ScrolledWindow;
998
999our @ISA = CFPlus::UI::Table::;
1000
1001sub new {
1002 my ($class, %arg) = @_;
1003
1004 my $child = delete $arg{child};
1005
1006 my $self;
1007
1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
1022 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub {
1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1027 },
1028 ;
1029
1030 $self = $class->SUPER::new (
1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
1038 %arg,
1039 );
1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
1062 $self->SUPER::add ($self->{vp});
1063
1064 $self->add ($child) if $child;
1065
1066 $self
1067}
1068
1069sub add {
1070 my ($self, $widget) = @_;
1071
1072 $self->{vp}->add ($self->{child} = $widget);
1073}
1074
1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1143sub invoke_button_up {
1144 my ($self, $ev, $x, $y) = @_;
1145
1146 if (delete $self->{motion}) {
1147 return 1;
1148 }
1149
1150 0
1151}
1152
1153sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_;
1155
1156 if ($self->{motion}) {
1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1160
1161 0
1162}
1163
1164sub invoke_size_allocate {
1165 my ($self, $w, $h) = @_;
1166
1167 $self->update_slider;
1168 $self->SUPER::invoke_size_allocate ($w, $h)
1169}
1170
1171#############################################################################
1172
1173package CFPlus::UI::Frame;
1174
1175our @ISA = CFPlus::UI::Bin::;
1176
1177use CFPlus::OpenGL;
1178
1179sub new {
1180 my $class = shift;
1181
1182 $class->SUPER::new (
1183 bg => undef,
1184 @_,
1185 )
1186}
1187
1188sub _draw {
1189 my ($self) = @_;
1190
1191 if ($self->{bg}) {
1192 my ($w, $h) = @$self{qw(w h)};
1193
1194 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND;
1206 }
1207
1208 $self->SUPER::_draw;
1209}
1210
1211#############################################################################
1212
1213package CFPlus::UI::FancyFrame;
1214
1215our @ISA = CFPlus::UI::Bin::;
1216
1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
860 1229
861 my $self = $class->SUPER::new ( 1230 my $self = $class->SUPER::new (
1231 # label => "",
862 bg => [1, 1, 1, 1], 1232 fg => [0.6, 0.3, 0.1],
863 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1233 border => 0.8,
865 toplevel => 1, 1234 style => 'single',
866 can_events => 1, 1235 %arg,
867 @_
868 ); 1236 );
869 1237
870 $self->{title} &&= new CFClient::UI::Label
871 align => 0,
872 valign => 1,
873 text => $self->{title},
874 fontsize => $self->{border};
875
876 $self 1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
877} 1246}
878 1247
879sub border { 1248sub border {
880 int $_[0]{border} * $::FONTSIZE 1249 int $_[0]{border} * $::FONTSIZE
881} 1250}
882 1251
883sub size_request { 1252sub size_request {
884 my ($self) = @_; 1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
885 1257
886 my ($w, $h) = $self->SUPER::size_request; 1258 my ($w, $h) = $self->SUPER::size_request;
887 1259
888 ( 1260 (
889 $w + $self->border * 2, 1261 $w + $self->border * 2,
890 $h + $self->border * 2, 1262 $h + $self->border * 2,
891 ) 1263 )
892} 1264}
893 1265
894sub size_allocate { 1266sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 1267 my ($self, $w, $h) = @_;
896 1268
897 $h -= List::Util::max 0, $self->border * 2; 1269 my $border = $self->border;
1270
898 $w -= List::Util::max 0, $self->border * 2; 1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
899 1273
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1274 if (my $label = $self->{label}) {
901 if $self->{title}; 1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
902 1279
903 $self->child->configure ($self->border, $self->border, $w, $h); 1280 $self->child->configure ($border, $border, $w, $h);
904}
905 1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1318
1319my $bg =
1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1321 mipmap => 1, wrap => 1;
1322
1323my @border =
1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1330
1331sub new {
1332 my ($class, %arg) = @_;
1333
1334 my $self = $class->SUPER::new (
1335 bg => [1, 1, 1, 1],
1336 border_bg => [1, 1, 1, 1],
1337 border => 0.6,
1338 can_events => 1,
1339 min_w => 64,
1340 min_h => 32,
1341 %arg,
1342 );
1343
1344 $self->{title_widget} = new CFPlus::UI::Label
1345 align => 0,
1346 valign => 1,
1347 text => $self->{title},
1348 fontsize => $self->{border},
1349 if exists $self->{title};
1350
1351 if ($self->{has_close_button}) {
1352 $self->{close_button} =
1353 new CFPlus::UI::ImageButton
1354 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") };
1356
1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1358 }
1359
1360 $self
1361}
1362
1363sub add {
1364 my ($self, @widgets) = @_;
1365
1366 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369}
1370
1371sub border {
1372 int $_[0]{border} * $::FONTSIZE
1373}
1374
1375sub size_request {
1376 my ($self) = @_;
1377
1378 $self->{title_widget}->size_request
1379 if $self->{title_widget};
1380
1381 $self->{close_button}->size_request
1382 if $self->{close_button};
1383
1384 my ($w, $h) = $self->SUPER::size_request;
1385
1386 (
1387 $w + $self->border * 2,
1388 $h + $self->border * 2,
1389 )
1390}
1391
1392sub invoke_size_allocate {
1393 my ($self, $w, $h) = @_;
1394
1395 if ($self->{title_widget}) {
1396 $self->{title_widget}{w} = $w;
1397 $self->{title_widget}{h} = $h;
1398 $self->{title_widget}->invoke_size_allocate ($w, $h);
1399 }
1400
1401 my $border = $self->border;
1402
1403 $h -= List::Util::max 0, $border * 2;
1404 $w -= List::Util::max 0, $border * 2;
1405
1406 $self->child->configure ($border, $border, $w, $h);
1407
1408 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1409 if $self->{close_button};
1410
1411 1
1412}
1413
1414sub invoke_delete {
1415 my ($self) = @_;
1416
1417 $self->hide;
1418
1419 1
1420}
1421
906sub button_down { 1422sub invoke_button_down {
907 my ($self, $ev, $x, $y) = @_; 1423 my ($self, $ev, $x, $y) = @_;
908 1424
909 my ($w, $h) = @$self{qw(w h)}; 1425 my ($w, $h) = @$self{qw(w h)};
910 my $border = $self->border; 1426 my $border = $self->border;
911 1427
… …
924 my ($ev, $x, $y) = @_; 1440 my ($ev, $x, $y) = @_;
925 1441
926 my $dx = $ev->{x} - $ox; 1442 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1443 my $dy = $ev->{y} - $oy;
928 1444
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1445 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1446 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1447
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1448 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size; 1449 $self->realloc;
933 }; 1450 };
934 1451
935 } elsif ($lr ^ $td) { 1452 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1453 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1454 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1456 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1457 my ($ev, $x, $y) = @_;
941 1458
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1459 ($x, $y) = ($ev->{x}, $ev->{y});
943 1460
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1461 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update; 1462 # HACK: the next line is required to enforce placement
1463 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
946 }; 1464 };
1465 } else {
1466 return 0;
1467 }
1468
947 } 1469 1
948} 1470}
949 1471
950sub button_up { 1472sub invoke_button_up {
951 my ($self, $ev, $x, $y) = @_; 1473 my ($self, $ev, $x, $y) = @_;
952 1474
953 delete $self->{motion}; 1475 ! ! delete $self->{motion}
954} 1476}
955 1477
956sub mouse_motion { 1478sub invoke_mouse_motion {
957 my ($self, $ev, $x, $y) = @_; 1479 my ($self, $ev, $x, $y) = @_;
958 1480
959 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1482
1483 ! ! $self->{motion}
1484}
1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
960} 1492}
961 1493
962sub _draw { 1494sub _draw {
963 my ($self) = @_; 1495 my ($self) = @_;
964 1496
1497 my $child = $self->{children}[0];
1498
965 my ($w, $h ) = ($self->{w}, $self->{h}); 1499 my ($w, $h ) = ($self->{w}, $self->{h});
966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1500 my ($cw, $ch) = ($child->{w}, $child->{h});
967 1501
968 glEnable GL_TEXTURE_2D; 1502 glEnable GL_TEXTURE_2D;
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1504
971 my $border = $self->border; 1505 my $border = $self->border;
972 1506
973 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
978 1526
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1528 glColor @{ $self->{bg} };
981 1529
982 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
1531 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1532 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1533 $bg->{t} = $ch / $bg->{h};
985
986 glColor @{ $self->{bg} };
987
988 $bg->{s} = $rep_x;
989 $bg->{t} = $rep_y;
990 $bg->{wrap_mode} = 1;
991 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1534 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1535 }
993 1536
994 glDisable GL_TEXTURE_2D; 1537 glDisable GL_TEXTURE_2D;
995 1538
996 $self->{title}->draw if $self->{title};
997
998 $self->child->draw; 1539 $child->draw;
1540
1541 if ($self->{title_widget}) {
1542 glTranslate 0, $border - $self->{h};
1543 $self->{title_widget}->_draw;
1544
1545 glTranslate 0, - ($border - $self->{h});
1546 }
1547
1548 $self->{close_button}->draw
1549 if $self->{close_button};
999} 1550}
1000 1551
1001############################################################################# 1552#############################################################################
1002 1553
1003package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1004 1555
1005our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1006 1557
1007use List::Util qw(max sum); 1558use List::Util qw(max sum);
1008 1559
1009use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1010 1561
1011sub new { 1562sub new {
1012 my $class = shift; 1563 my $class = shift;
1013 1564
1014 $class->SUPER::new ( 1565 $class->SUPER::new (
1015 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1016 @_ 1568 @_,
1017 ) 1569 )
1018} 1570}
1019 1571
1020sub add { 1572sub add {
1021 my ($self, $x, $y, $child) = @_;
1022
1023 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child;
1025
1026 $child->check_size;
1027}
1028
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# TODO: move to container class maybe? send childs a signal on removal?
1034sub clear {
1035 my ($self) = @_; 1573 my ($self, @widgets) = @_;
1574
1575 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1579
1580 $self->SUPER::add (@widgets);
1581}
1582
1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1601 my ($self) = @_;
1602
1603 my (@w, @h);
1036 1604
1037 my @children = $self->children; 1605 my @children = $self->children;
1038 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1039 1616 }
1040 for (@children) {
1041 delete $_->{parent};
1042 $_->hide;
1043 }
1044 1617
1045 $self->update; 1618 # second pass, rows
1046} 1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1047
1048sub get_wh {
1049 my ($self) = @_;
1050
1051 my (@w, @h);
1052
1053 for my $y (0 .. $#{$self->{children}}) {
1054 my $row = $self->{children}[$y]
1055 or next;
1056
1057 for my $x (0 .. $#$row) {
1058 my $widget = $row->[$x]
1059 or next;
1060 my ($w, $h) = @$widget{qw(req_w req_h)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1061 1621
1062 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1063 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1064 } 1626 }
1065 } 1627 }
1066 1628
1067 (\@w, \@h) 1629 (\@w, \@h)
1068} 1630}
… …
1076 (sum @$ws), 1638 (sum @$ws),
1077 (sum @$hs), 1639 (sum @$hs),
1078 ) 1640 )
1079} 1641}
1080 1642
1081sub size_allocate { 1643sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1644 my ($self, $w, $h) = @_;
1083 1645
1084 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1085 1647
1086 my $req_w = sum @$ws; 1648 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1649 my $req_h = (sum @$hs) || 1;
1088 1650
1089 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1090 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1093 1655
1094 # linearly scale sizes
1095 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1096 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1097 1657
1098 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1099 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1100 1667
1101 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1102 1670
1103 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1104 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1105 or next;
1106 1673
1107 my $x = 0; 1674 $widget->configure (
1108 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1109 1677 );
1110 for my $c (0 .. $#$row) { 1678 }
1111 my $col_w = $ws->[$c];
1112 1679
1113 if (my $widget = $row->[$c]) { 1680 1
1114 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1115 }
1116 1682
1117 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1118 } 1721 }
1119
1120 $y += $row_h;
1121 } 1722 }
1122 1723
1123} 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1124 1726
1125sub find_widget { 1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1126 my ($self, $x, $y) = @_; 1749 my ($self, $W, $H) = @_;
1127 1750
1128 $x -= $self->{x}; 1751 for my $child ($self->visible_children) {
1129 $y -= $self->{y}; 1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1130 1753
1131 my $res; 1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1132 1758
1133 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1759 $child->configure ($x, $y, $w, $h);
1134 $res = $_->find_widget ($x, $y) 1760 }
1135 and return $res; 1761
1136 } 1762 1
1137
1138 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1139}
1140
1141sub _draw {
1142 my ($self) = @_;
1143
1144 for (grep $_, @{$self->{children}}) {
1145 $_->draw for grep $_, @$_;
1146 }
1147} 1763}
1148 1764
1149############################################################################# 1765#############################################################################
1150 1766
1151package CFClient::UI::HBox; 1767package CFPlus::UI::Box;
1152 1768
1153# TODO: wrap into common Box base class
1154
1155our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1156 1770
1157sub size_request { 1771sub size_request {
1158 my ($self) = @_; 1772 my ($self) = @_;
1159 1773
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1774 $self->{vertical}
1775 ? (
1776 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1777 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1778 )
1779 : (
1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1781 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1782 )
1783}
1161 1784
1785sub invoke_size_allocate {
1786 my ($self, $w, $h) = @_;
1787
1788 my $space = $self->{vertical} ? $h : $w;
1789 my @children = $self->visible_children;
1790
1791 my @req;
1792
1793 if ($self->{homogeneous}) {
1794 @req = ($space / (@children || 1)) x @children;
1795 } else {
1796 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1797 my $req = List::Util::sum @req;
1798
1799 if ($req > $space) {
1800 # ah well, not enough space
1801 $_ *= $space / $req for @req;
1802 } else {
1803 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1804
1805 $space = ($space - $req) / $expand; # remaining space to give away
1806
1807 $req[$_] += $space * $children[$_]{expand}
1808 for 0 .. $#children;
1809 }
1162 ( 1810 }
1163 (List::Util::sum map $_->[0], @alloc), 1811
1164 (List::Util::max map $_->[1], @alloc), 1812 CFPlus::UI::harmonize \@req;
1813
1814 my $pos = 0;
1815 for (0 .. $#children) {
1816 my $alloc = $req[$_];
1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1818
1819 $pos += $alloc;
1820 }
1821
1822 1
1823}
1824
1825#############################################################################
1826
1827package CFPlus::UI::HBox;
1828
1829our @ISA = CFPlus::UI::Box::;
1830
1831sub new {
1832 my $class = shift;
1833
1834 $class->SUPER::new (
1835 vertical => 0,
1836 @_,
1165 ) 1837 )
1166} 1838}
1167 1839
1168sub size_allocate {
1169 my ($self, $w, $h) = @_;
1170
1171 ($h, $w) = ($w, $h);
1172
1173 my $children = $self->{children};
1174
1175 my @h = map $_->{req_w}, @$children;
1176
1177 my $req_h = List::Util::sum @h;
1178
1179 if ($req_h > $h) {
1180 # ah well, not enough space
1181 $_ *= $h / $req_h for @h;
1182 } else {
1183 my $exp = List::Util::sum map $_->{expand}, @$children;
1184 $exp ||= 1;
1185
1186 for (0 .. $#$children) {
1187 my $child = $children->[$_];
1188
1189 my $alloc_h = $h[$_];
1190 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191 $h[$_] = $alloc_h;
1192 }
1193 }
1194
1195 CFClient::UI::harmonize \@h;
1196
1197 my $y = 0;
1198 for (0 .. $#$children) {
1199 my $child = $children->[$_];
1200 my $h = $h[$_];
1201 $child->configure ($y, 0, $h, $w);
1202
1203 $y += $h;
1204 }
1205
1206 1
1207}
1208
1209############################################################################# 1840#############################################################################
1210 1841
1211package CFClient::UI::VBox; 1842package CFPlus::UI::VBox;
1212 1843
1213# TODO: wrap into common Box base class 1844our @ISA = CFPlus::UI::Box::;
1214 1845
1215our @ISA = CFClient::UI::Container::; 1846sub new {
1847 my $class = shift;
1216 1848
1217sub size_request { 1849 $class->SUPER::new (
1218 my ($self) = @_; 1850 vertical => 1,
1219 1851 @_,
1220 my @alloc = map [$_->size_request], @{$self->{children}};
1221
1222 (
1223 (List::Util::max map $_->[0], @alloc),
1224 (List::Util::sum map $_->[1], @alloc),
1225 ) 1852 )
1226} 1853}
1227 1854
1228sub size_allocate {
1229 my ($self, $w, $h) = @_;
1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233 my $children = $self->{children};
1234
1235 my @h = map $_->{req_h}, @$children;
1236
1237 my $req_h = List::Util::sum @h;
1238
1239 if ($req_h > $h) {
1240 # ah well, not enough space
1241 $_ *= $h / $req_h for @h;
1242 } else {
1243 my $exp = List::Util::sum map $_->{expand}, @$children;
1244 $exp ||= 1;
1245
1246 for (0 .. $#$children) {
1247 my $child = $children->[$_];
1248
1249 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250 }
1251 }
1252
1253 CFClient::UI::harmonize \@h;
1254
1255 my $y = 0;
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258 my $h = $h[$_];
1259 $child->configure (0, $y, $w, $h);
1260
1261 $y += $h;
1262 }
1263
1264 1
1265}
1266
1267############################################################################# 1855#############################################################################
1268 1856
1269package CFClient::UI::Label; 1857package CFPlus::UI::Label;
1270 1858
1271our @ISA = CFClient::UI::Base::; 1859our @ISA = CFPlus::UI::DrawBG::;
1272 1860
1273use CFClient::OpenGL; 1861use CFPlus::OpenGL;
1274 1862
1275sub new { 1863sub new {
1276 my ($class, %arg) = @_; 1864 my ($class, %arg) = @_;
1277 1865
1278 my $self = $class->SUPER::new ( 1866 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1867 fg => [1, 1, 1],
1868 #bg => none
1869 #active_bg => none
1280 #font => default_font 1870 #font => default_font
1281 #text => initial text 1871 #text => initial text
1282 #markup => initial narkup 1872 #markup => initial narkup
1873 #max_w => maximum pixel width
1874 #style => 0, # render flags
1875 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1876 layout => (new CFPlus::Layout),
1284 fontsize => 1, 1877 fontsize => 1,
1285 align => -1, 1878 align => -1,
1286 valign => -1, 1879 valign => -1,
1287 padding => 2, 1880 padding_x => 2,
1881 padding_y => 2,
1288 can_events => 0, 1882 can_events => 0,
1289 %arg 1883 %arg
1290 ); 1884 );
1291 1885
1292 if (exists $self->{template}) { 1886 if (exists $self->{template}) {
1293 my $layout = new CFClient::Layout; 1887 my $layout = new CFPlus::Layout;
1294 $layout->set_text (delete $self->{template}); 1888 $layout->set_text (delete $self->{template});
1295 $self->{template} = $layout; 1889 $self->{template} = $layout;
1296 } 1890 }
1297 1891
1298 if (exists $self->{markup}) { 1892 if (exists $self->{markup}) {
… …
1302 } 1896 }
1303 1897
1304 $self 1898 $self
1305} 1899}
1306 1900
1307sub escape {
1308 local $_ = $_[1];
1309
1310 s/&/&amp;/g;
1311 s/>/&gt;/g;
1312 s/</&lt;/g;
1313
1314 $_[1]
1315}
1316
1317sub update { 1901sub update {
1318 my ($self) = @_; 1902 my ($self) = @_;
1319 1903
1320 delete $self->{texture}; 1904 delete $self->{texture};
1321 $self->SUPER::update; 1905 $self->SUPER::update;
1322} 1906}
1323 1907
1908sub realloc {
1909 my ($self) = @_;
1910
1911 delete $self->{ox};
1912 $self->SUPER::realloc;
1913}
1914
1324sub set_text { 1915sub set_text {
1325 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1326 1917
1327 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1328 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
1329 1920
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1921 $self->{layout}->set_text ($text);
1332 1922
1923 delete $self->{size_req};
1924 $self->realloc;
1333 $self->update; 1925 $self->update;
1334 $self->check_size;
1335} 1926}
1336 1927
1337sub set_markup { 1928sub set_markup {
1338 my ($self, $markup) = @_; 1929 my ($self, $markup) = @_;
1339 1930
1340 return if $self->{text} eq "M$markup"; 1931 return if $self->{text} eq "M$markup";
1341 $self->{text} = "M$markup"; 1932 $self->{text} = "M$markup";
1342 1933
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1934 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1935
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1346 $self->{layout}->set_markup ($markup); 1936 $self->{layout}->set_markup ($markup);
1347 1937
1938 delete $self->{size_req};
1939 $self->realloc;
1348 $self->update; 1940 $self->update;
1349 $self->check_size;
1350} 1941}
1351 1942
1352sub size_request { 1943sub size_request {
1353 my ($self) = @_; 1944 my ($self) = @_;
1354 1945
1946 $self->{size_req} ||= do {
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1947 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1948 $self->{layout}->set_width ($self->{max_w} || -1);
1949 $self->{layout}->set_ellipsise ($self->{ellipsise});
1950 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1951 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1952
1359 my ($w, $h) = $self->{layout}->size; 1953 my ($w, $h) = $self->{layout}->size;
1360 1954
1361 if (exists $self->{template}) { 1955 if (exists $self->{template}) {
1362 $self->{template}->set_font ($self->{font}) if $self->{font}; 1956 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1);
1363 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1364 1959
1365 my ($w2, $h2) = $self->{template}->size; 1960 my ($w2, $h2) = $self->{template}->size;
1366 1961
1367 $w = List::Util::max $w, $w2; 1962 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2; 1963 $h = List::Util::max $h, $h2;
1964 }
1965
1966 [$w, $h]
1369 } 1967 };
1370 1968
1371 ( 1969 @{ $self->{size_req} }
1372 $w + $self->{padding} * 2,
1373 $h + $self->{padding} * 2,
1374 )
1375} 1970}
1376 1971
1972sub baseline_shift {
1973 $_[0]{layout}->descent
1974}
1975
1377sub size_allocate { 1976sub invoke_size_allocate {
1378 my ($self, $w, $h) = @_; 1977 my ($self, $w, $h) = @_;
1379 1978
1979 delete $self->{ox};
1980
1380 delete $self->{texture}; 1981 delete $self->{texture}
1982 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1983
1984 1
1381} 1985}
1382 1986
1383sub set_fontsize { 1987sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1385 1989
1386 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1387 delete $self->{texture}; 1992 delete $self->{texture};
1388 1993
1389 $self->update; 1994 $self->realloc;
1390 $self->check_size; 1995}
1996
1997sub reconfigure {
1998 my ($self) = @_;
1999
2000 delete $self->{size_req};
2001 delete $self->{texture};
2002
2003 $self->SUPER::reconfigure;
1391} 2004}
1392 2005
1393sub _draw { 2006sub _draw {
1394 my ($self) = @_; 2007 my ($self) = @_;
1395 2008
2009 $self->SUPER::_draw; # draw background, if applicable
2010
1396 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 2018
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2019 [$self->{layout}->size]
1403
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5;
1407
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5;
1411
1412 $tex
1413 }; 2020 };
1414 2021
1415 glEnable GL_TEXTURE_2D; 2022 unless (exists $self->{ox}) {
1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2025 : ($self->{w} - $size->[0]) * 0.5);
1417 2026
1418 if ($tex->{format} == GL_ALPHA) { 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1419 glColor @{$self->{fg}}; 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2029 : ($self->{h} - $size->[1]) * 0.5);
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 } 2030 };
1424 2031
1425 glDisable GL_TEXTURE_2D; 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1426} 2033}
1427 2034
1428############################################################################# 2035#############################################################################
1429 2036
1430package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1431 2038
1432our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1433 2040
1434use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1435 2042
1436sub new { 2043sub new {
1437 my $class = shift; 2044 my $class = shift;
1438 2045
1439 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1443 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1444 can_hover => 1, 2051 can_hover => 1,
1445 can_focus => 1, 2052 can_focus => 1,
1446 valign => 0, 2053 valign => 0,
1447 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
2056 #text => ...
2057 #hidden => "*",
1448 @_ 2058 @_
1449 ) 2059 )
1450} 2060}
1451 2061
1452sub _set_text { 2062sub _set_text {
… …
1454 2064
1455 delete $self->{cur_h}; 2065 delete $self->{cur_h};
1456 2066
1457 return if $self->{text} eq $text; 2067 return if $self->{text} eq $text;
1458 2068
1459 delete $self->{texture};
1460
1461 $self->{last_activity} = $::NOW; 2069 $self->{last_activity} = $::NOW;
1462 $self->{text} = $text; 2070 $self->{text} = $text;
1463 2071
1464 $text =~ s/./*/g if $self->{hidden}; 2072 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 2073 $self->{layout}->set_text ("$text ");
2074 delete $self->{size_req};
1466 2075
1467 $self->emit (changed => $self->{text}); 2076 $self->emit (changed => $self->{text});
2077
2078 $self->realloc;
2079 $self->update;
1468} 2080}
1469 2081
1470sub set_text { 2082sub set_text {
1471 my ($self, $text) = @_; 2083 my ($self, $text) = @_;
1472 2084
1473 $self->{cursor} = length $text; 2085 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 2086 $self->_set_text ($text);
1475 $self->check_size;
1476 $self->update;
1477} 2087}
1478 2088
1479sub get_text { 2089sub get_text {
1480 $_[0]{text} 2090 $_[0]{text}
1481} 2091}
… …
1486 my ($w, $h) = $self->SUPER::size_request; 2096 my ($w, $h) = $self->SUPER::size_request;
1487 2097
1488 ($w + 1, $h) # add 1 for cursor 2098 ($w + 1, $h) # add 1 for cursor
1489} 2099}
1490 2100
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495}
1496
1497sub key_down { 2101sub invoke_key_down {
1498 my ($self, $ev) = @_; 2102 my ($self, $ev) = @_;
1499 2103
1500 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1501 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1502 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1503 2107
1504 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1505 2111
1506 if ($uni == 8) { 2112 if ($uni == 8) {
1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1508 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1509 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1510 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1511 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1512 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1513 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1514 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1515 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 2136 $self->emit ('escape');
1520 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
2141 } else {
2142 return 0;
1522 } 2143 }
1523 2144
1524 $self->_set_text ($text); 2145 $self->_set_text ($text);
2146
2147 $self->realloc;
1525 $self->update; 2148 $self->update;
1526}
1527 2149
2150 1
2151}
2152
1528sub focus_in { 2153sub invoke_focus_in {
1529 my ($self) = @_; 2154 my ($self) = @_;
1530 2155
1531 $self->{last_activity} = $::NOW; 2156 $self->{last_activity} = $::NOW;
1532 2157
1533 $self->SUPER::focus_in; 2158 $self->SUPER::invoke_focus_in
1534} 2159}
1535 2160
1536sub button_down { 2161sub invoke_button_down {
1537 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1538 2163
1539 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::invoke_button_down ($ev, $x, $y);
1540 2165
1541 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1542 2167
1543 # byte-index to char-index 2168 # byte-index to char-index
1544 my $text = $self->{text}; 2169 my $text = $self->{text};
1545 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1546 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1547 2172
1548 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1549 $self->update; 2174 $self->update;
2175
2176 1
1550} 2177}
1551 2178
1552sub mouse_motion { 2179sub invoke_mouse_motion {
1553 my ($self, $ev, $x, $y) = @_; 2180 my ($self, $ev, $x, $y) = @_;
1554# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2181# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2182
2183 1
1555} 2184}
1556 2185
1557sub _draw { 2186sub _draw {
1558 my ($self) = @_; 2187 my ($self) = @_;
1559 2188
1560 local $self->{fg} = $self->{fg}; 2189 local $self->{fg} = $self->{fg};
1561 2190
1562 if ($FOCUS == $self) { 2191 if ($FOCUS == $self) {
1563 glColor @{$self->{active_bg}}; 2192 glColor_premultiply @{$self->{active_bg}};
1564 $self->{fg} = $self->{active_fg}; 2193 $self->{fg} = $self->{active_fg};
1565 } else { 2194 } else {
1566 glColor @{$self->{bg}}; 2195 glColor_premultiply @{$self->{bg}};
1567 } 2196 }
1568 2197
1569 glEnable GL_BLEND; 2198 glEnable GL_BLEND;
1570 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2199 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1571 glBegin GL_QUADS; 2200 glBegin GL_QUADS;
1572 glVertex 0 , 0; 2201 glVertex 0 , 0;
1573 glVertex 0 , $self->{h}; 2202 glVertex 0 , $self->{h};
1574 glVertex $self->{w}, $self->{h}; 2203 glVertex $self->{w}, $self->{h};
1575 glVertex $self->{w}, 0; 2204 glVertex $self->{w}, 0;
… …
1586 utf8::encode $text; 2215 utf8::encode $text;
1587 2216
1588 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1589 } 2218 }
1590 2219
1591 glColor @{$self->{fg}};
1592 glBegin GL_LINES; 2220 glBegin GL_LINES;
1593 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1594 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1595 glEnd; 2223 glEnd;
1596 } 2224 }
1597} 2225}
1598 2226
2227#############################################################################
2228
1599package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1600 2230
1601our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1602 2232
1603use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1604 2234
1605sub key_down { 2235sub invoke_key_down {
1606 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1607 2237
1608 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1609 2239
1610 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1611 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1612 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2243
1613 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1615 $self->emit (activate => $txt); 2246 $self->emit (activate => $txt);
1616 $self->update; 2247 $self->update;
1617 2248
1618 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1619 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1620 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1621 } 2252 }
1622 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1623 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1625 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1626 } 2257 }
1627 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1628 } 2259 }
1629 2260
1630 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1631 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1632 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1633 2264
1634 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1635 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1636 } else { 2267 } else {
1637 $self->set_text ($self->{history_saveback}); 2268 $self->set_text ($self->{history_saveback});
1638 } 2269 }
1639 2270
1640 } else { 2271 } else {
1641 $self->SUPER::key_down ($ev); 2272 return $self->SUPER::invoke_key_down ($ev)
2273 }
2274
1642 } 2275 1
1643
1644} 2276}
1645 2277
1646############################################################################# 2278#############################################################################
1647 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1648package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1649 2320
1650our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1651 2322
1652use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1653 2324
1654my @tex = 2325my @tex =
1655 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1656 qw(b1_button_active.png); 2327 qw(b1_button_inactive.png b1_button_active.png);
1657 2328
1658sub new { 2329sub new {
1659 my $class = shift; 2330 my $class = shift;
1660 2331
1661 $class->SUPER::new ( 2332 $class->SUPER::new (
1662 padding => 4, 2333 padding_x => 4,
2334 padding_y => 4,
2335 fg => [1.0, 1.0, 1.0],
2336 active_fg => [0.8, 0.8, 0.8],
2337 can_hover => 1,
2338 align => 0,
2339 valign => 0,
2340 can_events => 1,
2341 @_
2342 )
2343}
2344
2345sub invoke_button_up {
2346 my ($self, $ev, $x, $y) = @_;
2347
2348 $self->emit ("activate")
2349 if $x >= 0 && $x < $self->{w}
2350 && $y >= 0 && $y < $self->{h};
2351
2352 1
2353}
2354
2355sub _draw {
2356 my ($self) = @_;
2357
2358 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2359
2360 glEnable GL_TEXTURE_2D;
2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2362 glColor 0, 0, 0, 1;
2363
2364 my $tex = $tex[$GRAB == $self];
2365 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2366
2367 glDisable GL_TEXTURE_2D;
2368
2369 $self->SUPER::_draw;
2370}
2371
2372#############################################################################
2373
2374package CFPlus::UI::CheckBox;
2375
2376our @ISA = CFPlus::UI::DrawBG::;
2377
2378my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2380 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2381
2382use CFPlus::OpenGL;
2383
2384sub new {
2385 my $class = shift;
2386
2387 $class->SUPER::new (
2388 padding_x => 2,
2389 padding_y => 2,
2390 fg => [1, 1, 1],
2391 active_fg => [1, 1, 0],
2392 bg => [0, 0, 0, 0.2],
2393 active_bg => [1, 1, 1, 0.5],
2394 state => 0,
2395 can_hover => 1,
2396 @_
2397 )
2398}
2399
2400sub size_request {
2401 my ($self) = @_;
2402
2403 (6) x 2
2404}
2405
2406sub toggle {
2407 my ($self) = @_;
2408
2409 $self->{state} = !$self->{state};
2410 $self->emit (changed => $self->{state});
2411 $self->update;
2412}
2413
2414sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_;
2416
2417 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2418 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2419 $self->toggle;
2420 } else {
2421 return 0
2422 }
2423
2424 1
2425}
2426
2427sub _draw {
2428 my ($self) = @_;
2429
2430 $self->SUPER::_draw;
2431
2432 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2433
2434 my ($w, $h) = @$self{qw(w h)};
2435
2436 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2437
2438 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2439
2440 my $tex = $self->{state} ? $tex[1] : $tex[0];
2441
2442 glEnable GL_TEXTURE_2D;
2443 $tex->draw_quad_alpha (0, 0, $s, $s);
2444 glDisable GL_TEXTURE_2D;
2445}
2446
2447#############################################################################
2448
2449package CFPlus::UI::Image;
2450
2451our @ISA = CFPlus::UI::Base::;
2452
2453use CFPlus::OpenGL;
2454
2455our %texture_cache;
2456
2457sub new {
2458 my $class = shift;
2459
2460 my $self = $class->SUPER::new (
2461 can_events => 0,
2462 @_,
2463 );
2464
2465 $self->{path} || $self->{tex}
2466 or Carp::croak "'path' or 'tex' attributes required";
2467
2468 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2469 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2470
2471 CFPlus::weaken $texture_cache{$self->{path}};
2472
2473 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2474
2475 $self
2476}
2477
2478sub STORABLE_freeze {
2479 my ($self, $cloning) = @_;
2480
2481 $self->{path}
2482 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2483
2484 $self->{path}
2485}
2486
2487sub STORABLE_attach {
2488 my ($self, $cloning, $path) = @_;
2489
2490 $self->new (path => $path)
2491}
2492
2493sub size_request {
2494 my ($self) = @_;
2495
2496 ($self->{tex}{w}, $self->{tex}{h})
2497}
2498
2499sub _draw {
2500 my ($self) = @_;
2501
2502 my $tex = $self->{tex};
2503
2504 my ($w, $h) = ($self->{w}, $self->{h});
2505
2506 if ($self->{rot90}) {
2507 glRotate 90, 0, 0, 1;
2508 glTranslate 0, -$self->{w}, 0;
2509
2510 ($w, $h) = ($h, $w);
2511 }
2512
2513 glEnable GL_TEXTURE_2D;
2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515
2516 $tex->draw_quad (0, 0, $w, $h);
2517
2518 glDisable GL_TEXTURE_2D;
2519}
2520
2521#############################################################################
2522
2523package CFPlus::UI::ImageButton;
2524
2525our @ISA = CFPlus::UI::Image::;
2526
2527use CFPlus::OpenGL;
2528
2529my %textures;
2530
2531sub new {
2532 my $class = shift;
2533
2534 my $self = $class->SUPER::new (
2535 padding_x => 4,
2536 padding_y => 4,
1663 fg => [1, 1, 1], 2537 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 2538 active_fg => [0, 0, 1],
1666 can_hover => 1, 2539 can_hover => 1,
1667 align => 0, 2540 align => 0,
1668 valign => 0, 2541 valign => 0,
1669 can_events => 1, 2542 can_events => 1,
1670 @_ 2543 @_
1671 ) 2544 );
1672} 2545}
1673 2546
1674sub button_up { 2547sub invoke_button_up {
1675 my ($self, $ev, $x, $y) = @_; 2548 my ($self, $ev, $x, $y) = @_;
1676 2549
2550 $self->emit ("activate")
1677 if ($x >= 0 && $x < $self->{w} 2551 if $x >= 0 && $x < $self->{w}
1678 && $y >= 0 && $y < $self->{h}) { 2552 && $y >= 0 && $y < $self->{h};
1679 $self->emit ("activate"); 2553
1680 } 2554 1
1681}
1682
1683sub _draw {
1684 my ($self) = @_;
1685
1686 local $self->{fg} = $self->{fg};
1687
1688 if ($GRAB == $self) {
1689 $self->{fg} = $self->{active_fg};
1690 }
1691
1692 glEnable GL_TEXTURE_2D;
1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1694 glColor 0, 0, 0, 1;
1695
1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1697
1698 glDisable GL_TEXTURE_2D;
1699
1700 $self->SUPER::_draw;
1701} 2555}
1702 2556
1703############################################################################# 2557#############################################################################
1704 2558
1705package CFClient::UI::CheckBox;
1706
1707our @ISA = CFClient::UI::DrawBG::;
1708
1709my @tex =
1710 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1711 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1712
1713use CFClient::OpenGL;
1714
1715sub new {
1716 my $class = shift;
1717
1718 $class->SUPER::new (
1719 padding => 2,
1720 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0],
1722 state => 0,
1723 can_hover => 1,
1724 @_
1725 )
1726}
1727
1728sub size_request {
1729 my ($self) = @_;
1730
1731 ($self->{padding} * 2 + 6) x 2
1732}
1733
1734sub button_down {
1735 my ($self, $ev, $x, $y) = @_;
1736
1737 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1738 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1739 $self->{state} = !$self->{state};
1740 $self->emit (changed => $self->{state});
1741 }
1742}
1743
1744sub _draw {
1745 my ($self) = @_;
1746
1747 $self->SUPER::_draw;
1748
1749 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1750
1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1752
1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1754
1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1757 glEnable GL_TEXTURE_2D;
1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1759 glDisable GL_TEXTURE_2D;
1760}
1761
1762#############################################################################
1763
1764package CFClient::UI::Image; 2559package CFPlus::UI::VGauge;
1765 2560
1766our @ISA = CFClient::UI::Base::; 2561our @ISA = CFPlus::UI::Base::;
1767
1768use CFClient::OpenGL;
1769use Carp qw/confess/;
1770
1771our %loaded_images;
1772
1773sub new {
1774 my $class = shift;
1775
1776 my $self = $class->SUPER::new (can_events => 0, @_);
1777
1778 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1779
1780 $loaded_images{$self->{image}} ||=
1781 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1782
1783 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1784
1785 Scalar::Util::weaken $loaded_images{$self->{image}};
1786
1787 $self->{aspect} = $tex->{w} / $tex->{h};
1788
1789 $self
1790}
1791
1792sub size_request {
1793 my ($self) = @_;
1794
1795 ($self->{tex}->{w}, $self->{tex}->{h})
1796}
1797
1798sub _draw {
1799 my ($self) = @_;
1800
1801 my $tex = $self->{tex};
1802
1803 my ($w, $h) = ($self->{w}, $self->{h});
1804
1805 if ($self->{rot90}) {
1806 glRotate 90, 0, 0, 1;
1807 glTranslate 0, -$self->{w}, 0;
1808
1809 ($w, $h) = ($h, $w);
1810 }
1811
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814
1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1816
1817 glDisable GL_TEXTURE_2D;
1818}
1819
1820#############################################################################
1821
1822package CFClient::UI::VGauge;
1823
1824our @ISA = CFClient::UI::Base::;
1825 2562
1826use List::Util qw(min max); 2563use List::Util qw(min max);
1827 2564
1828use CFClient::OpenGL; 2565use CFPlus::OpenGL;
1829 2566
1830my %tex = ( 2567my %tex = (
1831 food => [ 2568 food => [
1832 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2569 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1833 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2570 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1834 ], 2571 ],
1835 grace => [ 2572 grace => [
1836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2573 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1837 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2574 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1838 ], 2575 ],
1839 hp => [ 2576 hp => [
1840 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2577 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1841 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2578 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1842 ], 2579 ],
1843 mana => [ 2580 mana => [
1844 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2581 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1845 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2582 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1846 ], 2583 ],
1847); 2584);
1848 2585
1849# eg. VGauge->new (gauge => 'food'), default gauge: food 2586# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1909 my $ycut1 = max 0, min 1, $ycut; 2646 my $ycut1 = max 0, min 1, $ycut;
1910 my $ycut2 = max 0, min 1, $ycut - 1; 2647 my $ycut2 = max 0, min 1, $ycut - 1;
1911 2648
1912 my $h1 = $self->{h} * (1 - $ycut1); 2649 my $h1 = $self->{h} * (1 - $ycut1);
1913 my $h2 = $self->{h} * (1 - $ycut2); 2650 my $h2 = $self->{h} * (1 - $ycut2);
2651 my $h3 = $self->{h};
2652
2653 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1914 2654
1915 glEnable GL_BLEND; 2655 glEnable GL_BLEND;
1916 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2656 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2657 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1917 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1919 2660
1920 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2661 glBindTexture GL_TEXTURE_2D, $t1->{name};
1921 glBegin GL_QUADS; 2662 glBegin GL_QUADS;
… …
1936 2677
1937 if ($t3) { 2678 if ($t3) {
1938 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2679 glBindTexture GL_TEXTURE_2D, $t3->{name};
1939 glBegin GL_QUADS; 2680 glBegin GL_QUADS;
1940 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2681 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1941 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2682 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1942 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2683 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1943 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2684 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1944 glEnd; 2685 glEnd;
1945 } 2686 }
1946 2687
1947 glDisable GL_BLEND; 2688 glDisable GL_BLEND;
1948 glDisable GL_TEXTURE_2D; 2689 glDisable GL_TEXTURE_2D;
1949} 2690}
1950 2691
1951############################################################################# 2692#############################################################################
1952 2693
1953package CFClient::UI::Gauge; 2694package CFPlus::UI::Gauge;
1954 2695
1955our @ISA = CFClient::UI::VBox::; 2696our @ISA = CFPlus::UI::VBox::;
1956 2697
1957sub new { 2698sub new {
1958 my ($class, %arg) = @_; 2699 my ($class, %arg) = @_;
1959 2700
1960 my $self = $class->SUPER::new ( 2701 my $self = $class->SUPER::new (
… …
1962 can_hover => 1, 2703 can_hover => 1,
1963 can_events => 1, 2704 can_events => 1,
1964 %arg, 2705 %arg,
1965 ); 2706 );
1966 2707
1967 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2708 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1968 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2709 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1969 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2710 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1970 2711
1971 $self 2712 $self
1972} 2713}
1973 2714
1974sub set_fontsize { 2715sub set_fontsize {
… …
1995 $self->{value}->set_text ($val); 2736 $self->{value}->set_text ($val);
1996} 2737}
1997 2738
1998############################################################################# 2739#############################################################################
1999 2740
2000package CFClient::UI::Slider; 2741package CFPlus::UI::Slider;
2001 2742
2002use strict; 2743use strict;
2003 2744
2004use CFClient::OpenGL; 2745use CFPlus::OpenGL;
2005 2746
2006our @ISA = CFClient::UI::DrawBG::; 2747our @ISA = CFPlus::UI::DrawBG::;
2007 2748
2008my @tex = 2749my @tex =
2009 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2750 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2010 qw(s1_slider.png s1_slider_bg.png); 2751 qw(s1_slider.png s1_slider_bg.png);
2011 2752
2012sub new { 2753sub new {
2013 my $class = shift; 2754 my $class = shift;
2014 2755
… …
2018 # TODO: req_w/h are wrong with vertical 2759 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2760 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2762 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2763 active_fg => [0, 0, 0],
2764 bg => [0, 0, 0, 0.2],
2765 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2766 range => [0, 0, 100, 10, 0],
2024 req_w => $::WIDTH / 80, 2767 min_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2768 min_h => $::WIDTH / 80,
2026 vertical => 0, 2769 vertical => 0,
2027 can_hover => 1, 2770 can_hover => 1,
2028 inner_pad => .05, 2771 inner_pad => 0.02,
2029 @_ 2772 @_
2030 ); 2773 );
2031 2774
2032 $self->set_value ($self->{range}[0]); 2775 $self->set_value ($self->{range}[0]);
2033 $self->update; 2776 $self->update;
2034 2777
2035 $self 2778 $self
2036} 2779}
2037 2780
2781sub set_range {
2782 my ($self, $range) = @_;
2783
2784 ($range, $self->{range}) = ($self->{range}, $range);
2785
2786 if ("@$range" ne "@{$self->{range}}") {
2787 $self->update;
2788 $self->set_value ($self->{range}[0]);
2789 }
2790}
2791
2038sub set_value { 2792sub set_value {
2039 my ($self, $value) = @_; 2793 my ($self, $value) = @_;
2040 2794
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2795 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042 2796
2043 $hi = $lo + 1 if $hi <= $lo; 2797 $hi = $lo + 1 if $hi <= $lo;
2044 2798
2799 $page = $hi - $lo if $page > $hi - $lo;
2800
2045 $value = $lo if $value < $lo; 2801 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi; 2802 $value = $hi - $page if $value > $hi - $page;
2047 2803
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2804 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit; 2805 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052 2806
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2807 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054 2808
2055 if ($value != $old_value) { 2809 if ($value != $old_value) {
2056 $self->emit (changed => $value); 2810 $self->emit (changed => $value);
… …
2059} 2813}
2060 2814
2061sub size_request { 2815sub size_request {
2062 my ($self) = @_; 2816 my ($self) = @_;
2063 2817
2064 my $w = $self->{req_w}; 2818 ($self->{req_w}, $self->{req_h})
2065 my $h = $self->{req_h};
2066
2067 $self->{vertical} ? ($h, $w) : ($w, $h)
2068} 2819}
2069 2820
2070sub button_down { 2821sub invoke_button_down {
2071 my ($self, $ev, $x, $y) = @_; 2822 my ($self, $ev, $x, $y) = @_;
2072 2823
2073 $self->SUPER::button_down ($ev, $x, $y); 2824 $self->SUPER::invoke_button_down ($ev, $x, $y);
2825
2826 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2827
2074 $self->mouse_motion ($ev, $x, $y); 2828 $self->invoke_mouse_motion ($ev, $x, $y)
2075} 2829}
2076 2830
2077sub mouse_motion { 2831sub invoke_mouse_motion {
2078 my ($self, $ev, $x, $y) = @_; 2832 my ($self, $ev, $x, $y) = @_;
2079 2833
2080 if ($GRAB == $self) { 2834 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2835 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082 2836
2083 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2837 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084 2838
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2839 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086 2840
2087 $self->set_value ($x * ($hi - $lo) + $lo); 2841 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2842 } else {
2843 return 0;
2844 }
2845
2088 } 2846 1
2847}
2848
2849sub invoke_mouse_wheel {
2850 my ($self, $ev) = @_;
2851
2852 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2853
2854 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2855
2856 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2857
2858 ! ! $delta
2089} 2859}
2090 2860
2091sub update { 2861sub update {
2092 my ($self) = @_; 2862 my ($self) = @_;
2093 2863
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2864 delete $self->{knob_w};
2865 $self->SUPER::update;
2866}
2867
2868sub _draw {
2869 my ($self) = @_;
2870
2871 unless ($self->{knob_w}) {
2095 $self->set_value ($self->{range}[0]); 2872 $self->set_value ($self->{range}[0]);
2096 2873
2097 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2874 my ($value, $lo, $hi, $page) = @{$self->{range}};
2875 my $range = ($hi - $page - $lo) || 1e-100;
2098 2876
2099 my $inner_w = 1 - 2 * $self->{inner_pad}; 2877 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100 2878
2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2879 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2880 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102 2881
2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2882 $value = ($value - $lo) / $range;
2104 $value = $self->{scale} * ($value - $lo); 2883 $value = $value * $self->{scale} + $self->{offset};
2105 2884
2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value; 2885 $self->{knob_x} = $value - $knob_w * 0.5;
2112 $self->{knob_w} = $page; 2886 $self->{knob_w} = $knob_w;
2113 }); 2887 }
2114
2115 $self->SUPER::update;
2116}
2117
2118sub _draw {
2119 my ($self) = @_;
2120 2888
2121 $self->SUPER::_draw (); 2889 $self->SUPER::_draw ();
2122 2890
2123 glScale $self->{w}, $self->{h}; 2891 glScale $self->{w}, $self->{h};
2124 2892
2125 if ($self->{vertical}) { 2893 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2894 # draw a vertical slider like a rotated horizontal slider
2127 2895
2896 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2897 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2898 }
2131 2899
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2900 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2901 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2902
… …
2144 glDisable GL_TEXTURE_2D; 2912 glDisable GL_TEXTURE_2D;
2145} 2913}
2146 2914
2147############################################################################# 2915#############################################################################
2148 2916
2149package CFClient::UI::TextView; 2917package CFPlus::UI::ValSlider;
2150 2918
2151our @ISA = CFClient::UI::HBox::; 2919our @ISA = CFPlus::UI::HBox::;
2152 2920
2921sub new {
2922 my ($class, %arg) = @_;
2923
2924 my $range = delete $arg{range};
2925
2926 my $self = $class->SUPER::new (
2927 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2928 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2929 to_value => sub { shift },
2930 from_value => sub { shift },
2931 %arg,
2932 );
2933
2934 $self->{slider}->connect (changed => sub {
2935 my ($self, $value) = @_;
2936 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2937 $self->{parent}->emit (changed => $value);
2938 });
2939
2940# $self->{entry}->connect (changed => sub {
2941# my ($self, $value) = @_;
2942# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2943# $self->{parent}->emit (changed => $value);
2944# });
2945
2946 $self->add ($self->{slider}, $self->{entry});
2947
2948 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2949
2950 $self
2951}
2952
2953sub set_range { shift->{slider}->set_range (@_) }
2954sub set_value { shift->{slider}->set_value (@_) }
2955
2956#############################################################################
2957
2958package CFPlus::UI::TextScroller;
2959
2960our @ISA = CFPlus::UI::HBox::;
2961
2153use CFClient::OpenGL; 2962use CFPlus::OpenGL;
2154 2963
2155sub new { 2964sub new {
2156 my $class = shift; 2965 my $class = shift;
2157 2966
2158 my $self = $class->SUPER::new ( 2967 my $self = $class->SUPER::new (
2159 fontsize => 1, 2968 fontsize => 1,
2160 can_events => 0, 2969 can_events => 1,
2970 indent => 0,
2161 #font => default_font 2971 #font => default_font
2162 @_, 2972 @_,
2163 2973
2164 layout => (new CFClient::Layout 1), 2974 layout => (new CFPlus::Layout),
2165 par => [], 2975 par => [],
2976 max_par => 0,
2166 height => 0, 2977 height => 0,
2167 children => [ 2978 children => [
2168 (new CFClient::UI::Empty expand => 1), 2979 (new CFPlus::UI::Empty expand => 1),
2169 (new CFClient::UI::Slider vertical => 1), 2980 (new CFPlus::UI::Slider vertical => 1),
2170 ], 2981 ],
2171 ); 2982 );
2172 2983
2173 $self->{children}[1]->connect (changed => sub { $self->update }); 2984 $self->{children}[1]->connect (changed => sub { $self->update });
2174 2985
… …
2180 2991
2181 $self->{fontsize} = $fontsize; 2992 $self->{fontsize} = $fontsize;
2182 $self->reflow; 2993 $self->reflow;
2183} 2994}
2184 2995
2185sub text_height { 2996sub size_request {
2997 my ($self) = @_;
2998
2999 my ($empty, $slider) = @{ $self->{children} };
3000
3001 local $self->{children} = [$empty, $slider];
3002 $self->SUPER::size_request
3003}
3004
3005sub invoke_size_allocate {
3006 my ($self, $w, $h) = @_;
3007
3008 my ($empty, $slider, @other) = @{ $self->{children} };
3009 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3010
3011 $self->{layout}->set_font ($self->{font}) if $self->{font};
3012 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
3013 $self->{layout}->set_width ($empty->{w});
3014 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3015
3016 $self->reflow;
3017
3018 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::invoke_size_allocate ($w, $h)
3020}
3021
3022sub invoke_mouse_wheel {
2186 my ($self, $text) = @_; 3023 my ($self, $ev) = @_;
3024
3025 return 0 unless $ev->{dy}; # only vertical movements
3026
3027 $self->{children}[1]->emit (mouse_wheel => $ev);
3028
3029 1
3030}
3031
3032sub get_layout {
3033 my ($self, $para) = @_;
2187 3034
2188 my $layout = $self->{layout}; 3035 my $layout = $self->{layout};
2189 3036
3037 $layout->set_font ($self->{font}) if $self->{font};
3038 $layout->set_foreground (@{$para->{fg}});
2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3039 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191 $layout->set_width ($self->{children}[0]{w}); 3040 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3041 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2192 $layout->set_markup ($text); 3042 $layout->set_markup ($para->{markup});
3043
3044 $layout->set_shapes (
3045 map
3046 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3047 @{$para->{widget}}
2193 3048 );
2194 ($layout->size)[1] 3049
3050 $layout
2195} 3051}
2196 3052
2197sub reflow { 3053sub reflow {
2198 my ($self) = @_; 3054 my ($self) = @_;
2199 3055
2200 $self->{need_reflow}++; 3056 $self->{need_reflow}++;
2201 $self->update; 3057 $self->update;
2202} 3058}
2203 3059
2204sub size_allocate { 3060sub set_offset {
3061 my ($self, $offset) = @_;
3062
3063 # todo: base offset on lines or so, not on pixels
3064 $self->{children}[1]->set_value ($offset);
3065}
3066
3067sub current_paragraph {
3068 my ($self) = @_;
3069
3070 $self->{top_paragraph} - 1
3071}
3072
3073sub scroll_to {
2205 my ($self, $w, $h) = @_; 3074 my ($self, $para) = @_;
2206 3075
2207 $self->SUPER::size_allocate ($w, $h); 3076 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2208 3077
2209 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3078 $self->{scroll_to} = $para;
2210 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3079 $self->update;
2211 $self->{layout}->set_width ($self->{children}[0]{w}); 3080}
2212 3081
2213 $self->reflow; 3082sub clear {
3083 my ($self) = @_;
3084
3085 my (undef, undef, @other) = @{ $self->{children} };
3086 $self->remove ($_) for @other;
3087
3088 $self->{par} = [];
3089 $self->{height} = 0;
3090 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2214} 3091}
2215 3092
2216sub add_paragraph { 3093sub add_paragraph {
2217 my ($self, $color, $text) = @_; 3094 my $self = shift;
2218 3095
2219 #TODO: intelligently "reformat" paragraph 3096 for my $para (@_) {
3097 $para = {
3098 fg => [1, 1, 1, 1],
3099 indent => 0,
3100 markup => "",
3101 widget => [],
3102 ref $para ? %$para : (markup => $para),
3103 w => 1e10,
3104 wrapped => 1,
3105 };
2220 3106
2221 my $height = $self->text_height ($text); 3107 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3108 push @{$self->{par}}, $para;
3109 }
2222 3110
3111 if (my $max = $self->{max_par}) {
3112 shift @{$self->{par}} while @{$self->{par}} > $max;
3113 }
3114
3115 $self->{need_reflow}++;
3116 $self->update;
3117}
3118
3119sub scroll_to_bottom {
3120 my ($self) = @_;
3121
3122 $self->{scroll_to} = $#{$self->{par}};
3123 $self->update;
3124}
3125
3126sub force_uptodate {
3127 my ($self) = @_;
3128
3129 if (delete $self->{need_reflow}) {
3130 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3131
3132 my $height = 0;
3133
3134 for my $para (@{$self->{par}}) {
3135 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3136 my $layout = $self->get_layout ($para);
3137 my ($w, $h) = $layout->size;
3138
3139 $para->{w} = $w + $para->{indent};
3140 $para->{h} = $h;
3141 $para->{wrapped} = $layout->has_wrapped;
3142 }
3143
3144 $para->{y} = $height;
3145 $height += $para->{h};
3146 }
3147
2223 $self->{height} += $height; 3148 $self->{height} = $height;
3149 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2224 3150
2225 push @{$self->{par}}, [$height, $color, $text]; 3151 delete $self->{texture};
3152 }
2226 3153
2227 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3154 if (my $paridx = delete $self->{scroll_to}) {
2228 $self->{children}[1]->update; 3155 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3156 }
2229} 3157}
2230 3158
2231sub update { 3159sub update {
2232 my ($self) = @_; 3160 my ($self) = @_;
2233 3161
… …
2235 3163
2236 return unless $self->{h} > 0; 3164 return unless $self->{h} > 0;
2237 3165
2238 delete $self->{texture}; 3166 delete $self->{texture};
2239 3167
2240 $ROOT->on_post_alloc ($self, sub { 3168 $ROOT->on_post_alloc ($self => sub {
2241 if (delete $self->{need_reflow}) { 3169 $self->force_uptodate;
2242 my $height = 0;
2243 3170
2244 $height += $_->[0] = $self->text_height ($_->[2]) 3171 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2245 for @{$self->{par}};
2246 3172
2247 $self->{height} = $height; 3173 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2248
2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2250
2251 delete $self->{texture};
2252 }
2253
2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2255 glClearColor 0, 0, 0, 0; 3174 glClearColor 0, 0, 0, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 3175 glClear GL_COLOR_BUFFER_BIT;
2257 3176
2258 glEnable GL_TEXTURE_2D; 3177 package CFPlus::UI::Base;
2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3178 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3179 (0, 0, $self->{w}, $self->{h});
2260 3180
2261 my $top = int $self->{children}[1]{range}[0]; 3181 my $top = int $self->{children}[1]{range}[0];
2262 3182
3183 my $paridx = 0;
3184 my $top_paragraph;
3185 my $top = int $self->{children}[1]{range}[0];
3186
2263 my $y0 = $top; 3187 my $y0 = $top;
2264 my $y1 = $top + $self->{h}; 3188 my $y1 = $top + $H;
2265 3189
2266 my $y = 0;
2267
2268 my $layout = $self->{layout};
2269
2270 $layout->set_font ($self->{font}) if $self->{font};
2271
2272 for my $par (@{$self->{par}}) { 3190 for my $para (@{$self->{par}}) {
2273 my $h = $par->[0]; 3191 my $h = $para->{h};
3192 my $y = $para->{y};
2274 3193
2275 if ($y0 < $y + $h && $y < $y1) { 3194 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] }); 3195 my $layout = $self->get_layout ($para);
2277 $layout->set_markup ($par->[2]);
2278 3196
2279 my ($W, $H) = $layout->size; 3197 $layout->render ($para->{indent}, $y - $y0);
2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 3198
3199 if (my @w = @{ $para->{widget} }) {
3200 my @s = $layout->get_shapes;
3201
3202 for (@w) {
3203 my ($dx, $dy) = splice @s, 0, 2, ();
3204
3205 $_->{x} = $dx + $para->{indent};
3206 $_->{y} = $dy + $y - $y0;
3207
3208 $_->draw;
3209 }
3210 }
2281 } 3211 }
2282 3212
2283 $y += $h; 3213 $paridx++;
3214 $top_paragraph ||= $paridx if $y >= $top;
2284 } 3215 }
2285 3216
2286 glDisable GL_TEXTURE_2D; 3217 $self->{top_paragraph} = $top_paragraph;
2287 }; 3218 };
2288 }); 3219 });
2289} 3220}
2290 3221
3222sub reconfigure {
3223 my ($self) = @_;
3224
3225 $self->SUPER::reconfigure;
3226
3227 $_->{w} = 1e10 for @{ $self->{par} };
3228 $self->reflow;
3229}
3230
2291sub _draw { 3231sub _draw {
2292 my ($self) = @_; 3232 my ($self) = @_;
2293 3233
2294 glEnable GL_TEXTURE_2D; 3234 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3235 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 3236 glColor 0, 0, 0, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3237 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298 glDisable GL_TEXTURE_2D; 3238 glDisable GL_TEXTURE_2D;
2299 3239
2300 $self->{children}[1]->draw; 3240 $self->{children}[1]->draw;
2301
2302} 3241}
2303 3242
2304############################################################################# 3243#############################################################################
2305 3244
2306package CFClient::UI::Animator; 3245package CFPlus::UI::Animator;
2307 3246
2308use CFClient::OpenGL; 3247use CFPlus::OpenGL;
2309 3248
2310our @ISA = CFClient::UI::Bin::; 3249our @ISA = CFPlus::UI::Bin::;
2311 3250
2312sub moveto { 3251sub moveto {
2313 my ($self, $x, $y) = @_; 3252 my ($self, $x, $y) = @_;
2314 3253
2315 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3254 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2343 glPopMatrix; 3282 glPopMatrix;
2344} 3283}
2345 3284
2346############################################################################# 3285#############################################################################
2347 3286
2348package CFClient::UI::Flopper; 3287package CFPlus::UI::Flopper;
2349 3288
2350our @ISA = CFClient::UI::Button::; 3289our @ISA = CFPlus::UI::Button::;
2351 3290
2352sub new { 3291sub new {
2353 my $class = shift; 3292 my $class = shift;
2354 3293
2355 my $self = $class->SUPER::new ( 3294 my $self = $class->SUPER::new (
2356 state => 0, 3295 state => 0,
2357 connect_activate => \&toggle_flopper, 3296 on_activate => \&toggle_flopper,
2358 @_ 3297 @_
2359 ); 3298 );
2360 3299
2361 if ($self->{state}) {
2362 $self->{state} = 0;
2363 $self->toggle_flopper;
2364 }
2365
2366 $self 3300 $self
2367} 3301}
2368 3302
2369sub toggle_flopper { 3303sub toggle_flopper {
2370 my ($self) = @_; 3304 my ($self) = @_;
2371 3305
2372 # TODO: use animation 3306 $self->{other}->toggle_visibility;
2373 if ($self->{state} = !$self->{state}) {
2374 $CFClient::UI::ROOT->add ($self->{other});
2375 $self->{other}->move ($self->coord2global (0, $self->{h}));
2376 $self->emit ("open");
2377 } else {
2378 $CFClient::UI::ROOT->remove ($self->{other});
2379 $self->emit ("close");
2380 }
2381
2382 $self->emit (changed => $self->{state});
2383} 3307}
2384 3308
2385############################################################################# 3309#############################################################################
2386 3310
2387package CFClient::UI::Tooltip; 3311package CFPlus::UI::Tooltip;
2388 3312
2389our @ISA = CFClient::UI::Bin::; 3313our @ISA = CFPlus::UI::Bin::;
2390 3314
2391use CFClient::OpenGL; 3315use CFPlus::OpenGL;
2392 3316
2393sub new { 3317sub new {
2394 my $class = shift; 3318 my $class = shift;
2395 3319
2396 $class->SUPER::new ( 3320 $class->SUPER::new (
… …
2400} 3324}
2401 3325
2402sub set_tooltip_from { 3326sub set_tooltip_from {
2403 my ($self, $widget) = @_; 3327 my ($self, $widget) = @_;
2404 3328
3329 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3330 if $widget->{tooltip} =~ /^#(.*)$/;
3331
3332 my $tooltip = $widget->{tooltip};
3333
3334 if ($ENV{CFPLUS_DEBUG} & 2) {
3335 $tooltip .= "\n\n" . (ref $widget) . "\n"
3336 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3337 . "req $widget->{req_w} $widget->{req_h}\n"
3338 . "visible $widget->{visible}";
3339 }
3340
3341 $tooltip =~ s/^\n+//;
3342 $tooltip =~ s/\n+$//;
3343
2405 $self->add (new CFClient::UI::Label 3344 $self->add (new CFPlus::UI::Label
2406 markup => $widget->{tooltip}, 3345 markup => $tooltip,
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3346 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 3347 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 3348 style => 1, # FLAG_INVERSE
3349 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 3350 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 3351 );
2412} 3352}
2413 3353
2414sub size_request { 3354sub size_request {
2415 my ($self) = @_; 3355 my ($self) = @_;
… …
2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3357 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2418 3358
2419 ($w + 4, $h + 4) 3359 ($w + 4, $h + 4)
2420} 3360}
2421 3361
2422sub size_allocate { 3362sub invoke_size_allocate {
2423 my ($self, $w, $h) = @_; 3363 my ($self, $w, $h) = @_;
2424 3364
2425 $self->SUPER::size_allocate ($w - 4, $h - 4); 3365 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3366}
3367
3368sub invoke_visibility_change {
3369 my ($self, $visible) = @_;
3370
3371 return unless $visible;
3372
3373 $self->{root}->on_post_alloc ("move_$self" => sub {
3374 my $widget = $self->{owner}
3375 or return;
3376
3377 if ($widget->{visible}) {
3378 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3379
3380 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3381 if $x + $self->{w} > $self->{root}{w};
3382
3383 $self->move_abs ($x, $y);
3384 } else {
3385 $self->hide;
3386 }
3387 });
2426} 3388}
2427 3389
2428sub _draw { 3390sub _draw {
2429 my ($self) = @_; 3391 my ($self) = @_;
2430 3392
… …
2447 glVertex $w, $h; 3409 glVertex $w, $h;
2448 glVertex $w, 0; 3410 glVertex $w, 0;
2449 glEnd; 3411 glEnd;
2450 3412
2451 glTranslate 2 - 0.375, 2 - 0.375; 3413 glTranslate 2 - 0.375, 2 - 0.375;
3414
2452 $self->SUPER::_draw; 3415 $self->SUPER::_draw;
2453} 3416}
2454 3417
2455############################################################################# 3418#############################################################################
2456 3419
2457package CFClient::UI::Face; 3420package CFPlus::UI::Face;
2458 3421
2459our @ISA = CFClient::UI::Base::; 3422our @ISA = CFPlus::UI::DrawBG::;
2460 3423
2461use CFClient::OpenGL; 3424use CFPlus::OpenGL;
2462 3425
2463sub new { 3426sub new {
2464 my $class = shift; 3427 my $class = shift;
2465 3428
2466 $class->SUPER::new ( 3429 my $self = $class->SUPER::new (
3430 size_w => 32,
3431 size_h => 8,
2467 aspect => 1, 3432 aspect => 1,
3433 can_events => 0,
2468 @_, 3434 @_,
2469 ) 3435 );
3436
3437 if ($self->{anim} && $self->{animspeed}) {
3438 CFPlus::weaken (my $widget = $self);
3439
3440 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3441 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3442 $self->{timer} = Event->timer (
3443 parked => 1,
3444 cb => sub {
3445 return unless $::CONN && $widget;
3446
3447 ++$widget->{frame};
3448 $widget->update_face;
3449 $widget->update;
3450
3451 $widget->update_timer;
3452 },
3453 );
3454
3455 $self->update_face;
3456 $self->update_timer;
3457 }
3458
3459 $self
3460}
3461
3462sub update_timer {
3463 my ($self) = @_;
3464
3465 return unless $self->{timer};
3466
3467 if ($self->{visible}) {
3468 $self->{timer}->at (
3469 $self->{anim_start}
3470 + $self->{animspeed}
3471 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3472 );
3473 $self->{timer}->start;
3474 } else {
3475 $self->{timer}->stop;
3476 }
3477}
3478
3479sub update_face {
3480 my ($self) = @_;
3481
3482 return unless $::CONN;
3483
3484 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3485 if ($anim && @$anim) {
3486 delete $self->{wait_face};
3487 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3488 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3489 }
3490 }
2470} 3491}
2471 3492
2472sub size_request { 3493sub size_request {
2473 (32, 8) 3494 my ($self) = @_;
3495
3496 if ($::CONN) {
3497 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3498 if (my $tex = $::CONN->{texture}[$faceid]) {
3499 $self->{tex} = $tex;
3500 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3501 } else {
3502 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3503 $self->realloc;
3504 });
3505 }
3506 }
3507 }
3508
3509 ($self->{size_w} || 8, $self->{size_h} || 8)
3510}
3511
3512sub update {
3513 my ($self) = @_;
3514
3515 return unless $self->{visible};
3516
3517 $self->SUPER::update;
3518}
3519
3520sub invoke_visibility_change {
3521 my ($self) = @_;
3522
3523 $self->update_timer;
3524
3525 0
2474} 3526}
2475 3527
2476sub _draw { 3528sub _draw {
2477 my ($self) = @_; 3529 my ($self) = @_;
2478 3530
2479 return unless $::CONN;#d# manage and cache textures differently 3531 $self->SUPER::_draw;
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2481 3532
2482 # TODO animation 3533 if (my $tex = $self->{tex}) {
2483 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 3534 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3535 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 3536 glColor 0, 0, 0, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3537 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 3538 glDisable GL_TEXTURE_2D;
2489 } 3539 }
2490} 3540}
2491 3541
3542sub destroy {
3543 my ($self) = @_;
3544
3545 (delete $self->{timer})->cancel
3546 if $self->{timer};
3547
3548 $self->SUPER::destroy;
3549}
3550
2492############################################################################# 3551#############################################################################
2493 3552
2494package CFClient::UI::InventoryItem; 3553package CFPlus::UI::Buttonbar;
2495 3554
2496our @ISA = CFClient::UI::HBox::; 3555our @ISA = CFPlus::UI::HBox::;
2497 3556
2498sub new { 3557# TODO: should actually wrap buttons and other goodies.
2499 my $class = shift;
2500
2501 my %args = @_;
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2
2506 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}";
2508
2509
2510 my $self = $class->SUPER::new (
2511 can_hover => 1,
2512 can_events => 1,
2513 tooltip => (CFClient::UI::Label->escape ($desc)
2514 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2515 connect_button_down => sub {
2516 my ($self, $ev, $x, $y) = @_;
2517
2518 # todo: maybe put examine on 1? but should just be a tooltip :(
2519 if ($ev->{button} == 1) {
2520 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2521 } elsif ($ev->{button} == 2) {
2522 $::CONN->send ("apply $item->{tag}");
2523 } elsif ($ev->{button} == 3) {
2524 CFClient::UI::Menu->new (
2525 items => [
2526 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2527 [
2528 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2529 sub { $::CONN->send ("lock $item->{tag}") },
2530 ],
2531 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2532 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2533 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2534 ],
2535 )->popup ($ev);
2536 }
2537
2538 1
2539 },
2540 %args
2541 );
2542
2543 $self->add (new CFClient::UI::Face
2544 can_events => 0,
2545 face => $item->{face},
2546 anim => $item->{anim},
2547 animspeed => $item->{animspeed},
2548 );
2549
2550 $self->add (new CFClient::UI::Label
2551 can_events => 0,
2552 text => $desc,
2553 );
2554
2555 $self
2556}
2557 3558
2558############################################################################# 3559#############################################################################
2559 3560
2560package CFClient::UI::Inventory;
2561
2562our @ISA = CFClient::UI::ScrolledWindow::;
2563
2564sub new {
2565 my $class = shift;
2566
2567 my $self = $class->SUPER::new (
2568 scrolled => (new CFClient::UI::VBox),
2569 @_,
2570 );
2571
2572 $self
2573}
2574
2575sub set_items {
2576 my ($self, $items) = @_;
2577
2578 $self->{scrolled}->clear;
2579 return unless $items;
2580
2581 my @items = sort {
2582 ($a->{type} <=> $b->{type})
2583 or ($a->{name} cmp $b->{name})
2584 } @$items;
2585
2586 $self->{real_items} = \@items;
2587
2588 for my $item (@items) {
2589 my $desc = $item->{nrof} < 2
2590 ? $item->{name}
2591 : "$item->{nrof} $item->{name_pl}";
2592
2593 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2594 }
2595
2596 $self->{scrolled}->add (@items);
2597
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599}
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604}
2605
2606#############################################################################
2607
2608package CFClient::UI::Menu; 3561package CFPlus::UI::Menu;
2609 3562
2610our @ISA = CFClient::UI::FancyFrame::; 3563our @ISA = CFPlus::UI::Toplevel::;
2611 3564
2612use CFClient::OpenGL; 3565use CFPlus::OpenGL;
2613 3566
2614sub new { 3567sub new {
2615 my $class = shift; 3568 my $class = shift;
2616 3569
2617 my $self = $class->SUPER::new ( 3570 my $self = $class->SUPER::new (
2618 items => [], 3571 items => [],
2619 z => 100, 3572 z => 100,
2620 @_, 3573 @_,
2621 ); 3574 );
2622 3575
2623 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3576 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2624 3577
2625 for my $item (@{ $self->{items} }) { 3578 for my $item (@{ $self->{items} }) {
2626 my ($widget, $cb) = @$item; 3579 my ($widget, $cb, $tooltip) = @$item;
2627 3580
2628 # handle various types of items, only text for now 3581 # handle various types of items, only text for now
2629 if (!ref $widget) { 3582 if (!ref $widget) {
3583 if ($widget =~ /\t/) {
3584 my ($left, $right) = split /\t/, $widget, 2;
3585
2630 $widget = new CFClient::UI::Label 3586 $widget = new CFPlus::UI::HBox
2631 can_hover => 1, 3587 can_hover => 1,
2632 can_events => 1, 3588 can_events => 1,
3589 tooltip => $tooltip,
3590 children => [
3591 (new CFPlus::UI::Label markup => $left, expand => 1),
3592 (new CFPlus::UI::Label markup => $right, align => +1),
3593 ],
3594 ;
3595
3596 } else {
3597 $widget = new CFPlus::UI::Label
3598 can_hover => 1,
3599 can_events => 1,
2633 text => $widget; 3600 markup => $widget,
3601 tooltip => $tooltip;
3602 }
2634 } 3603 }
2635 3604
2636 $self->{item}{$widget} = $item; 3605 $self->{item}{$widget} = $item;
2637 3606
2638 $self->{vbox}->add ($widget); 3607 $self->{vbox}->add ($widget);
… …
2650 # maybe save $GRAB? must be careful about events... 3619 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 3620 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 3621 $self->{button} = $ev->{button};
2653 3622
2654 $self->show; 3623 $self->show;
2655 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3624 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2656} 3625}
2657 3626
2658sub mouse_motion { 3627sub invoke_mouse_motion {
2659 my ($self, $ev, $x, $y) = @_; 3628 my ($self, $ev, $x, $y) = @_;
2660 3629
2661 # TODO: should use vbox->find_widget or so 3630 # TODO: should use vbox->find_widget or so
2662 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2663 $self->{hover} = $self->{item}{$HOVER}; 3632 $self->{hover} = $self->{item}{$HOVER};
2664}
2665 3633
3634 0
3635}
3636
2666sub button_up { 3637sub invoke_button_up {
2667 my ($self, $ev, $x, $y) = @_; 3638 my ($self, $ev, $x, $y) = @_;
2668 3639
2669 if ($ev->{button} == $self->{button}) { 3640 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 3641 undef $GRAB;
2671 $self->hide; 3642 $self->hide;
2672 3643
2673 $self->emit ("popdown"); 3644 $self->emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 3645 $self->{hover}[1]->() if $self->{hover};
3646 } else {
3647 return 0
3648 }
3649
2675 } 3650 1
2676} 3651}
2677 3652
2678############################################################################# 3653#############################################################################
2679 3654
2680package CFClient::UI::Statusbox; 3655package CFPlus::UI::Multiplexer;
2681 3656
3657our @ISA = CFPlus::UI::Container::;
3658
3659sub new {
3660 my $class = shift;
3661
3662 my $self = $class->SUPER::new (
3663 @_,
3664 );
3665
3666 $self->{current} = $self->{children}[0]
3667 if @{ $self->{children} };
3668
3669 $self
3670}
3671
3672sub add {
3673 my ($self, @widgets) = @_;
3674
3675 $self->SUPER::add (@widgets);
3676
3677 $self->{current} = $self->{children}[0]
3678 if @{ $self->{children} };
3679}
3680
3681sub get_current_page {
3682 my ($self) = @_;
3683
3684 $self->{current}
3685}
3686
3687sub set_current_page {
3688 my ($self, $page_or_widget) = @_;
3689
3690 my $widget = ref $page_or_widget
3691 ? $page_or_widget
3692 : $self->{children}[$page_or_widget];
3693
3694 $self->{current} = $widget;
3695 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3696
3697 $self->emit (page_changed => $self->{current});
3698
3699 $self->realloc;
3700}
3701
3702sub visible_children {
3703 $_[0]{current}
3704}
3705
3706sub size_request {
3707 my ($self) = @_;
3708
3709 $self->{current}->size_request
3710}
3711
3712sub invoke_size_allocate {
3713 my ($self, $w, $h) = @_;
3714
3715 $self->{current}->configure (0, 0, $w, $h);
3716
3717 1
3718}
3719
3720sub _draw {
3721 my ($self) = @_;
3722
3723 $self->{current}->draw;
3724}
3725
3726#############################################################################
3727
3728package CFPlus::UI::Notebook;
3729
2682our @ISA = CFClient::UI::VBox::; 3730our @ISA = CFPlus::UI::VBox::;
3731
3732sub new {
3733 my $class = shift;
3734
3735 my $self = $class->SUPER::new (
3736 buttonbar => (new CFPlus::UI::Buttonbar),
3737 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3738 # filter => # will be put between multiplexer and $self
3739 @_,
3740 );
3741
3742 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3743 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3744
3745 $self
3746}
3747
3748sub add {
3749 my ($self, $title, $widget, $tooltip) = @_;
3750
3751 CFPlus::weaken $self;
3752
3753 $self->{buttonbar}->add (new CFPlus::UI::Button
3754 markup => $title,
3755 tooltip => $tooltip,
3756 on_activate => sub { $self->set_current_page ($widget) },
3757 );
3758
3759 $self->{multiplexer}->add ($widget);
3760}
3761
3762sub get_current_page {
3763 my ($self) = @_;
3764
3765 $self->{multiplexer}->get_current_page
3766}
3767
3768sub set_current_page {
3769 my ($self, $page) = @_;
3770
3771 $self->{multiplexer}->set_current_page ($page);
3772 $self->emit (page_changed => $self->{multiplexer}{current});
3773}
3774
3775#############################################################################
3776
3777package CFPlus::UI::Selector;
3778
3779use utf8;
3780
3781our @ISA = CFPlus::UI::Button::;
3782
3783sub new {
3784 my $class = shift;
3785
3786 my $self = $class->SUPER::new (
3787 options => [], # [value, title, longdesc], ...
3788 value => undef,
3789 @_,
3790 );
3791
3792 $self->_set_value ($self->{value});
3793
3794 $self
3795}
3796
3797sub invoke_button_down {
3798 my ($self, $ev) = @_;
3799
3800 my @menu_items;
3801
3802 for (@{ $self->{options} }) {
3803 my ($value, $title, $tooltip) = @$_;
3804
3805 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3806 }
3807
3808 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3809}
3810
3811sub _set_value {
3812 my ($self, $value) = @_;
3813
3814 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3815 or return;
3816
3817 $self->{value} = $item->[0];
3818 $self->set_markup ("$item->[1] ⇓");
3819 $self->set_tooltip ($item->[2]);
3820}
3821
3822sub set_value {
3823 my ($self, $value) = @_;
3824
3825 return unless $self->{value} ne $value;
3826
3827 $self->_set_value ($value);
3828 $self->emit (changed => $value);
3829}
3830
3831#############################################################################
3832
3833package CFPlus::UI::Statusbox;
3834
3835our @ISA = CFPlus::UI::VBox::;
3836
3837sub new {
3838 my $class = shift;
3839
3840 my $self = $class->SUPER::new (
3841 fontsize => 0.8,
3842 @_,
3843 );
3844
3845 CFPlus::weaken (my $this = $self);
3846
3847 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3848
3849 $self
3850}
2683 3851
2684sub reorder { 3852sub reorder {
2685 my ($self) = @_; 3853 my ($self) = @_;
2686 my $NOW = time; 3854 my $NOW = Time::HiRes::time;
3855
3856 # freeze display when hovering over any label
3857 return if $CFPlus::UI::TOOLTIP->{owner}
3858 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3859 values %{ $self->{item} };
2687 3860
2688 while (my ($k, $v) = each %{ $self->{item} }) { 3861 while (my ($k, $v) = each %{ $self->{item} }) {
2689 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3862 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2690 } 3863 }
2691 3864
… …
2694 my @items = sort { 3867 my @items = sort {
2695 $a->{pri} <=> $b->{pri} 3868 $a->{pri} <=> $b->{pri}
2696 or $b->{id} <=> $a->{id} 3869 or $b->{id} <=> $a->{id}
2697 } values %{ $self->{item} }; 3870 } values %{ $self->{item} };
2698 3871
3872 $self->{timer}->interval (1);
3873
2699 my $count = 10 + 1; 3874 my $count = 10 + 1;
2700 for my $item (@items) { 3875 for my $item (@items) {
2701 last unless --$count; 3876 last unless --$count;
2702 3877
2703 push @widgets, $item->{label} ||= do { 3878 my $label = $item->{label} ||= do {
2704 # TODO: doesn't handle markup well (read as: at all) 3879 # TODO: doesn't handle markup well (read as: at all)
2705 my $short = $item->{count} > 1 3880 my $short = $item->{count} > 1
2706 ? "<b>$item->{count} ×</b> $item->{text}" 3881 ? "<b>$item->{count} ×</b> $item->{text}"
2707 : $item->{text}; 3882 : $item->{text};
2708 3883
2709 for ($short) { 3884 for ($short) {
2710 s/^\s+//; 3885 s/^\s+//;
2711 s/\s+/ /g; 3886 s/\s+/ /g;
2712 my $len = int 40 / $item->{fontsize};
2713 substr $_, $len, length, "…" if $len < length;
2714 } 3887 }
2715 3888
2716 new CFClient::UI::Label 3889 new CFPlus::UI::Label
2717 markup => $short, 3890 markup => $short,
2718 tooltip => $item->{tooltip}, 3891 tooltip => $item->{tooltip},
2719 tooltip_font => $::FONT_PROP, 3892 tooltip_font => $::FONT_PROP,
2720 tooltip_width => 0.67, 3893 tooltip_width => 0.67,
2721 fontsize => $item->{fontsize}, 3894 fontsize => $item->{fontsize} || $self->{fontsize},
3895 max_w => $::WIDTH * 0.44,
2722 fg => $item->{fg}, 3896 fg => [@{ $item->{fg} }],
2723 can_events => 1, 3897 can_events => 1,
2724 can_hover => 1 3898 can_hover => 1
2725 }; 3899 };
3900
3901 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3902 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3903 $label->update;
3904 $label->set_max_size (undef, $label->{req_h} * $diff)
3905 if $diff < 1;
3906 $self->{timer}->interval (1/30);
3907 } else {
3908 $label->{fg}[3] = $item->{fg}[3] || 1;
3909 }
3910
3911 push @widgets, $label;
2726 } 3912 }
2727 3913
2728 $self->clear; 3914 $self->clear;
2729 $self->SUPER::add (reverse @widgets); 3915 $self->SUPER::add (reverse @widgets);
2730} 3916}
… …
2733 my ($self, $text, %arg) = @_; 3919 my ($self, $text, %arg) = @_;
2734 3920
2735 $text =~ s/^\s+//; 3921 $text =~ s/^\s+//;
2736 $text =~ s/\s+$//; 3922 $text =~ s/\s+$//;
2737 3923
3924 return unless $text;
3925
2738 my $timeout = time + ((delete $arg{timeout}) || 60); 3926 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2739 3927
2740 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2741 3929
2742 if (my $item = $self->{item}{$group}) { 3930 if (my $item = $self->{item}{$group}) {
2743 if ($item->{text} eq $text) { 3931 if ($item->{text} eq $text) {
2744 $item->{count}++; 3932 $item->{count}++;
2745 } else { 3933 } else {
2746 $item->{count} = 1; 3934 $item->{count} = 1;
2747 $item->{text} = $item->{tooltip} = $text; 3935 $item->{text} = $item->{tooltip} = $text;
2748 } 3936 }
2749 $item->{id} = ++$self->{id}; 3937 $item->{id} += 0.2;#d#
2750 $item->{timeout} = $timeout; 3938 $item->{timeout} = $timeout;
2751 delete $item->{label}; 3939 delete $item->{label};
2752 } else { 3940 } else {
2753 $self->{item}{$group} = { 3941 $self->{item}{$group} = {
2754 id => ++$self->{id}, 3942 id => ++$self->{id},
2755 text => $text, 3943 text => $text,
2756 timeout => $timeout, 3944 timeout => $timeout,
2757 tooltip => $text, 3945 tooltip => $text,
2758 fontsize => 0.8,
2759 fg => [0.8, 0.8, 0.8, 0.8], 3946 fg => [0.8, 0.8, 0.8, 0.8],
2760 pri => 0, 3947 pri => 0,
2761 count => 1, 3948 count => 1,
2762 %arg, 3949 %arg,
2763 }; 3950 };
2764 } 3951 }
2765 3952
3953 $ROOT->on_refresh (reorder => sub {
3954 $self->reorder;
3955 });
3956}
3957
3958sub reconfigure {
3959 my ($self) = @_;
3960
3961 delete $_->{label}
3962 for values %{ $self->{item} || {} };
3963
2766 $self->reorder; 3964 $self->reorder;
3965 $self->SUPER::reconfigure;
3966}
3967
3968sub destroy {
3969 my ($self) = @_;
3970
3971 $self->{timer}->cancel;
3972
3973 $self->SUPER::destroy;
2767} 3974}
2768 3975
2769############################################################################# 3976#############################################################################
2770 3977
2771package CFClient::UI::Root; 3978package CFPlus::UI::Root;
2772 3979
2773our @ISA = CFClient::UI::Container::; 3980our @ISA = CFPlus::UI::Container::;
2774 3981
3982use List::Util qw(min max);
3983
2775use CFClient::OpenGL; 3984use CFPlus::OpenGL;
2776 3985
2777sub new { 3986sub new {
2778 my $class = shift; 3987 my $class = shift;
2779 3988
2780 $class->SUPER::new ( 3989 my $self = $class->SUPER::new (
3990 visible => 1,
2781 @_, 3991 @_,
2782 ) 3992 );
2783}
2784 3993
2785sub configure { 3994 CFPlus::weaken ($self->{root} = $self);
2786 my ($self, $x, $y, $w, $h) = @_;
2787 3995
2788 $self->{w} = $w; 3996 $self
2789 $self->{h} = $h;
2790}
2791
2792sub check_size {
2793 my ($self) = @_;
2794
2795 $self->size_allocate ($self->{w}, $self->{h})
2796 if $self->{w};
2797} 3997}
2798 3998
2799sub size_request { 3999sub size_request {
2800 my ($self) = @_; 4000 my ($self) = @_;
2801 4001
2802 ($self->{w}, $self->{h}) 4002 ($self->{w}, $self->{h})
2803} 4003}
2804 4004
4005sub _to_pixel {
4006 my ($coord, $size, $max) = @_;
4007
4008 $coord =
4009 $coord eq "center" ? ($max - $size) * 0.5
4010 : $coord eq "max" ? $max
4011 : $coord;
4012
4013 $coord = 0 if $coord < 0;
4014 $coord = $max - $size if $coord > $max - $size;
4015
4016 int $coord + 0.5
4017}
4018
2805sub size_allocate { 4019sub invoke_size_allocate {
2806 my ($self, $w, $h) = @_; 4020 my ($self, $w, $h) = @_;
2807
2808 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2809 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2810
2811 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2812 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2813 4021
2814 for my $child ($self->children) { 4022 for my $child ($self->children) {
2815 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2816 4024
2817 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4025 $X = $child->{force_x} if exists $child->{force_x};
2818 if exists $child->{req_x}; 4026 $Y = $child->{force_y} if exists $child->{force_y};
2819 4027
2820 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4028 $X = _to_pixel $X, $W, $self->{w};
2821 if exists $child->{req_y}; 4029 $Y = _to_pixel $Y, $H, $self->{h};
2822
2823 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2824 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2825 4030
2826 $child->configure ($X, $Y, $W, $H); 4031 $child->configure ($X, $Y, $W, $H);
2827 } 4032 }
4033
4034 1
2828} 4035}
2829 4036
2830sub coord2local { 4037sub coord2local {
2831 my ($self, $x, $y) = @_; 4038 my ($self, $x, $y) = @_;
2832 4039
… …
2840} 4047}
2841 4048
2842sub update { 4049sub update {
2843 my ($self) = @_; 4050 my ($self) = @_;
2844 4051
2845 $self->check_size;
2846 $::WANT_REFRESH++; 4052 $::WANT_REFRESH++;
2847} 4053}
2848 4054
2849sub add { 4055sub add {
2850 my ($self, @children) = @_; 4056 my ($self, @children) = @_;
2851 4057
2852 for my $child (@children) {
2853 $child->{toplevel} = 1; 4058 $_->{is_toplevel} = 1
2854 4059 for @children;
2855 # integerise window positions
2856 $child->{x} = int $child->{x};
2857 $child->{y} = int $child->{y};
2858 }
2859 4060
2860 $self->SUPER::add (@children); 4061 $self->SUPER::add (@children);
4062}
4063
4064sub remove {
4065 my ($self, @children) = @_;
4066
4067 $self->SUPER::remove (@children);
4068
4069 delete $self->{is_toplevel}
4070 for @children;
4071
4072 while (@children) {
4073 my $w = pop @children;
4074 push @children, $w->children;
4075 $w->set_invisible;
4076 }
2861} 4077}
2862 4078
2863sub on_refresh { 4079sub on_refresh {
2864 my ($self, $id, $cb) = @_; 4080 my ($self, $id, $cb) = @_;
2865 4081
… …
2878 while ($self->{refresh_hook}) { 4094 while ($self->{refresh_hook}) {
2879 $_->() 4095 $_->()
2880 for values %{delete $self->{refresh_hook}}; 4096 for values %{delete $self->{refresh_hook}};
2881 } 4097 }
2882 4098
2883 if ($self->{check_size}) { 4099 while ($self->{realloc}) {
2884 my @queue = ([], []); 4100 my %queue;
4101 my @queue;
4102 my $widget;
2885 4103
2886 for (;;) { 4104 outer:
2887 if ($self->{check_size}) { 4105 while () {
2888 # heuristic: check containers last 4106 if (my $realloc = delete $self->{realloc}) {
2889 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4107 for $widget (values %$realloc) {
2890 for values %{delete $self->{check_size}} 4108 $widget->{visible} or next; # do not resize invisible widgets
4109
4110 $queue{$widget+0}++ and next; # duplicates are common
4111
4112 push @{ $queue[$widget->{visible}] }, $widget;
4113 }
2891 } 4114 }
2892 4115
2893 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4116 while () {
4117 @queue or last outer;
2894 4118
2895 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4119 $widget = pop @{ $queue[-1] || [] }
2896 ? @$widget{qw(user_w user_h)} 4120 and last;
2897 : $widget->size_request;
2898
2899 if (delete $widget->{force_alloc}
2900 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2901 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2902 4121
4122 pop @queue;
4123 }
4124
4125 delete $queue{$widget+0};
4126
4127 my ($w, $h) = $widget->size_request;
4128
4129 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4130 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4131
4132 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4133 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4134
4135 $w = $widget->{force_w} if exists $widget->{force_w};
4136 $h = $widget->{force_h} if exists $widget->{force_h};
4137
4138 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4139 || delete $widget->{force_realloc}) {
2903 $widget->{req_w} = $w; 4140 $widget->{req_w} = $w;
2904 $widget->{req_h} = $h; 4141 $widget->{req_h} = $h;
2905 4142
2906 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4143 $self->{size_alloc}{$widget+0} = $widget;
2907 4144
2908 $widget->{parent}->check_size
2909 if $widget->{parent}; 4145 if (my $parent = $widget->{parent}) {
4146 $self->{realloc}{$parent+0} = $parent
4147 unless $queue{$parent+0};
4148
4149 $parent->{force_size_alloc} = 1;
4150 $self->{size_alloc}{$parent+0} = $parent;
4151 }
2910 } 4152 }
4153
4154 delete $self->{realloc}{$widget+0};
2911 } 4155 }
2912 }
2913 4156
2914 while ($self->{size_alloc}) { 4157 while (my $size_alloc = delete $self->{size_alloc}) {
2915 for (values %{delete $self->{size_alloc}}) { 4158 my @queue = sort { $a->{visible} <=> $b->{visible} }
2916 my ($widget, $w, $h) = @$_; 4159 values %$size_alloc;
2917 4160
4161 while () {
4162 my $widget = pop @queue || last;
4163
4164 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4165
4166 $w = max $widget->{min_w}, $w;
4167 $h = max $widget->{min_h}, $h;
4168
4169# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4170# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4171
4172 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4173 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4174
2918 $w = 0 if $w < 0; 4175 $w = int $w + 0.5;
2919 $h = 0 if $h < 0; 4176 $h = int $h + 0.5;
2920 4177
4178 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4179 $widget->{old_w} = $widget->{w};
4180 $widget->{old_h} = $widget->{h};
4181
2921 $widget->{w} = $w; 4182 $widget->{w} = $w;
2922 $widget->{h} = $h; 4183 $widget->{h} = $h;
2923 $widget->size_allocate ($w, $h); 4184
2924 $widget->emit (size_allocate => $w, $h); 4185 $widget->emit (size_allocate => $w, $h);
4186 }
4187 }
2925 } 4188 }
2926 } 4189 }
2927 4190
2928 while ($self->{post_alloc_hook}) { 4191 while ($self->{post_alloc_hook}) {
2929 $_->() 4192 $_->()
… …
2934 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4197 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2935 glClear GL_COLOR_BUFFER_BIT; 4198 glClear GL_COLOR_BUFFER_BIT;
2936 4199
2937 glMatrixMode GL_PROJECTION; 4200 glMatrixMode GL_PROJECTION;
2938 glLoadIdentity; 4201 glLoadIdentity;
2939 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4202 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2940 glMatrixMode GL_MODELVIEW; 4203 glMatrixMode GL_MODELVIEW;
2941 glLoadIdentity; 4204 glLoadIdentity;
2942 4205
4206 {
4207 package CFPlus::UI::Base;
4208
4209 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4210 (0, 0, $self->{w}, $self->{h});
4211
2943 $self->_draw; 4212 $self->_draw;
4213 }
2944} 4214}
2945 4215
2946############################################################################# 4216#############################################################################
2947 4217
2948package CFClient::UI; 4218package CFPlus::UI;
2949 4219
2950$ROOT = new CFClient::UI::Root; 4220$ROOT = new CFPlus::UI::Root;
2951$TOOLTIP = new CFClient::UI::Tooltip; 4221$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2952 4222
29531 42231
2954 4224

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines