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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.458 by root, Fri Dec 28 15:05:33 2007 UTC

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

Diff Legend

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