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.408 by root, Sun Jul 22 15:26:01 2007 UTC vs.
Revision 1.486 by root, Wed Nov 21 13:23:10 2012 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
6
7use Event; 7use AnyEvent ();
8use Guard ();
8 9
9use CFPlus; 10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 119
121 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
123 122
124 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
142 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 142 $grab->update if $grab;
144 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
145 144
146 check_hover $widget; 145 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
148 } 147 }
149} 148}
150 149
151sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
152 my ($ev) = @_; 151 my ($ev) = @_;
192# call when resolution changes etc. 191# call when resolution changes etc.
193sub rescale_widgets { 192sub rescale_widgets {
194 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
195 194
196 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
197 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200 199
201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
214 reconfigure_widgets; 213 reconfigure_widgets;
215} 214}
216 215
217############################################################################# 216#############################################################################
218 217
219package CFPlus::UI::Event; 218package DC::UI::Event;
220 219
221sub xy { 220sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 222}
224 223
225############################################################################# 224#############################################################################
226 225
227package CFPlus::UI::Base; 226package DC::UI::Base;
228 227
229use strict; 228use common::sense;
230 229
231use CFPlus::OpenGL; 230use DC::OpenGL;
232 231
233sub new { 232sub new {
234 my $class = shift; 233 my $class = shift;
235 234
236 my $self = bless { 235 my $self = bless {
241 h => undef, 240 h => undef,
242 can_events => 1, 241 can_events => 1,
243 @_ 242 @_
244 }, $class; 243 }, $class;
245 244
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 246
248 for (keys %$self) { 247 for (keys %$self) {
249 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
251 } 250 }
252 } 251 }
253 252
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259 258
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 261
263 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
273 $self->emit ("destroy"); 272 $self->emit ("destroy");
274 %$self = (); 273 %$self = ();
275} 274}
276 275
277sub TO_JSON { 276sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
279} 278}
280 279
281sub show { 280sub show {
282 my ($self) = @_; 281 my ($self) = @_;
283 282
284 return if $self->{parent}; 283 return if $self->{parent};
285 284
286 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
287} 286}
288 287
289sub set_visible { 288sub set_visible {
290 my ($self) = @_; 289 my ($self) = @_;
291 290
292 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293 295
294 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
296 298
297 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
298 300
299 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
300 302
301 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
302} 304}
303 305
304sub set_invisible { 306sub set_invisible {
305 my ($self) = @_; 307 my ($self) = @_;
306 308
312 delete $self->{root}; 314 delete $self->{root};
313 315
314 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
316 318
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
319 321
320 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
322} 324}
341sub hide { 343sub hide {
342 my ($self) = @_; 344 my ($self) = @_;
343 345
344 $self->set_invisible; 346 $self->set_invisible;
345 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 351 $parent->remove ($self);
347 if $self->{parent}; 352 }
348} 353}
349 354
350sub move_abs { 355sub move_abs {
351 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
352 357
358} 363}
359 364
360sub set_size { 365sub set_size {
361 my ($self, $w, $h) = @_; 366 my ($self, $w, $h) = @_;
362 367
363 $self->{force_w} = $w; 368 $self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH );
364 $self->{force_h} = $h; 369 $self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT);
365 370
366 $self->realloc; 371 $self->realloc;
372}
373
374# traverse the widget chain up to find the maximum "physical" size constraints
375sub get_max_wh {
376 my ($self) = @_;
377
378 my ($w, $h) = @$self{qw(max_w max_h)};
379
380 if ($w <= 0 || $h <= 0) {
381 my ($mw, $mh) = $self->{parent}
382 ? $self->{parent}->get_max_wh
383 : ($::WIDTH, $::HEIGHT);
384
385 $w = $mw if $w <= 0;
386 $h = $mh if $h <= 0;
387 }
388
389 ($w, $h)
367} 390}
368 391
369sub size_request { 392sub size_request {
370 require Carp; 393 require Carp;
371 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
379 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
380 403
381 if ($self->{aspect}) { 404 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
383 406
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 409
387 # use alignment to adjust x, y 410 # use alignment to adjust x, y
388 411
389 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
431 454
432 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
433 456
434 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
435 458
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 462 }
440} 463}
441 464
442# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
443sub coord2local { 466sub coord2local {
444 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
445 468
446 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
447 470
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 472}
450 473
451# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
452sub coord2global { 475sub coord2global {
453 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
454 477
455 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
456 479
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 481}
459 482
460sub invoke_focus_in { 483sub invoke_focus_in {
509sub connect { 532sub connect {
510 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
511 534
512 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
513 536
514 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
517 } 540 }
518} 541}
519 542
557# in .xs 580# in .xs
558 581
559sub set_parent { 582sub set_parent {
560 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
561 584
562 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
564} 587}
565 588
566sub realloc { 589sub realloc {
567 my ($self) = @_; 590 my ($self) = @_;
605} 628}
606 629
607sub DESTROY { 630sub DESTROY {
608 my ($self) = @_; 631 my ($self) = @_;
609 632
610 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
611 634
635 local $@;
612 eval { $self->destroy }; 636 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 638
615 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
616} 640}
617 641
618############################################################################# 642#############################################################################
619 643
620package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
621 645
622our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
623 647
624use strict; 648use common::sense;
649
625use CFPlus::OpenGL; 650use DC::OpenGL;
626 651
627sub new { 652sub new {
628 my $class = shift; 653 my $class = shift;
629
630 # range [value, low, high, page]
631 654
632 $class->SUPER::new ( 655 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 656 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 657 #active_bg => [1, 1, 1, 0.5],
635 @_ 658 @_
636 ) 659 )
637} 660}
638 661
662sub set_bg {
663 my ($self, $bg) = @_;
664
665 $self->{bg} = $bg;
666 $self->update;
667}
668
639sub _draw { 669sub _draw {
640 my ($self) = @_; 670 my ($self) = @_;
641 671
642 my $color = $FOCUS == $self && $self->{active_bg} 672 my $color = $FOCUS == $self
643 ? $self->{active_bg} 673 ? $self->{active_bg} || $self->{bg}
644 : $self->{bg}; 674 : $self->{bg};
645 675
646 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
647 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
648 678
649 glEnable GL_BLEND; 679 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 681 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 682 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 683 glDisable GL_BLEND;
661 } 684 }
662} 685}
663 686
664############################################################################# 687#############################################################################
665 688
666package CFPlus::UI::Empty; 689package DC::UI::Empty;
667 690
668our @ISA = CFPlus::UI::Base::; 691our @ISA = DC::UI::Base::;
669 692
670sub new { 693sub new {
671 my ($class, %arg) = @_; 694 my ($class, %arg) = @_;
672 $class->SUPER::new (can_events => 0, %arg); 695 $class->SUPER::new (can_events => 0, %arg);
673} 696}
680 703
681sub draw { } 704sub draw { }
682 705
683############################################################################# 706#############################################################################
684 707
685package CFPlus::UI::Container; 708package DC::UI::Container;
686 709
687our @ISA = CFPlus::UI::Base::; 710our @ISA = DC::UI::Base::;
688 711
689sub new { 712sub new {
690 my ($class, %arg) = @_; 713 my ($class, %arg) = @_;
691 714
692 my $children = delete $arg{children}; 715 my $children = delete $arg{children};
725 @{$self->{children}}, @widgets 748 @{$self->{children}}, @widgets
726 ]; 749 ];
727 750
728 $self->realloc; 751 $self->realloc;
729 752
753 $self->emit (c_add => \@widgets);
754
730 map $_+0, @widgets 755 map $_+0, @widgets
731} 756}
732 757
733sub children { 758sub children {
734 @{ $_[0]{children} } 759 @{ $_[0]{children} }
735} 760}
736 761
737sub remove { 762sub remove {
738 my ($self, $child) = @_; 763 my ($self, @widgets) = @_;
739 764
765 $self->emit (c_remove => \@widgets);
766
767 for my $child (@widgets) {
740 delete $child->{parent}; 768 delete $child->{parent};
741 $child->hide; 769 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
771 }
744 772
745 $self->realloc; 773 $self->realloc;
746} 774}
747 775
748sub clear { 776sub clear {
776} 804}
777 805
778sub _draw { 806sub _draw {
779 my ($self) = @_; 807 my ($self) = @_;
780 808
781 $_->draw for @{$self->{children}}; 809 $_->draw for $self->visible_children;
782} 810}
783 811
784############################################################################# 812#############################################################################
785 813
786package CFPlus::UI::Bin; 814package DC::UI::Bin;
787 815
788our @ISA = CFPlus::UI::Container::; 816our @ISA = DC::UI::Container::;
789 817
790sub new { 818sub new {
791 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
792 820
793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 821 my $child = (delete $arg{child}) || new DC::UI::Empty::;
794 822
795 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
796} 824}
797 825
798sub add { 826sub add {
799 my ($self, $child) = @_; 827 my ($self, $child) = @_;
800 828
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 829 $self->clear;
802 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
803} 831}
804 832
805sub remove { 833sub remove {
806 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
807 835
808 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
809 837
810 $self->{children} = [new CFPlus::UI::Empty] 838 $self->{children} = [new DC::UI::Empty]
811 unless @{$self->{children}}; 839 unless @{$self->{children}};
812} 840}
813 841
814sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
815 843
824 852
825 1 853 1
826} 854}
827 855
828############################################################################# 856#############################################################################
829
830# back-buffered drawing area 857# back-buffered drawing area
831 858
832package CFPlus::UI::Window; 859package DC::UI::Window;
833 860
834our @ISA = CFPlus::UI::Bin::; 861our @ISA = DC::UI::Bin::;
835 862
836use CFPlus::OpenGL; 863use DC::OpenGL;
837 864
838sub new { 865sub new {
839 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
840 867
841 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
863} 890}
864 891
865sub render_child { 892sub render_child {
866 my ($self) = @_; 893 my ($self) = @_;
867 894
868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
869 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
870 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
871 898
872 { 899 {
873 package CFPlus::UI::Base; 900 package DC::UI::Base;
874 901
875 local ($draw_x, $draw_y, $draw_w, $draw_h) = 902 local ($draw_x, $draw_y, $draw_w, $draw_h) =
876 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
877 904
878 $self->_render; 905 $self->_render;
895 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
896} 923}
897 924
898############################################################################# 925#############################################################################
899 926
900package CFPlus::UI::ViewPort; 927package DC::UI::ViewPort;
901 928
902use List::Util qw(min max); 929use List::Util qw(min max);
903 930
904our @ISA = CFPlus::UI::Window::; 931our @ISA = DC::UI::Window::;
905 932
906sub new { 933sub new {
907 my $class = shift; 934 my $class = shift;
908 935
909 $class->SUPER::new ( 936 $class->SUPER::new (
951 $self->emit (changed => $x, $y); 978 $self->emit (changed => $x, $y);
952 $self->update; 979 $self->update;
953 } 980 }
954} 981}
955 982
983sub set_center {
984 my ($self, $x, $y) = @_;
985
986 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
987}
988
989sub make_visible {
990 my ($self, $x, $y, $border) = @_;
991
992 if ( $x < $self->{view_x} + $self->{w} * $border
993 || $x > $self->{view_x} + $self->{w} * (1 - $border)
994 || $y < $self->{view_y} + $self->{h} * $border
995 || $y > $self->{view_y} + $self->{h} * (1 - $border)
996 ) {
997 $self->set_center ($x, $y);
998 }
999}
1000
956# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 1002sub coord2local {
958 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
959 1004
960 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 1005 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
977 ) { 1022 ) {
978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979 } else { 1024 } else {
980 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->DC::UI::Base::find_widget ($x, $y)
981 } 1026 }
982} 1027}
983 1028
984sub _render { 1029sub _render {
985 my ($self) = @_; 1030 my ($self) = @_;
986 1031
987 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1032 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1033 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
989 1034
990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991 1036
992 $self->SUPER::_render; 1037 $self->SUPER::_render;
993} 1038}
994 1039
995############################################################################# 1040#############################################################################
996 1041
997package CFPlus::UI::ScrolledWindow; 1042package DC::UI::ScrolledWindow;
998 1043
999our @ISA = CFPlus::UI::Table::; 1044our @ISA = DC::UI::Table::;
1000 1045
1001sub new { 1046sub new {
1002 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1003 1048
1004 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1005 1050
1006 my $self; 1051 my $self;
1007 1052
1008 my $hslider = new CFPlus::UI::Slider 1053 my $hslider = new DC::UI::Slider
1009 col => 0, 1054 c_col => 0,
1010 row => 1, 1055 c_row => 1,
1011 vertical => 0, 1056 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1058 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1059 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1061 },
1017 ; 1062 ;
1018 1063
1019 my $vslider = new CFPlus::UI::Slider 1064 my $vslider = new DC::UI::Slider
1020 col => 1, 1065 c_col => 1,
1021 row => 0, 1066 c_row => 0,
1022 vertical => 1, 1067 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1069 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1070 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1036 col_expand => [1, 0], 1081 col_expand => [1, 0],
1037 row_expand => [1, 0], 1082 row_expand => [1, 0],
1038 %arg, 1083 %arg,
1039 ); 1084 );
1040 1085
1041 $self->{vp} = new CFPlus::UI::ViewPort 1086 $self->{vp} = new DC::UI::ViewPort
1042 col => 0, 1087 c_col => 0,
1043 row => 0, 1088 c_row => 0,
1044 expand => 1, 1089 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1090 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1091 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1092 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1093 my ($vp, $x, $y) = @_;
1070 my ($self, $widget) = @_; 1115 my ($self, $widget) = @_;
1071 1116
1072 $self->{vp}->add ($self->{child} = $widget); 1117 $self->{vp}->add ($self->{child} = $widget);
1073} 1118}
1074 1119
1120sub set_offset { shift->{vp}->set_offset (@_) }
1121sub set_center { shift->{vp}->set_center (@_) }
1122sub make_visible { shift->{vp}->make_visible (@_) }
1123
1075sub update_slider { 1124sub update_slider {
1076 my ($self) = @_; 1125 my ($self) = @_;
1077 1126
1078 my $child = ($self->{vp} or return)->child; 1127 my $child = ($self->{vp} or return)->child;
1079 1128
1168 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1169} 1218}
1170 1219
1171############################################################################# 1220#############################################################################
1172 1221
1173package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1174 1223
1175our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1176 1225
1177use CFPlus::OpenGL; 1226use DC::OpenGL;
1178 1227
1179sub new { 1228sub new {
1180 my $class = shift; 1229 my $class = shift;
1181 1230
1182 $class->SUPER::new ( 1231 $class->SUPER::new (
1192 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1193 1242
1194 glEnable GL_BLEND; 1243 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1245 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1246 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1247 glDisable GL_BLEND;
1206 } 1248 }
1207 1249
1208 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1209} 1251}
1210 1252
1211############################################################################# 1253#############################################################################
1212 1254
1213package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1214 1256
1215our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1216 1258
1217use CFPlus::OpenGL; 1259use DC::OpenGL;
1218 1260
1219sub new { 1261sub new {
1220 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1221 1263
1222 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1224 align => 1, 1266 align => 1,
1225 valign => 0, 1267 valign => 0.5,
1226 text => $arg{label}, 1268 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1228 } 1270 }
1229 1271
1230 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1231 # label => "", 1273 # label => "",
1232 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1233 border => 0.8, 1275 border => 0.8,
1234 style => 'single', 1276 style => 'single',
1235 %arg, 1277 %arg,
1236 ); 1278 );
1237 1279
1240 1282
1241sub add { 1283sub add {
1242 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1243 1285
1244 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246} 1288}
1247 1289
1248sub border { 1290sub border {
1249 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1250} 1292}
1290 my $border = $self->border; 1332 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1292 1334
1293 $child->draw; 1335 $child->draw;
1294 1336
1295 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1296 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1342 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1308 } 1350 }
1309} 1351}
1310 1352
1311############################################################################# 1353#############################################################################
1312 1354
1313package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1314 1356
1315our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1316 1358
1317use CFPlus::OpenGL; 1359use DC::OpenGL;
1318 1360
1319my $bg = 1361my $bg =
1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1321 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1322 1364
1323my @border = 1365my @border =
1324 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 map { new_from_resource DC::Texture $_, mipmap => 1 }
1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1367 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326 1368
1327my @icon = 1369my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png); 1371 qw(x1_move.png x1_resize.png);
1330 1372
1331sub new { 1373sub new {
1332 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1333 1375
1334 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1335 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1336 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1337 border => 0.6, 1379 border => 0.8,
1338 can_events => 1, 1380 can_events => 1,
1339 min_w => 64, 1381 min_w => 64,
1340 min_h => 32, 1382 min_h => 32,
1341 %arg, 1383 %arg,
1342 ); 1384 );
1343 1385
1344 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1345 align => 0, 1387 align => 0.5,
1346 valign => 1, 1388 valign => 1,
1347 text => $self->{title}, 1389 text => $self->{title},
1348 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1349 if exists $self->{title}; 1391 if exists $self->{title};
1350 1392
1351 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1352 $self->{close_button} = 1394 $self->{close_button} =
1353 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1354 path => 'x1_close.png', 1396 path => 'x1_close.png',
1355 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1356 1398
1357 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1358 } 1400 }
1359 1401
1360 $self 1402 $self
1361} 1403}
1362 1404
1363sub add { 1405sub add {
1364 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1365 1407
1366 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1367 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1409 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1410 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369} 1411}
1370 1412
1371sub border { 1413sub border {
1372 int $_[0]{border} * $::FONTSIZE 1414 int $_[0]{border} * $::FONTSIZE
1415}
1416
1417sub get_max_wh {
1418 my ($self) = @_;
1419
1420 return ($self->{w}, $self->{h})
1421 if $self->{visible} && $self->{w};
1422
1423 $self->SUPER::get_max_wh
1373} 1424}
1374 1425
1375sub size_request { 1426sub size_request {
1376 my ($self) = @_; 1427 my ($self) = @_;
1377 1428
1423 my ($self, $ev, $x, $y) = @_; 1474 my ($self, $ev, $x, $y) = @_;
1424 1475
1425 my ($w, $h) = @$self{qw(w h)}; 1476 my ($w, $h) = @$self{qw(w h)};
1426 my $border = $self->border; 1477 my $border = $self->border;
1427 1478
1428 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); 1479 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right
1429 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); 1480 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down
1430 1481
1431 if ($lr & $td) { 1482 if ($lr & $td) { # corners
1432 my ($wx, $wy) = ($self->{x}, $self->{y}); 1483 my ($wx, $wy) = ($self->{x}, $self->{y});
1433 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1484 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1434 my ($bw, $bh) = ($self->{w}, $self->{h}); 1485 my ($bw, $bh) = ($self->{w}, $self->{h});
1435 1486
1436 my $mx = $x < $border; 1487 my $mx = $x < $border;
1440 my ($ev, $x, $y) = @_; 1491 my ($ev, $x, $y) = @_;
1441 1492
1442 my $dx = $ev->{x} - $ox; 1493 my $dx = $ev->{x} - $ox;
1443 my $dy = $ev->{y} - $oy; 1494 my $dy = $ev->{y} - $oy;
1444 1495
1496 $self->set_size (
1445 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1497 $bw + $dx * ($mx ? -1 : 1),
1446 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1498 $bh + $dy * ($my ? -1 : 1),
1499 );
1447 1500
1448 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); 1501 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1449 $self->realloc; 1502 $self->realloc;
1450 }; 1503 };
1451 1504
1452 } elsif ($lr ^ $td) { 1505 } elsif ($lr ^ $td) { # edges
1453 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1506 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1454 my ($bx, $by) = ($self->{x}, $self->{y}); 1507 my ($bx, $by) = ($self->{x}, $self->{y});
1455 1508
1456 $self->{motion} = sub { 1509 $self->{motion} = sub {
1457 my ($ev, $x, $y) = @_; 1510 my ($ev, $x, $y) = @_;
1502 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504 1557
1505 my $border = $self->border; 1558 my $border = $self->border;
1506 1559
1560 if ($border) {
1507 glColor @{ $self->{border_bg} }; 1561 glColor @{ $self->{border_bg} };
1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1562 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1563 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1564 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1565 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512 1566
1513 # move 1567 # move
1514 my $w2 = ($w - $border) * .5; 1568 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5; 1569 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1570 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1571 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1572 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519 1573
1520 # resize 1574 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1576 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button}; 1577 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1578 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1579 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1580 }
1526 1581
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1582 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1583 glColor @{ $self->{bg} };
1529 1584
1530 # TODO: repeat texture not scale 1585 # TODO: repeat texture not scale
1549 if $self->{close_button}; 1604 if $self->{close_button};
1550} 1605}
1551 1606
1552############################################################################# 1607#############################################################################
1553 1608
1554package CFPlus::UI::Table; 1609package DC::UI::Table;
1555 1610
1556our @ISA = CFPlus::UI::Container::; 1611our @ISA = DC::UI::Container::;
1557 1612
1558use List::Util qw(max sum); 1613use List::Util qw(max sum);
1559 1614
1560use CFPlus::OpenGL; 1615use DC::OpenGL;
1561 1616
1562sub new { 1617sub new {
1563 my $class = shift; 1618 my $class = shift;
1564 1619
1565 $class->SUPER::new ( 1620 $class->SUPER::new (
1571 1626
1572sub add { 1627sub add {
1573 my ($self, @widgets) = @_; 1628 my ($self, @widgets) = @_;
1574 1629
1575 for my $child (@widgets) { 1630 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1631 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1632 $child->{c_colspan} ||= 1;
1578 } 1633 }
1579 1634
1580 $self->SUPER::add (@widgets); 1635 $self->SUPER::add (@widgets);
1581} 1636}
1582 1637
1586 my @widgets; 1641 my @widgets;
1587 1642
1588 while (@_) { 1643 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1644 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1645
1591 $child->{row} = $row; 1646 $child->{c_row} = $row;
1592 $child->{col} = $col; 1647 $child->{c_col} = $col;
1593 1648
1594 push @widgets, $child; 1649 push @widgets, $child;
1595 } 1650 }
1596 1651
1597 $self->add (@widgets); 1652 $self->add (@widgets);
1603 my (@w, @h); 1658 my (@w, @h);
1604 1659
1605 my @children = $self->children; 1660 my @children = $self->children;
1606 1661
1607 # first pass, columns 1662 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1663 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1664 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1665
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1666 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1667
1613 if ($w > $sw) { 1668 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1669 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1670 }
1616 } 1671 }
1617 1672
1618 # second pass, rows 1673 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1674 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1675 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1676
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1677 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1678
1624 if ($h > $sh) { 1679 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1680 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626 } 1681 }
1627 } 1682 }
1628 1683
1629 (\@w, \@h) 1684 (\@w, \@h)
1630} 1685}
1653 @col_expand = (1) x @$ws unless @col_expand; 1708 @col_expand = (1) x @$ws unless @col_expand;
1654 my $col_expand = (sum @col_expand) || 1; 1709 my $col_expand = (sum @col_expand) || 1;
1655 1710
1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1711 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657 1712
1658 CFPlus::UI::harmonize $ws; 1713 DC::UI::harmonize $ws;
1659 1714
1660 my @row_expand = @{$self->{row_expand}}; 1715 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand; 1716 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1; 1717 my $row_expand = (sum @row_expand) || 1;
1663 1718
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1719 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665 1720
1666 CFPlus::UI::harmonize $hs; 1721 DC::UI::harmonize $hs;
1667 1722
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1723 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1724 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1725
1671 for my $widget ($self->children) { 1726 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1727 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1728
1674 $widget->configure ( 1729 $widget->configure (
1675 $x[$c], $y[$r], 1730 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1731 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1732 );
1680 1 1735 1
1681} 1736}
1682 1737
1683############################################################################# 1738#############################################################################
1684 1739
1685package CFPlus::UI::Fixed; 1740package DC::UI::Fixed;
1686 1741
1687use List::Util qw(min max); 1742use List::Util qw(min max);
1688 1743
1689our @ISA = CFPlus::UI::Container::; 1744our @ISA = DC::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697 1745
1698sub _scale($$$) { 1746sub _scale($$$) {
1699 my ($mode, $val, $max) = @_; 1747 my ($rel, $val, $max) = @_;
1700 1748
1701 $mode eq "abs" ? $val 1749 $rel ? $val * $max : $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704} 1750}
1705 1751
1706sub size_request { 1752sub size_request {
1707 my ($self) = @_; 1753 my ($self) = @_;
1708 1754
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1755 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710 1756
1711 # determine overall size by querying abs widgets 1757 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) { 1758 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1759 unless ($child->{c_rel}) {
1760 my $x = $child->{c_x};
1761 my $y = $child->{c_y};
1714 1762
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721 } 1765 }
1722 } 1766 }
1723 1767
1724 my $W = $x2 - $x1; 1768 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1; 1769 my $H = $y2 - $y1;
1726 1770
1727 # now layout remaining widgets 1771 # now layout remaining widgets
1728 for my $child ($self->visible_children) { 1772 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1773 if ($child->{c_rel}) {
1774 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1775 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730 1776
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1777 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1778 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739 } 1779 }
1740 } 1780 }
1741 1781
1742 my $W = $x2 - $x1; 1782 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1; 1783 my $H = $y2 - $y1;
1747 1787
1748sub invoke_size_allocate { 1788sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_; 1789 my ($self, $W, $H) = @_;
1750 1790
1751 for my $child ($self->visible_children) { 1791 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1792 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1793 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753 1794
1754 $x = _scale $pos, $x, $W; 1795 $x += $child->{c_halign} * $child->{req_w};
1755 $y = _scale $pos, $x, $H; 1796 $y += $child->{c_valign} * $child->{req_h};
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758 1797
1759 $child->configure ($x, $y, $w, $h); 1798 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760 } 1799 }
1761 1800
1762 1 1801 1
1763} 1802}
1764 1803
1765############################################################################# 1804#############################################################################
1766 1805
1767package CFPlus::UI::Box; 1806package DC::UI::Box;
1768 1807
1769our @ISA = CFPlus::UI::Container::; 1808our @ISA = DC::UI::Container::;
1770 1809
1771sub size_request { 1810sub size_request {
1772 my ($self) = @_; 1811 my ($self) = @_;
1812
1813 my @children = $self->visible_children;
1773 1814
1774 $self->{vertical} 1815 $self->{vertical}
1775 ? ( 1816 ? (
1776 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1817 (List::Util::max map $_->{req_w}, @children),
1777 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_h}, @children),
1778 ) 1819 )
1779 : ( 1820 : (
1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1821 (List::Util::sum map $_->{req_w}, @children),
1781 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1822 (List::Util::max map $_->{req_h}, @children),
1782 ) 1823 )
1783} 1824}
1784 1825
1785sub invoke_size_allocate { 1826sub invoke_size_allocate {
1786 my ($self, $w, $h) = @_; 1827 my ($self, $w, $h) = @_;
1807 $req[$_] += $space * $children[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1808 for 0 .. $#children; 1849 for 0 .. $#children;
1809 } 1850 }
1810 } 1851 }
1811 1852
1812 CFPlus::UI::harmonize \@req; 1853 DC::UI::harmonize \@req;
1813 1854
1814 my $pos = 0; 1855 my $pos = 0;
1815 for (0 .. $#children) { 1856 for (0 .. $#children) {
1816 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1822 1 1863 1
1823} 1864}
1824 1865
1825############################################################################# 1866#############################################################################
1826 1867
1827package CFPlus::UI::HBox; 1868package DC::UI::HBox;
1828 1869
1829our @ISA = CFPlus::UI::Box::; 1870our @ISA = DC::UI::Box::;
1830 1871
1831sub new { 1872sub new {
1832 my $class = shift; 1873 my $class = shift;
1833 1874
1834 $class->SUPER::new ( 1875 $class->SUPER::new (
1837 ) 1878 )
1838} 1879}
1839 1880
1840############################################################################# 1881#############################################################################
1841 1882
1842package CFPlus::UI::VBox; 1883package DC::UI::VBox;
1843 1884
1844our @ISA = CFPlus::UI::Box::; 1885our @ISA = DC::UI::Box::;
1845 1886
1846sub new { 1887sub new {
1847 my $class = shift; 1888 my $class = shift;
1848 1889
1849 $class->SUPER::new ( 1890 $class->SUPER::new (
1852 ) 1893 )
1853} 1894}
1854 1895
1855############################################################################# 1896#############################################################################
1856 1897
1857package CFPlus::UI::Label; 1898package DC::UI::Label;
1858 1899
1859our @ISA = CFPlus::UI::DrawBG::; 1900our @ISA = DC::UI::DrawBG::;
1860 1901
1861use CFPlus::OpenGL; 1902use DC::OpenGL;
1862 1903
1863sub new { 1904sub new {
1864 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1865 1906
1866 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
1871 #text => initial text 1912 #text => initial text
1872 #markup => initial narkup 1913 #markup => initial narkup
1873 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1874 #style => 0, # render flags 1915 #style => 0, # render flags
1875 ellipsise => 3, # end 1916 ellipsise => 3, # end
1876 layout => (new CFPlus::Layout), 1917 layout => (new DC::Layout),
1877 fontsize => 1, 1918 fontsize => 1,
1878 align => -1, 1919 align => 0.5,
1879 valign => -1, 1920 valign => 0.5,
1880 padding_x => 2, 1921 padding_x => 4,
1881 padding_y => 2, 1922 padding_y => 2,
1882 can_events => 0, 1923 can_events => 0,
1883 %arg 1924 %arg
1884 ); 1925 );
1885 1926
1886 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1887 my $layout = new CFPlus::Layout; 1928 my $layout = new DC::Layout;
1888 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1889 $self->{template} = $layout; 1930 $self->{template} = $layout;
1890 } 1931 }
1891 1932
1892 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
1910 1951
1911 delete $self->{ox}; 1952 delete $self->{ox};
1912 $self->SUPER::realloc; 1953 $self->SUPER::realloc;
1913} 1954}
1914 1955
1956sub clear {
1957 my ($self) = @_;
1958
1959 $self->set_text ("");
1960}
1961
1915sub set_text { 1962sub set_text {
1916 my ($self, $text) = @_; 1963 my ($self, $text) = @_;
1917 1964
1918 return if $self->{text} eq "T$text"; 1965 return if $self->{text} eq "T$text";
1919 $self->{text} = "T$text"; 1966 $self->{text} = "T$text";
1942 1989
1943sub size_request { 1990sub size_request {
1944 my ($self) = @_; 1991 my ($self) = @_;
1945 1992
1946 $self->{size_req} ||= do { 1993 $self->{size_req} ||= do {
1994 my ($max_w, $max_h) = $self->get_max_wh;
1995
1947 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1996 $self->{layout}->set_font ($self->{font}) if $self->{font};
1948 $self->{layout}->set_width ($self->{max_w} || -1); 1997 $self->{layout}->set_width ($max_w);
1949 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1998 $self->{layout}->set_ellipsise ($self->{ellipsise});
1950 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1999 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1951 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2000 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1952 2001
1953 my ($w, $h) = $self->{layout}->size; 2002 my ($w, $h) = $self->{layout}->size;
1954 2003
1955 if (exists $self->{template}) { 2004 if (exists $self->{template}) {
1956 $self->{template}->set_font ($self->{font}) if $self->{font}; 2005 $self->{template}->set_font ($self->{font}) if $self->{font};
1957 $self->{template}->set_width ($self->{max_w} || -1); 2006 $self->{template}->set_width ($max_w);
1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1959 2008
1960 my ($w2, $h2) = $self->{template}->size; 2009 my ($w2, $h2) = $self->{template}->size;
1961 2010
1962 $w = List::Util::max $w, $w2; 2011 $w = List::Util::max $w, $w2;
2018 2067
2019 [$self->{layout}->size] 2068 [$self->{layout}->size]
2020 }; 2069 };
2021 2070
2022 unless (exists $self->{ox}) { 2071 unless (exists $self->{ox}) {
2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2072 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2073 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2025 : ($self->{w} - $size->[0]) * 0.5);
2026 2074
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2075 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5);
2030 }; 2076 };
2031 2077
2032# unless ($self->{list}) { 2078# unless ($self->{list}) {
2033# $self->{list} = CFPlus::OpenGL::glGenList; 2079# $self->{list} = DC::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list}; 2080# DC::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2081# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList; 2082# DC::OpenGL::glEndList;
2037# } 2083# }
2038# 2084#
2039# CFPlus::OpenGL::glCallList $self->{list}; 2085# DC::OpenGL::glCallList $self->{list};
2040 2086
2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2087 $self->{layout}->draw;
2042} 2088}
2043 2089
2044#sub destroy { 2090#sub destroy {
2045# my ($self) = @_; 2091# my ($self) = @_;
2046# 2092#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list}; 2093# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048# 2094#
2049# $self->SUPER::destroy; 2095# $self->SUPER::destroy;
2050#} 2096#}
2051 2097
2052############################################################################# 2098#############################################################################
2053 2099
2054package CFPlus::UI::EntryBase; 2100package DC::UI::EntryBase;
2055 2101
2056our @ISA = CFPlus::UI::Label::; 2102our @ISA = DC::UI::Label::;
2057 2103
2058use CFPlus::OpenGL; 2104use DC::OpenGL;
2059 2105
2060sub new { 2106sub new {
2061 my $class = shift; 2107 my $class = shift;
2062 2108
2063 $class->SUPER::new ( 2109 $class->SUPER::new (
2064 fg => [1, 1, 1], 2110 fg => [1, 1, 1],
2065 bg => [0, 0, 0, 0.2], 2111 bg => [0, 0, 0, 0.2],
2112 outline => undef,
2066 active_bg => [1, 1, 1, 0.5], 2113 active_bg => [0, 0, 1, .2],
2067 active_fg => [0, 0, 0], 2114 active_fg => [1, 1, 1],
2115 active_outline => [1, 1, 0],
2068 can_hover => 1, 2116 can_hover => 1,
2069 can_focus => 1, 2117 can_focus => 1,
2118 align => 0,
2070 valign => 0, 2119 valign => 0.5,
2071 can_events => 1, 2120 can_events => 1,
2072 ellipsise => 0, 2121 ellipsise => 0,
2122 padding_x => 4,
2123 padding_y => 2,
2073 #text => ... 2124 #text => ...
2074 #hidden => "*", 2125 #hidden => "*",
2075 @_ 2126 @_
2076 ) 2127 )
2077} 2128}
2124 2175
2125 my $text = $self->get_text; 2176 my $text = $self->get_text;
2126 2177
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2178 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2128 2179
2129 if ($uni == 8) { 2180 if ($sym == DC::SDLK_BACKSPACE) {
2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2181 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2131 } elsif ($uni == 127) { 2182 } elsif ($sym == DC::SDLK_DELETE) {
2132 substr $text, $self->{cursor}, 1, ""; 2183 substr $text, $self->{cursor}, 1, "";
2133 } elsif ($sym == CFPlus::SDLK_LEFT) { 2184 } elsif ($sym == DC::SDLK_LEFT) {
2134 --$self->{cursor} if $self->{cursor}; 2185 --$self->{cursor} if $self->{cursor};
2135 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2186 } elsif ($sym == DC::SDLK_RIGHT) {
2136 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2187 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2137 } elsif ($sym == CFPlus::SDLK_HOME) { 2188 } elsif ($sym == DC::SDLK_HOME) {
2138 # what a hack 2189 # what a hack
2139 $self->{cursor} = 2190 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2191 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1 2192 ? length $1
2142 : 0; 2193 : 0;
2143 } elsif ($sym == CFPlus::SDLK_END) { 2194 } elsif ($sym == DC::SDLK_END) {
2144 # uh, again 2195 # uh, again
2145 $self->{cursor} = 2196 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2197 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147 ? $self->{cursor} + length $1 2198 ? $self->{cursor} + length $1
2148 : length $self->{text}; 2199 : length $self->{text};
2212 glColor_premultiply @{$self->{bg}}; 2263 glColor_premultiply @{$self->{bg}};
2213 } 2264 }
2214 2265
2215 glEnable GL_BLEND; 2266 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2267 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glBegin GL_QUADS;
2218 glVertex 0 , 0;
2219 glVertex 0 , $self->{h};
2220 glVertex $self->{w}, $self->{h}; 2268 glRect 0, 0, $self->{w}, $self->{h};
2221 glVertex $self->{w}, 0;
2222 glEnd;
2223 glDisable GL_BLEND; 2269 glDisable GL_BLEND;
2224 2270
2225 $self->SUPER::_draw; 2271 $self->SUPER::_draw;
2226 2272
2227 #TODO: force update every cursor change :( 2273 #TODO: force update every cursor change :(
2229 2275
2230 unless (exists $self->{cur_h}) { 2276 unless (exists $self->{cur_h}) {
2231 my $text = substr $self->{text}, 0, $self->{cursor}; 2277 my $text = substr $self->{text}, 0, $self->{cursor};
2232 utf8::encode $text; 2278 utf8::encode $text;
2233 2279
2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2280 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2235 } 2281 }
2236 2282
2283 glColor_premultiply @{$self->{active_fg}};
2237 glBegin GL_LINES; 2284 glBegin GL_LINES;
2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2285 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2286 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2240 glEnd; 2287 glEnd;
2288
2289 glLineWidth 3;
2290 glColor @{$self->{active_outline}};
2291 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2292 glLineWidth 1;
2293
2294 } else {
2295 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2296 glBegin GL_LINE_STRIP;
2297 glVertex .5, $self->{h} * .5;
2298 glVertex .5, $self->{h} - 2.5;
2299 glVertex $self->{w} - .5, $self->{h} - 2.5;
2300 glVertex $self->{w} - .5, $self->{h} * .5;
2301 glEnd;
2241 } 2302 }
2242} 2303}
2243 2304
2244############################################################################# 2305#############################################################################
2245 2306
2246package CFPlus::UI::Entry; 2307package DC::UI::Entry;
2247 2308
2248our @ISA = CFPlus::UI::EntryBase::; 2309our @ISA = DC::UI::EntryBase::;
2249 2310
2250use CFPlus::OpenGL; 2311use DC::OpenGL;
2312
2313sub new {
2314 my $class = shift;
2315
2316 $class->SUPER::new (
2317 history_pointer => -1,
2318 @_
2319 )
2320}
2321
2251 2322
2252sub invoke_key_down { 2323sub invoke_key_down {
2253 my ($self, $ev) = @_; 2324 my ($self, $ev) = @_;
2254 2325
2255 my $sym = $ev->{sym}; 2326 my $sym = $ev->{sym};
2261 $self->{history_pointer} = -1; 2332 $self->{history_pointer} = -1;
2262 $self->{history_saveback} = ''; 2333 $self->{history_saveback} = '';
2263 $self->emit (activate => $txt); 2334 $self->emit (activate => $txt);
2264 $self->update; 2335 $self->update;
2265 2336
2266 } elsif ($sym == CFPlus::SDLK_UP) { 2337 } elsif ($sym == DC::SDLK_UP) {
2267 if ($self->{history_pointer} < 0) { 2338 if ($self->{history_pointer} < 0) {
2268 $self->{history_saveback} = $self->get_text; 2339 $self->{history_saveback} = $self->get_text;
2269 } 2340 }
2270 if (@{$self->{history} || []} > 0) { 2341 if (@{$self->{history} || []} > 0) {
2271 $self->{history_pointer}++; 2342 $self->{history_pointer}++;
2273 $self->{history_pointer} = @{$self->{history} || []} - 1; 2344 $self->{history_pointer} = @{$self->{history} || []} - 1;
2274 } 2345 }
2275 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2346 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2276 } 2347 }
2277 2348
2278 } elsif ($sym == CFPlus::SDLK_DOWN) { 2349 } elsif ($sym == DC::SDLK_DOWN) {
2279 $self->{history_pointer}--; 2350 $self->{history_pointer}--;
2280 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2351 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2281 2352
2282 if ($self->{history_pointer} >= 0) { 2353 if ($self->{history_pointer} >= 0) {
2283 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2354 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2284 } else { 2355 } else {
2356 if (defined $self->{history_saveback}) {
2285 $self->set_text ($self->{history_saveback}); 2357 $self->set_text ($self->{history_saveback});
2358 $self->{history_saveback} = undef;
2359 }
2286 } 2360 }
2287 2361
2288 } else { 2362 } else {
2289 return $self->SUPER::invoke_key_down ($ev) 2363 return $self->SUPER::invoke_key_down ($ev)
2290 } 2364 }
2292 1 2366 1
2293} 2367}
2294 2368
2295############################################################################# 2369#############################################################################
2296 2370
2297package CFPlus::UI::TextEdit; 2371package DC::UI::TextEdit;
2298 2372
2299our @ISA = CFPlus::UI::EntryBase::; 2373our @ISA = DC::UI::EntryBase::;
2300 2374
2301use CFPlus::OpenGL; 2375use DC::OpenGL;
2376
2377sub new {
2378 my $class = shift;
2379
2380 $class->SUPER::new (
2381 padding_y => 4,
2382
2383 @_
2384 )
2385}
2302 2386
2303sub move_cursor_ver { 2387sub move_cursor_ver {
2304 my ($self, $dy) = @_; 2388 my ($self, $dy) = @_;
2305 2389
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2390 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307 2391
2308 $y += $dy; 2392 $line += $dy;
2309 2393
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2394 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2311 $self->{cursor} = $index; 2395 $self->{cursor} = $index;
2312 delete $self->{cur_h}; 2396 delete $self->{cur_h};
2313 $self->update; 2397 $self->update;
2314 return; 2398 return;
2315 } 2399 }
2318sub invoke_key_down { 2402sub invoke_key_down {
2319 my ($self, $ev) = @_; 2403 my ($self, $ev) = @_;
2320 2404
2321 my $sym = $ev->{sym}; 2405 my $sym = $ev->{sym};
2322 2406
2323 if ($sym == CFPlus::SDLK_UP) { 2407 if ($sym == DC::SDLK_UP) {
2324 $self->move_cursor_ver (-1); 2408 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) { 2409 } elsif ($sym == DC::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1); 2410 $self->move_cursor_ver (+1);
2327 } else { 2411 } else {
2328 return $self->SUPER::invoke_key_down ($ev) 2412 return $self->SUPER::invoke_key_down ($ev)
2329 } 2413 }
2330 2414
2331 1 2415 1
2332} 2416}
2333 2417
2334############################################################################# 2418#############################################################################
2335 2419
2336package CFPlus::UI::Button; 2420package DC::UI::ButtonBin;
2337 2421
2338our @ISA = CFPlus::UI::Label::; 2422our @ISA = DC::UI::Bin::;
2339 2423
2340use CFPlus::OpenGL; 2424use DC::OpenGL;
2341 2425
2342my @tex = 2426my @tex =
2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2427 map { new_from_resource DC::Texture $_, mipmap => 1 }
2344 qw(b1_button_inactive.png b1_button_active.png); 2428 qw(b1_button_inactive.png b1_button_active.png);
2345 2429
2346sub new { 2430sub new {
2347 my $class = shift; 2431 my $class = shift;
2348 2432
2349 $class->SUPER::new ( 2433 $class->SUPER::new (
2434 can_hover => 1,
2435 align => 0.5,
2436 valign => 0.5,
2437 can_events => 1,
2438 @_
2439 )
2440}
2441
2442sub invoke_button_up {
2443 my ($self, $ev, $x, $y) = @_;
2444
2445 $self->emit ("activate")
2446 if $x >= 0 && $x < $self->{w}
2447 && $y >= 0 && $y < $self->{h};
2448
2449 1
2450}
2451
2452sub _draw {
2453 my ($self) = @_;
2454
2455 glEnable GL_TEXTURE_2D;
2456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2457 glColor 0, 0, 0, 1;
2458
2459 my $tex = $tex[$GRAB == $self];
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461
2462 glDisable GL_TEXTURE_2D;
2463
2464 $self->SUPER::_draw;
2465}
2466
2467#############################################################################
2468
2469package DC::UI::Button;
2470
2471our @ISA = DC::UI::Label::;
2472
2473use DC::OpenGL;
2474
2475my @tex =
2476 map { new_from_resource DC::Texture $_, mipmap => 1 }
2477 qw(b1_button_inactive.png b1_button_active.png);
2478
2479sub new {
2480 my $class = shift;
2481
2482 $class->SUPER::new (
2350 padding_x => 4, 2483 padding_x => 8,
2351 padding_y => 4, 2484 padding_y => 4,
2352 fg => [1.0, 1.0, 1.0], 2485 fg => [1.0, 1.0, 1.0],
2353 active_fg => [0.8, 0.8, 0.8], 2486 active_fg => [0.8, 0.8, 0.8],
2354 can_hover => 1, 2487 can_hover => 1,
2355 align => 0, 2488 align => 0.5,
2356 valign => 0, 2489 valign => 0.5,
2357 can_events => 1, 2490 can_events => 1,
2358 @_ 2491 @_
2359 ) 2492 )
2360} 2493}
2361 2494
2386 $self->SUPER::_draw; 2519 $self->SUPER::_draw;
2387} 2520}
2388 2521
2389############################################################################# 2522#############################################################################
2390 2523
2391package CFPlus::UI::CheckBox; 2524package DC::UI::CheckBox;
2392 2525
2393our @ISA = CFPlus::UI::DrawBG::; 2526our @ISA = DC::UI::DrawBG::;
2394 2527
2395my @tex = 2528my @tex =
2396 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2529 map { new_from_resource DC::Texture $_, mipmap => 1 }
2397 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2530 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2398 2531
2399use CFPlus::OpenGL; 2532use DC::OpenGL;
2400 2533
2401sub new { 2534sub new {
2402 my $class = shift; 2535 my $class = shift;
2403 2536
2404 $class->SUPER::new ( 2537 $class->SUPER::new (
2538 fontsize => 1,
2405 padding_x => 2, 2539 padding_x => 2,
2406 padding_y => 2, 2540 padding_y => 2,
2407 fg => [1, 1, 1], 2541 fg => [1, 1, 1],
2408 active_fg => [1, 1, 0], 2542 active_fg => [1, 1, 0],
2409 bg => [0, 0, 0, 0.2], 2543 bg => [0, 0, 0, 0.2],
2415} 2549}
2416 2550
2417sub size_request { 2551sub size_request {
2418 my ($self) = @_; 2552 my ($self) = @_;
2419 2553
2420 (6) x 2 2554 ($self->{fontsize} * $::FONTSIZE) x 2
2421} 2555}
2422 2556
2423sub toggle { 2557sub toggle {
2424 my ($self) = @_; 2558 my ($self) = @_;
2425 2559
2444sub _draw { 2578sub _draw {
2445 my ($self) = @_; 2579 my ($self) = @_;
2446 2580
2447 $self->SUPER::_draw; 2581 $self->SUPER::_draw;
2448 2582
2449 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2583 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2450 2584
2451 my ($w, $h) = @$self{qw(w h)}; 2585 my ($w, $h) = @$self{qw(w h)};
2452 2586
2453 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2587 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2454 2588
2461 glDisable GL_TEXTURE_2D; 2595 glDisable GL_TEXTURE_2D;
2462} 2596}
2463 2597
2464############################################################################# 2598#############################################################################
2465 2599
2466package CFPlus::UI::Image; 2600package DC::UI::Image;
2467 2601
2468our @ISA = CFPlus::UI::Base::; 2602our @ISA = DC::UI::DrawBG::;
2469 2603
2470use CFPlus::OpenGL; 2604use DC::OpenGL;
2471 2605
2472our %texture_cache; 2606our %texture_cache;
2473 2607
2474sub new { 2608sub new {
2475 my $class = shift; 2609 my $class = shift;
2476 2610
2477 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2478 can_events => 0, 2612 can_events => 0,
2613 scale => 1,
2479 @_, 2614 @_,
2480 ); 2615 );
2481 2616
2482 $self->{path} || $self->{tex} 2617 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required"; 2618 or Carp::croak "'path' or 'tex' attributes required";
2484 2619
2485 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2620 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2621 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2487 2622
2488 CFPlus::weaken $texture_cache{$self->{path}}; 2623 DC::weaken $texture_cache{$self->{path}};
2489 2624
2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2625 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2491 2626
2492 $self 2627 $self
2493} 2628}
2494 2629
2495sub STORABLE_freeze { 2630sub STORABLE_freeze {
2496 my ($self, $cloning) = @_; 2631 my ($self, $cloning) = @_;
2497 2632
2498 $self->{path} 2633 $self->{path}
2499 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2634 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2500 2635
2501 $self->{path} 2636 $self->{path}
2502} 2637}
2503 2638
2504sub STORABLE_attach { 2639sub STORABLE_attach {
2505 my ($self, $cloning, $path) = @_; 2640 my ($self, $cloning, $path) = @_;
2506 2641
2507 $self->new (path => $path) 2642 $self->new (path => $path)
2508} 2643}
2509 2644
2645sub set_texture {
2646 my ($self, $tex) = @_;
2647
2648 $self->{tex} = $tex;
2649 $self->update;
2650}
2651
2510sub size_request { 2652sub size_request {
2511 my ($self) = @_; 2653 my ($self) = @_;
2512 2654
2513 ($self->{tex}{w}, $self->{tex}{h}) 2655 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2514} 2656}
2515 2657
2516sub _draw { 2658sub _draw {
2517 my ($self) = @_; 2659 my ($self) = @_;
2660
2661 $self->SUPER::_draw;
2518 2662
2519 my $tex = $self->{tex}; 2663 my $tex = $self->{tex};
2520 2664
2521 my ($w, $h) = ($self->{w}, $self->{h}); 2665 my ($w, $h) = ($self->{w}, $self->{h});
2522 2666
2528 } 2672 }
2529 2673
2530 glEnable GL_TEXTURE_2D; 2674 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 2676
2533 $tex->draw_quad (0, 0, $w, $h); 2677 $tex->draw_quad_alpha (0, 0, $w, $h);
2534 2678
2535 glDisable GL_TEXTURE_2D; 2679 glDisable GL_TEXTURE_2D;
2536} 2680}
2537 2681
2538############################################################################# 2682#############################################################################
2539 2683
2540package CFPlus::UI::ImageButton; 2684package DC::UI::ImageButton;
2541 2685
2542our @ISA = CFPlus::UI::Image::; 2686our @ISA = DC::UI::Image::;
2543 2687
2544use CFPlus::OpenGL; 2688use DC::OpenGL;
2545
2546my %textures;
2547 2689
2548sub new { 2690sub new {
2549 my $class = shift; 2691 my $class = shift;
2550 2692
2551 my $self = $class->SUPER::new ( 2693 my $self = $class->SUPER::new (
2552 padding_x => 4, 2694 padding_x => 4,
2553 padding_y => 4, 2695 padding_y => 4,
2554 fg => [1, 1, 1], 2696 fg => [1, 1, 1],
2555 active_fg => [0, 0, 1], 2697 active_fg => [0, 0, 1],
2556 can_hover => 1, 2698 can_hover => 1,
2557 align => 0, 2699 align => 0.5,
2558 valign => 0, 2700 valign => 0.5,
2559 can_events => 1, 2701 can_events => 1,
2560 @_ 2702 @_
2561 ); 2703 );
2562} 2704}
2563 2705
2706sub invoke_button_down {
2707 my ($self, $ev, $x, $y) = @_;
2708
2709 1
2710}
2711
2564sub invoke_button_up { 2712sub invoke_button_up {
2565 my ($self, $ev, $x, $y) = @_; 2713 my ($self, $ev, $x, $y) = @_;
2566 2714
2567 $self->emit ("activate") 2715 $self->emit ("activate")
2568 if $x >= 0 && $x < $self->{w} 2716 if $x >= 0 && $x < $self->{w}
2571 1 2719 1
2572} 2720}
2573 2721
2574############################################################################# 2722#############################################################################
2575 2723
2576package CFPlus::UI::VGauge; 2724package DC::UI::VGauge;
2577 2725
2578our @ISA = CFPlus::UI::Base::; 2726our @ISA = DC::UI::Base::;
2579 2727
2580use List::Util qw(min max); 2728use List::Util qw(min max);
2581 2729
2582use CFPlus::OpenGL; 2730use DC::OpenGL;
2583 2731
2584my %tex = ( 2732my %tex = (
2585 food => [ 2733 food => [
2586 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2734 map { new_from_resource DC::Texture $_, mipmap => 1 }
2587 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2735 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2588 ], 2736 ],
2589 grace => [ 2737 grace => [
2590 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2738 map { new_from_resource DC::Texture $_, mipmap => 1 }
2591 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2739 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2592 ], 2740 ],
2593 hp => [ 2741 hp => [
2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2742 map { new_from_resource DC::Texture $_, mipmap => 1 }
2595 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2743 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2596 ], 2744 ],
2597 mana => [ 2745 mana => [
2598 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2746 map { new_from_resource DC::Texture $_, mipmap => 1 }
2599 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2747 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2600 ], 2748 ],
2601); 2749);
2602 2750
2603# eg. VGauge->new (gauge => 'food'), default gauge: food 2751# eg. VGauge->new (gauge => 'food'), default gauge: food
2706 glDisable GL_TEXTURE_2D; 2854 glDisable GL_TEXTURE_2D;
2707} 2855}
2708 2856
2709############################################################################# 2857#############################################################################
2710 2858
2859package DC::UI::Progress;
2860
2861our @ISA = DC::UI::Label::;
2862
2863use DC::OpenGL;
2864
2865sub new {
2866 my ($class, %arg) = @_;
2867
2868 my $self = $class->SUPER::new (
2869 padding_x => 2,
2870 padding_y => 2,
2871 fg => [1, 1, 1],
2872 bg => [0, 0, 1, 0.2],
2873 bar => [0.7, 0.5, 0.1, 0.8],
2874 outline => [0.4, 0.3, 0],
2875 fontsize => 0.9,
2876 valign => 0.5,
2877 align => 0.5,
2878 can_events => 1,
2879 ellipsise => 1,
2880 label => "%d%%",
2881 %arg,
2882 );
2883
2884 $self->set_value ($arg{value} || -1);
2885
2886 $self
2887}
2888
2889sub set_label {
2890 my ($self, $label) = @_;
2891
2892 return if $self->{label} eq $label;
2893 $self->{label} = $label;
2894
2895 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2896}
2897
2898sub set_value {
2899 my ($self, $value) = @_;
2900
2901 if ($self->{value} ne $value) {
2902 $self->{value} = $value;
2903
2904 if ($value < 0) {
2905 $self->set_text ("-");
2906 } else {
2907 $self->set_text (sprintf $self->{label}, $value * 100);
2908 }
2909
2910 $self->update;
2911 }
2912}
2913
2914sub _draw {
2915 my ($self) = @_;
2916
2917 glEnable GL_BLEND;
2918 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2919
2920 my $px = $self->{padding_x};
2921 my $py = $self->{padding_y};
2922
2923 if ($self->{value} >= 0) {
2924 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2925
2926 glColor_premultiply @{$self->{bar}};
2927 glRect $px, $py, $s, $self->{h} - $py;
2928 glColor_premultiply @{$self->{bg}};
2929 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2930 }
2931
2932 glColor_premultiply @{$self->{outline}};
2933
2934 $px -= .5;
2935 $py -= .5;
2936
2937 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2938
2939 glDisable GL_BLEND;
2940
2941 {
2942 local $self->{bg}; # do not draw background
2943 $self->SUPER::_draw;
2944 }
2945}
2946
2947#############################################################################
2948
2949package DC::UI::ExperienceProgress;
2950
2951our @ISA = DC::UI::Progress::;
2952
2953sub new {
2954 my ($class, %arg) = @_;
2955
2956 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2957
2958 my $self = $class->SUPER::new (
2959 %arg,
2960 tooltip => sub {
2961 my ($self) = @_;
2962
2963 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2964 $tt,
2965 $self->{lvl},
2966 ::formsep ($self->{exp}),
2967 ::formsep ($self->{nxt}),
2968 ::formsep ($self->{nxt} - $self->{exp}),
2969 $self->_percent * 100,
2970 },
2971 );
2972
2973 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2974 if $::CONN;
2975
2976 $self
2977}
2978
2979sub DESTROY {
2980 my ($self) = @_;
2981
2982 delete $::CONN->{on_exp_update}{$self+0}
2983 if $::CONN;
2984
2985 $self->SUPER::DESTROY;
2986}
2987
2988sub _percent {
2989 my ($self) = @_;
2990
2991 my $table = $::CONN && $::CONN->{exp_table}
2992 or return -1;
2993
2994 my $l0 = $table->[$self->{lvl} - 1];
2995 my $l1 = $table->[$self->{lvl}];
2996
2997 $self->{nxt} = $l1;
2998
2999 ($self->{exp} - $l0) / ($l1 - $l0)
3000}
3001
3002sub set_value {
3003 my ($self, $lvl, $exp) = @_;
3004
3005 $self->{lvl} = $lvl;
3006 $self->{exp} = $exp;
3007
3008 $self->SUPER::set_value ($self->_percent);
3009}
3010
3011#############################################################################
3012
2711package CFPlus::UI::Gauge; 3013package DC::UI::Gauge;
2712 3014
2713our @ISA = CFPlus::UI::VBox::; 3015our @ISA = DC::UI::VBox::;
2714 3016
2715sub new { 3017sub new {
2716 my ($class, %arg) = @_; 3018 my ($class, %arg) = @_;
2717 3019
2718 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
2720 can_hover => 1, 3022 can_hover => 1,
2721 can_events => 1, 3023 can_events => 1,
2722 %arg, 3024 %arg,
2723 ); 3025 );
2724 3026
2725 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3027 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2726 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3028 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2727 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3029 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2728 3030
2729 $self 3031 $self
2730} 3032}
2731 3033
2732sub set_fontsize { 3034sub set_fontsize {
2753 $self->{value}->set_text ($val); 3055 $self->{value}->set_text ($val);
2754} 3056}
2755 3057
2756############################################################################# 3058#############################################################################
2757 3059
2758package CFPlus::UI::Slider; 3060package DC::UI::Slider;
2759 3061
2760use strict; 3062use common::sense;
2761 3063
2762use CFPlus::OpenGL; 3064use DC::OpenGL;
2763 3065
2764our @ISA = CFPlus::UI::DrawBG::; 3066our @ISA = DC::UI::DrawBG::;
2765 3067
2766my @tex = 3068my @tex =
2767 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3069 map { new_from_resource DC::Texture $_ }
2768 qw(s1_slider.png s1_slider_bg.png); 3070 qw(s1_slider.png s1_slider_bg.png);
2769 3071
2770sub new { 3072sub new {
2771 my $class = shift; 3073 my $class = shift;
2772 3074
2809sub set_value { 3111sub set_value {
2810 my ($self, $value) = @_; 3112 my ($self, $value) = @_;
2811 3113
2812 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3114 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2813 3115
2814 $hi = $lo + 1 if $hi <= $lo; 3116 $hi = $lo if $hi < $lo;
2815 3117
2816 $page = $hi - $lo if $page > $hi - $lo; 3118 $value = $hi - $page if $value > $hi - $page;
2817
2818 $value = $lo if $value < $lo; 3119 $value = $lo if $value < $lo;
2819 $value = $hi - $page if $value > $hi - $page;
2820 3120
2821 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3121 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2822 if $unit; 3122 if $unit;
2823 3123
2824 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3124 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2840 3140
2841 $self->SUPER::invoke_button_down ($ev, $x, $y); 3141 $self->SUPER::invoke_button_down ($ev, $x, $y);
2842 3142
2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3143 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2844 3144
2845 $self->invoke_mouse_motion ($ev, $x, $y) 3145 $self->invoke_mouse_motion ($ev, $x, $y);
3146
3147 1
2846} 3148}
2847 3149
2848sub invoke_mouse_motion { 3150sub invoke_mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 3151 my ($self, $ev, $x, $y) = @_;
2850 3152
2851 if ($GRAB == $self) { 3153 if ($GRAB == $self) {
2852 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3154 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2853 3155
2854 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3156 my (undef, $lo, $hi, $page) = @{$self->{range}};
2855 3157
2856 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3158 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2857 3159
2858 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3160 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2859 } else { 3161 } else {
2860 return 0; 3162 return 0;
2861 } 3163 }
2866sub invoke_mouse_wheel { 3168sub invoke_mouse_wheel {
2867 my ($self, $ev) = @_; 3169 my ($self, $ev) = @_;
2868 3170
2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3171 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2870 3172
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3173 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2872 3174
2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3175 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874 3176
2875 ! ! $delta 3177 1
2876} 3178}
2877 3179
2878sub update { 3180sub update {
2879 my ($self) = @_; 3181 my ($self) = @_;
2880 3182
2886 my ($self) = @_; 3188 my ($self) = @_;
2887 3189
2888 unless ($self->{knob_w}) { 3190 unless ($self->{knob_w}) {
2889 $self->set_value ($self->{range}[0]); 3191 $self->set_value ($self->{range}[0]);
2890 3192
2891 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3193 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2892 my $range = ($hi - $page - $lo) || 1e-100; 3194 my $range = ($hi - $page - $lo) || 1e-10;
2893 3195
2894 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3196 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2895 3197
2896 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3198 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2897 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3199 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2898 3200
2899 $value = ($value - $lo) / $range; 3201 $value = ($value - $lo) / $range;
2929 glDisable GL_TEXTURE_2D; 3231 glDisable GL_TEXTURE_2D;
2930} 3232}
2931 3233
2932############################################################################# 3234#############################################################################
2933 3235
2934package CFPlus::UI::ValSlider; 3236package DC::UI::ValSlider;
2935 3237
2936our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
2937 3239
2938sub new { 3240sub new {
2939 my ($class, %arg) = @_; 3241 my ($class, %arg) = @_;
2940 3242
2941 my $range = delete $arg{range}; 3243 my $range = delete $arg{range};
2942 3244
2943 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
2944 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3246 slider => (new DC::UI::Slider expand => 1, range => $range),
2945 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3247 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2946 to_value => sub { shift }, 3248 to_value => sub { shift },
2947 from_value => sub { shift }, 3249 from_value => sub { shift },
2948 %arg, 3250 %arg,
2949 ); 3251 );
2950 3252
2970sub set_range { shift->{slider}->set_range (@_) } 3272sub set_range { shift->{slider}->set_range (@_) }
2971sub set_value { shift->{slider}->set_value (@_) } 3273sub set_value { shift->{slider}->set_value (@_) }
2972 3274
2973############################################################################# 3275#############################################################################
2974 3276
2975package CFPlus::UI::TextScroller; 3277package DC::UI::TextScroller;
2976 3278
2977our @ISA = CFPlus::UI::HBox::; 3279our @ISA = DC::UI::HBox::;
2978 3280
2979use CFPlus::OpenGL; 3281use DC::OpenGL;
2980 3282
2981sub new { 3283sub new {
2982 my $class = shift; 3284 my $class = shift;
2983 3285
2984 my $self = $class->SUPER::new ( 3286 my $self = $class->SUPER::new (
2986 can_events => 1, 3288 can_events => 1,
2987 indent => 0, 3289 indent => 0,
2988 #font => default_font 3290 #font => default_font
2989 @_, 3291 @_,
2990 3292
2991 layout => (new CFPlus::Layout), 3293 layout => (new DC::Layout),
2992 par => [],
2993 max_par => 0, 3294 max_par => 0,
2994 height => 0, 3295 height => 0,
2995 children => [ 3296 children => [
2996 (new CFPlus::UI::Empty expand => 1), 3297 (new DC::UI::Empty expand => 1),
2997 (new CFPlus::UI::Slider vertical => 1), 3298 (new DC::UI::Slider vertical => 1),
2998 ], 3299 ],
2999 ); 3300 );
3000 3301
3001 $self->{children}[1]->connect (changed => sub { $self->update }); 3302 $self->{children}[1]->connect (changed => sub { $self->update });
3002 3303
3304 $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3305
3003 $self 3306 $self
3004} 3307}
3005 3308
3006sub set_fontsize { 3309sub set_fontsize {
3007 my ($self, $fontsize) = @_; 3310 my ($self, $fontsize) = @_;
3011} 3314}
3012 3315
3013sub size_request { 3316sub size_request {
3014 my ($self) = @_; 3317 my ($self) = @_;
3015 3318
3016 my ($empty, $slider) = @{ $self->{children} }; 3319 my ($empty, $slider) = $self->visible_children;
3017 3320
3018 local $self->{children} = [$empty, $slider]; 3321 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::size_request 3322 $self->SUPER::size_request
3020} 3323}
3021 3324
3058 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3361 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3059 $layout->set_markup ($para->{markup}); 3362 $layout->set_markup ($para->{markup});
3060 3363
3061 $layout->set_shapes ( 3364 $layout->set_shapes (
3062 map 3365 map
3063 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3366 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3064 @{$para->{widget}} 3367 @{$para->{widget}}
3065 ); 3368 );
3066 3369
3067 $layout 3370 $layout
3068} 3371}
3185 $ROOT->on_post_alloc ($self => sub { 3488 $ROOT->on_post_alloc ($self => sub {
3186 $self->force_uptodate; 3489 $self->force_uptodate;
3187 3490
3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3491 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3189 3492
3190 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3493 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3191 glClearColor 0, 0, 0, 0; 3494 glClearColor 0, 0, 0, 0;
3192 glClear GL_COLOR_BUFFER_BIT; 3495 glClear GL_COLOR_BUFFER_BIT;
3193 3496
3194 package CFPlus::UI::Base; 3497 package DC::UI::Base;
3195 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3498 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196 (0, 0, $self->{w}, $self->{h}); 3499 (0, 0, $self->{w}, $self->{h});
3197 3500
3198 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
3199 3502
3210 3513
3211 if ($y0 < $y + $h && $y < $y1) { 3514 if ($y0 < $y + $h && $y < $y1) {
3212 my $layout = $self->get_layout ($para); 3515 my $layout = $self->get_layout ($para);
3213 3516
3214 $layout->render ($para->{indent}, $y - $y0); 3517 $layout->render ($para->{indent}, $y - $y0);
3518 $layout->draw;
3215 3519
3216 if (my @w = @{ $para->{widget} }) { 3520 if (my @w = @{ $para->{widget} }) {
3217 my @s = $layout->get_shapes; 3521 my @s = $layout->get_shapes;
3218 3522
3219 for (@w) { 3523 for (@w) {
3257 $self->{children}[1]->draw; 3561 $self->{children}[1]->draw;
3258} 3562}
3259 3563
3260############################################################################# 3564#############################################################################
3261 3565
3262package CFPlus::UI::Animator; 3566package DC::UI::Animator;
3263 3567
3264use CFPlus::OpenGL; 3568use DC::OpenGL;
3265 3569
3266our @ISA = CFPlus::UI::Bin::; 3570our @ISA = DC::UI::Bin::;
3267 3571
3268sub moveto { 3572sub moveto {
3269 my ($self, $x, $y) = @_; 3573 my ($self, $x, $y) = @_;
3270 3574
3271 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3575 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3299 glPopMatrix; 3603 glPopMatrix;
3300} 3604}
3301 3605
3302############################################################################# 3606#############################################################################
3303 3607
3304package CFPlus::UI::Flopper; 3608package DC::UI::Flopper;
3305 3609
3306our @ISA = CFPlus::UI::Button::; 3610our @ISA = DC::UI::Button::;
3307 3611
3308sub new { 3612sub new {
3309 my $class = shift; 3613 my $class = shift;
3310 3614
3311 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
3323 $self->{other}->toggle_visibility; 3627 $self->{other}->toggle_visibility;
3324} 3628}
3325 3629
3326############################################################################# 3630#############################################################################
3327 3631
3328package CFPlus::UI::Tooltip; 3632package DC::UI::Tooltip;
3329 3633
3330our @ISA = CFPlus::UI::Bin::; 3634our @ISA = DC::UI::Bin::;
3331 3635
3332use CFPlus::OpenGL; 3636use DC::OpenGL;
3333 3637
3334sub new { 3638sub new {
3335 my $class = shift; 3639 my $class = shift;
3336 3640
3337 $class->SUPER::new ( 3641 $class->SUPER::new (
3338 @_, 3642 @_,
3339 can_events => 0, 3643 can_events => 0,
3340 ) 3644 )
3341} 3645}
3342 3646
3647# expand, as good as possible
3648sub _expand_doclets {
3649 my ($tip) = @_;
3650
3651 $tip =~ s{#\(([^)]+)\)}{
3652 if ($::CONN) {
3653 exists $::CONN->{doclet}{$1}
3654 ? $::CONN->{doclet}{$1}
3655 : "(waiting for server to show full text)"
3656 } else {
3657 "(unable to show full text without server connection)"
3658 }
3659 }ge;
3660
3661 $tip =~ s/^\n+//;
3662 $tip =~ s/\n+$//;
3663
3664 $tip
3665}
3666
3667# expands a tooltip, potentially multiple times remotely
3668# and returns a guard. clals the clalback each time the text changes.
3669sub expand_tooltip {
3670 my ($tip, $cb) = @_;
3671
3672 # first expand #name tooltips from local pod
3673 $tip = DC::Pod::section_label tooltip => $1
3674 if $tip =~ /^#([^(].*)$/;
3675
3676 my $active; # true if any remote requests outstanding
3677
3678 if ($::CONN && $::CONN->{addme_success}) {
3679 # now find all doclet references
3680 for my $doclet ($tip =~ /#\(([^)]+)\)/g) {
3681 unless (exists $::CONN->{doclet}{$doclet}) {
3682 # need to ask the server
3683 # we don't try to avoid duplicate requests
3684
3685 $active = 1;
3686 $::CONN->send_exti_req (doclet => (split /\//, $doclet, 2), sub {
3687 $::CONN->{doclet}{$doclet} = DC::sanitise_cfxml $_[0];
3688 $cb->(_expand_doclets $tip) if $active;
3689 });
3690 }
3691 }
3692 }
3693
3694 $cb->(_expand_doclets $tip);
3695
3696 $active and Guard::guard { undef $active }
3697}
3698
3343sub set_tooltip_from { 3699sub set_tooltip_from {
3344 my ($self, $widget) = @_; 3700 my ($self, $widget) = @_;
3345 3701
3346 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347 if $widget->{tooltip} =~ /^#(.*)$/;
3348
3349 my $tooltip = $widget->{tooltip}; 3702 my $tip = $widget->{tooltip};
3703 $tip = $tip->($widget) if "CODE" eq ref $tip;
3350 3704
3351 if ($ENV{CFPLUS_DEBUG} & 2) {
3352 $tooltip .= "\n\n" . (ref $widget) . "\n"
3353 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3354 . "req $widget->{req_w} $widget->{req_h}\n"
3355 . "visible $widget->{visible}";
3356 }
3357
3358 $tooltip =~ s/^\n+//;
3359 $tooltip =~ s/\n+$//;
3360
3361 $self->add (new CFPlus::UI::Label 3705 $self->add (new DC::UI::Label
3362 markup => $tooltip, 3706 fg => $DC::THEME{tooltip_fg},
3363 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3707 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3708 align => 0,
3364 fontsize => 0.8, 3709 fontsize => 0.8,
3365 style => 1, # FLAG_INVERSE 3710 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3366 ellipsise => 0, 3711 ellipsise => 0,
3367 font => ($widget->{tooltip_font} || $::FONT_PROP), 3712 font => ($widget->{tooltip_font} || $::FONT_PROP),
3368 ); 3713 );
3714
3715 $self->{tooltip_expand} = expand_tooltip $tip, sub {
3716 my ($tip) = @_;
3717
3718 if ($ENV{CFPLUS_DEBUG} & 2) {
3719 $tip .= "\n\n" . (ref $widget) . "\n"
3720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3721 . "req $widget->{req_w} $widget->{req_h}\n"
3722 . "visible $widget->{visible}";
3723 }
3724
3725 $self->{children}[0]->set_markup ($tip);
3726 };
3369} 3727}
3370 3728
3371sub size_request { 3729sub size_request {
3372 my ($self) = @_; 3730 my ($self) = @_;
3373 3731
3405} 3763}
3406 3764
3407sub _draw { 3765sub _draw {
3408 my ($self) = @_; 3766 my ($self) = @_;
3409 3767
3410 glTranslate 0.375, 0.375;
3411
3412 my ($w, $h) = @$self{qw(w h)}; 3768 my ($w, $h) = @$self{qw(w h)};
3413 3769
3414 glColor 1, 0.8, 0.4; 3770 glColor @{ $DC::THEME{tooltip_bg} };
3415 glBegin GL_QUADS; 3771 glRect 0, 0, $w, $h;
3416 glVertex 0 , 0;
3417 glVertex 0 , $h;
3418 glVertex $w, $h;
3419 glVertex $w, 0;
3420 glEnd;
3421 3772
3422 glColor 0, 0, 0; 3773 glColor @{ $DC::THEME{tooltip_border} };
3423 glBegin GL_LINE_LOOP; 3774 glRect_lineloop .5, .5, $w + .5, $h + .5;
3424 glVertex 0 , 0;
3425 glVertex 0 , $h;
3426 glVertex $w, $h;
3427 glVertex $w, 0;
3428 glEnd;
3429 3775
3430 glTranslate 2 - 0.375, 2 - 0.375; 3776 glTranslate 2, 2;
3431 3777
3432 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3433} 3779}
3434 3780
3435############################################################################# 3781#############################################################################
3436 3782
3437package CFPlus::UI::Face; 3783package DC::UI::Face;
3438 3784
3439our @ISA = CFPlus::UI::DrawBG::; 3785our @ISA = DC::UI::DrawBG::;
3440 3786
3441use CFPlus::OpenGL; 3787use DC::OpenGL;
3442 3788
3443sub new { 3789sub new {
3444 my $class = shift; 3790 my $class = shift;
3445 3791
3446 my $self = $class->SUPER::new ( 3792 my $self = $class->SUPER::new (
3449 aspect => 1, 3795 aspect => 1,
3450 can_events => 0, 3796 can_events => 0,
3451 @_, 3797 @_,
3452 ); 3798 );
3453 3799
3454 if ($self->{anim} && $self->{animspeed}) {
3455 CFPlus::weaken (my $widget = $self);
3456
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3459 $self->{timer} = Event->timer (
3460 parked => 1,
3461 cb => sub {
3462 return unless $::CONN && $widget;
3463
3464 ++$widget->{frame};
3465 $widget->update_face;
3466 $widget->update;
3467
3468 $widget->update_timer;
3469 },
3470 );
3471
3472 $self->update_face;
3473 $self->update_timer; 3800 $self->update_anim;
3474 }
3475 3801
3476 $self 3802 $self
3477} 3803}
3478 3804
3479sub update_timer { 3805sub update_timer {
3480 my ($self) = @_; 3806 my ($self) = @_;
3481 3807
3482 return unless $self->{timer}; 3808 return unless $self->{timer};
3483 3809
3484 if ($self->{visible}) { 3810 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start; 3811 $self->{timer}->start;
3491 } else { 3812 } else {
3492 $self->{timer}->stop; 3813 $self->{timer}->stop;
3493 } 3814 }
3494} 3815}
3495 3816
3496sub update_face { 3817sub update_face {
3497 my ($self) = @_; 3818 my ($self) = @_;
3498 3819
3499 return unless $::CONN;
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3506 }
3507 }
3508}
3509
3510sub size_request {
3511 my ($self) = @_;
3512
3513 if ($::CONN) { 3820 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3821 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) { 3822 if ($anim && @$anim) {
3516 $self->{tex} = $tex; 3823 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3824 delete $self->{face_change_cb};
3518 } else { 3825
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3826 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3520 $self->realloc; 3827 unless ($tex->{name} || $tex->{loading}) {
3828 $tex->upload (sub { $self->reconfigure });
3829 }
3521 }); 3830 }
3522 } 3831 }
3523 } 3832 }
3524 } 3833 }
3834}
3835
3836sub update_anim {
3837 my ($self) = @_;
3838
3839 if ($self->{anim} && $self->{animspeed}) {
3840 DC::weaken (my $widget = $self);
3841
3842 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3843 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3844 return unless $::CONN;
3845
3846 my $w = $widget
3847 or return;
3848
3849 ++$w->{frame};
3850 $w->update_face;
3851
3852 # somehow, $widget can go away
3853 $w->update;
3854 $w->update_timer;
3855 };
3856
3857 $self->update_face;
3858 $self->update_timer;
3859 } else {
3860 delete $self->{timer};
3861 }
3862}
3863
3864sub size_request {
3865 my ($self) = @_;
3866
3867 if ($::CONN) {
3868 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3869 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3870 if ($tex->{name}) {
3871 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3872 } elsif (!$tex->{loading}) {
3873 $tex->upload (sub { $self->reconfigure });
3874 }
3875 }
3876
3877 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3878 }
3879 }
3525 3880
3526 ($self->{size_w} || 8, $self->{size_h} || 8) 3881 ($self->{size_w} || 8, $self->{size_h} || 8)
3527} 3882}
3528 3883
3529sub update { 3884sub update {
3530 my ($self) = @_; 3885 my ($self) = @_;
3531 3886
3532 return unless $self->{visible}; 3887 return unless $self->{visible};
3533 3888
3534 $self->SUPER::update; 3889 $self->SUPER::update;
3890}
3891
3892sub set_face {
3893 my ($self, $face) = @_;
3894
3895 $self->{face} = $face;
3896 $self->reconfigure;
3897}
3898
3899sub set_anim {
3900 my ($self, $anim) = @_;
3901
3902 $self->{anim} = $anim;
3903 $self->update_anim;
3904}
3905
3906sub set_animspeed {
3907 my ($self, $animspeed) = @_;
3908
3909 $self->{animspeed} = $animspeed;
3910 $self->update_anim;
3535} 3911}
3536 3912
3537sub invoke_visibility_change { 3913sub invoke_visibility_change {
3538 my ($self) = @_; 3914 my ($self) = @_;
3539 3915
3565 $self->SUPER::destroy; 3941 $self->SUPER::destroy;
3566} 3942}
3567 3943
3568############################################################################# 3944#############################################################################
3569 3945
3570package CFPlus::UI::Buttonbar; 3946package DC::UI::Buttonbar;
3571 3947
3572our @ISA = CFPlus::UI::HBox::; 3948our @ISA = DC::UI::HBox::;
3573 3949
3574# TODO: should actually wrap buttons and other goodies. 3950# TODO: should actually wrap buttons and other goodies.
3575 3951
3576############################################################################# 3952#############################################################################
3577 3953
3578package CFPlus::UI::Menu; 3954package DC::UI::Menu;
3579 3955
3580our @ISA = CFPlus::UI::Toplevel::; 3956our @ISA = DC::UI::Toplevel::;
3581 3957
3582use CFPlus::OpenGL; 3958use DC::OpenGL;
3583 3959
3584sub new { 3960sub new {
3585 my $class = shift; 3961 my $class = shift;
3586 3962
3587 my $self = $class->SUPER::new ( 3963 my $self = $class->SUPER::new (
3588 items => [], 3964 items => [],
3589 z => 100, 3965 z => 100,
3590 @_, 3966 @_,
3591 ); 3967 );
3592 3968
3593 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3969 $self->add ($self->{vbox} = new DC::UI::VBox);
3594 3970
3595 for my $item (@{ $self->{items} }) { 3971 for my $item (@{ $self->{items} }) {
3596 my ($widget, $cb, $tooltip) = @$item; 3972 my ($widget, $cb, $tooltip) = @$item;
3597 3973
3598 # handle various types of items, only text for now 3974 # handle various types of items, only text for now
3599 if (!ref $widget) { 3975 if (!ref $widget) {
3600 if ($widget =~ /\t/) { 3976 if ($widget =~ /\t/) {
3601 my ($left, $right) = split /\t/, $widget, 2; 3977 my ($left, $right) = split /\t/, $widget, 2;
3602 3978
3603 $widget = new CFPlus::UI::HBox 3979 $widget = new DC::UI::HBox
3604 can_hover => 1, 3980 can_hover => 1,
3605 can_events => 1, 3981 can_events => 1,
3606 tooltip => $tooltip, 3982 tooltip => $tooltip,
3607 children => [ 3983 children => [
3608 (new CFPlus::UI::Label markup => $left, expand => 1), 3984 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3609 (new CFPlus::UI::Label markup => $right, align => +1), 3985 (new DC::UI::Label markup => $right, align => 1),
3610 ], 3986 ],
3611 ; 3987 ;
3612 3988
3613 } else { 3989 } else {
3614 $widget = new CFPlus::UI::Label 3990 $widget = new DC::UI::Label
3615 can_hover => 1, 3991 can_hover => 1,
3616 can_events => 1, 3992 can_events => 1,
3993 align => 0,
3617 markup => $widget, 3994 markup => $widget,
3618 tooltip => $tooltip; 3995 tooltip => $tooltip;
3619 } 3996 }
3620 } 3997 }
3621 3998
3636 # maybe save $GRAB? must be careful about events... 4013 # maybe save $GRAB? must be careful about events...
3637 $GRAB = $self; 4014 $GRAB = $self;
3638 $self->{button} = $ev->{button}; 4015 $self->{button} = $ev->{button};
3639 4016
3640 $self->show; 4017 $self->show;
3641 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 4018
4019 my $x = $ev->{x};
4020 my $y = $ev->{y};
4021
4022 $self->{root}->on_post_alloc ($self => sub {
4023 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
4024 });
4025
4026 1 # so it can be used inside event handlers
3642} 4027}
3643 4028
3644sub invoke_mouse_motion { 4029sub invoke_mouse_motion {
3645 my ($self, $ev, $x, $y) = @_; 4030 my ($self, $ev, $x, $y) = @_;
3646 4031
3667 1 4052 1
3668} 4053}
3669 4054
3670############################################################################# 4055#############################################################################
3671 4056
3672package CFPlus::UI::Multiplexer; 4057package DC::UI::Multiplexer;
3673 4058
3674our @ISA = CFPlus::UI::Container::; 4059our @ISA = DC::UI::Container::;
3675 4060
3676sub new { 4061sub new {
3677 my $class = shift; 4062 my $class = shift;
3678 4063
3679 my $self = $class->SUPER::new ( 4064 my $self = $class->SUPER::new (
3680 @_, 4065 @_,
3681 ); 4066 );
3682 4067
3683 $self->{current} = $self->{children}[0] 4068 $self->set_current_page (0);
3684 if @{ $self->{children} };
3685 4069
3686 $self 4070 $self
3687} 4071}
3688 4072
3689sub add { 4073sub add {
3690 my ($self, @widgets) = @_; 4074 my ($self, @widgets) = @_;
3691 4075
3692 $self->SUPER::add (@widgets); 4076 $self->SUPER::add (@widgets);
3693 4077
3694 $self->{current} = $self->{children}[0] 4078 $self->set_current_page (0)
3695 if @{ $self->{children} }; 4079 if @widgets == @{ $self->{children} };
3696} 4080}
3697 4081
3698sub get_current_page { 4082sub get_current_page {
3699 my ($self) = @_; 4083 my ($self) = @_;
3700 4084
3706 4090
3707 my $widget = ref $page_or_widget 4091 my $widget = ref $page_or_widget
3708 ? $page_or_widget 4092 ? $page_or_widget
3709 : $self->{children}[$page_or_widget]; 4093 : $self->{children}[$page_or_widget];
3710 4094
4095 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4096
3711 $self->{current} = $widget; 4097 if (($self->{current} = $widget)) {
4098 $self->{current}->set_visible if $self->{current} && $self->{visible};
3712 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4099 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3713 4100
3714 $self->emit (page_changed => $self->{current}); 4101 $self->emit (page_changed => $self->{current});
4102 }
3715 4103
3716 $self->realloc; 4104 $self->realloc;
3717} 4105}
3718 4106
3719sub visible_children { 4107sub visible_children {
3720 $_[0]{current} 4108 $_[0]{current} || ()
3721} 4109}
3722 4110
3723sub size_request { 4111sub size_request {
3724 my ($self) = @_; 4112 my ($self) = @_;
3725 4113
4114 $self->{current}
3726 $self->{current}->size_request 4115 ? $self->{current}->size_request
4116 : (0, 0)
3727} 4117}
3728 4118
3729sub invoke_size_allocate { 4119sub invoke_size_allocate {
3730 my ($self, $w, $h) = @_; 4120 my ($self, $w, $h) = @_;
3731 4121
3732 $self->{current}->configure (0, 0, $w, $h); 4122 $self->{current}->configure (0, 0, $w, $h)
4123 if $self->{current};
3733 4124
3734 1 4125 1
3735} 4126}
3736 4127
3737sub _draw { 4128sub _draw {
3738 my ($self) = @_; 4129 my ($self) = @_;
3739 4130
3740 $self->{current}->draw; 4131 $self->{current}->draw
4132 if $self->{current};
3741} 4133}
3742 4134
3743############################################################################# 4135#############################################################################
3744 4136
3745package CFPlus::UI::Notebook; 4137package DC::UI::Notebook;
3746 4138
4139use DC::OpenGL;
4140
3747our @ISA = CFPlus::UI::VBox::; 4141our @ISA = DC::UI::VBox::;
3748 4142
3749sub new { 4143sub new {
3750 my $class = shift; 4144 my $class = shift;
3751 4145
3752 my $self = $class->SUPER::new ( 4146 my $self = $class->SUPER::new (
3753 buttonbar => (new CFPlus::UI::Buttonbar), 4147 buttonbar => (new DC::UI::Buttonbar),
3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4148 multiplexer => (new DC::UI::Multiplexer expand => 1),
4149 active_outline => [.7, .7, 0.2],
3755 # filter => # will be put between multiplexer and $self 4150 # filter => # will be put between multiplexer and $self
3756 @_, 4151 @_,
3757 ); 4152 );
3758 4153
3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4154 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3760 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4155 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3761 4156
4157 {
4158 Scalar::Util::weaken (my $wself = $self);
4159
4160 $self->{multiplexer}->connect (c_add => sub {
4161 my ($mplex, $widgets) = @_;
4162
4163 for my $child (@$widgets) {
4164 Scalar::Util::weaken $child;
4165 $child->{c_tab_} ||= do {
4166 my $tab =
4167 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4168 ? $child->{c_tab}
4169 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4170
4171 $tab->connect (activate => sub {
4172 $wself->set_current_page ($child);
4173 });
4174
4175 $tab
4176 };
4177
4178 $self->{buttonbar}->add ($child->{c_tab_});
4179 }
4180 });
4181
4182 $self->{multiplexer}->connect (c_remove => sub {
4183 my ($mplex, $widgets) = @_;
4184
4185 for my $child (@$widgets) {
4186 $wself->{buttonbar}->remove ($child->{c_tab_});
4187 }
4188 });
4189 }
4190
3762 $self 4191 $self
3763} 4192}
3764 4193
3765sub add { 4194sub add {
4195 my ($self, @widgets) = @_;
4196
4197 $self->{multiplexer}->add (@widgets)
4198}
4199
4200sub remove {
4201 my ($self, @widgets) = @_;
4202
4203 $self->{multiplexer}->remove (@widgets)
4204}
4205
4206sub pages {
4207 my ($self) = @_;
4208 $self->{multiplexer}->children
4209}
4210
4211sub page_index {
4212 my ($self, $widget) = @_;
4213
4214 my $i = 0;
4215 for ($self->pages) {
4216 if ($_ eq $widget) { return $i };
4217 $i++;
4218 }
4219
4220 undef
4221}
4222
4223sub add_tab {
3766 my ($self, $title, $widget, $tooltip) = @_; 4224 my ($self, $title, $widget, $tooltip) = @_;
3767 4225
3768 CFPlus::weaken $self; 4226 $title = [$title, $tooltip] unless ref $title;
4227 $widget->{c_tab} = $title;
3769 4228
3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3772 markup => $title,
3773 tooltip => $tooltip,
3774 );
3775 }
3776
3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3778 $self->{buttonbar}->add ($title);
3779
3780 $self->{multiplexer}->add ($widget); 4229 $self->add ($widget);
3781} 4230}
3782 4231
3783sub get_current_page { 4232sub get_current_page {
3784 my ($self) = @_; 4233 my ($self) = @_;
3785 4234
3791 4240
3792 $self->{multiplexer}->set_current_page ($page); 4241 $self->{multiplexer}->set_current_page ($page);
3793 $self->emit (page_changed => $self->{multiplexer}{current}); 4242 $self->emit (page_changed => $self->{multiplexer}{current});
3794} 4243}
3795 4244
4245sub _draw {
4246 my ($self) = @_;
4247
4248 $self->SUPER::_draw ();
4249
4250 if (my $cur = $self->{multiplexer}{current}) {
4251 if ($cur = $cur->{c_tab_}) {
4252 glTranslate $self->{buttonbar}{x} + $cur->{x},
4253 $self->{buttonbar}{y} + $cur->{y};
4254 glLineWidth 3;
4255 #glEnable GL_BLEND;
4256 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4257 glColor @{$self->{active_outline}};
4258 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4259 glLineWidth 1;
4260 #glDisable GL_BLEND;
4261 }
4262 }
4263}
4264
3796############################################################################# 4265#############################################################################
3797 4266
3798package CFPlus::UI::Selector; 4267package DC::UI::Selector;
3799 4268
3800use utf8; 4269use utf8;
3801 4270
3802our @ISA = CFPlus::UI::Button::; 4271our @ISA = DC::UI::Button::;
3803 4272
3804sub new { 4273sub new {
3805 my $class = shift; 4274 my $class = shift;
3806 4275
3807 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
3824 my ($value, $title, $tooltip) = @$_; 4293 my ($value, $title, $tooltip) = @$_;
3825 4294
3826 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4295 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3827 } 4296 }
3828 4297
3829 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4298 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3830} 4299}
3831 4300
3832sub _set_value { 4301sub _set_value {
3833 my ($self, $value) = @_; 4302 my ($self, $value) = @_;
3834 4303
3835 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4304 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4305 $item ||= $self->{options}[0]
3836 or return; 4306 or return;
3837 4307
3838 $self->{value} = $item->[0]; 4308 $self->{value} = $item->[0];
3839 $self->set_markup ("$item->[1] ⇓"); 4309 $self->set_markup ("$item->[1] ⇓");
3840 $self->set_tooltip ($item->[2]); 4310# $self->set_tooltip ($item->[2]);
3841} 4311}
3842 4312
3843sub set_value { 4313sub set_value {
3844 my ($self, $value) = @_; 4314 my ($self, $value) = @_;
3845 4315
3847 4317
3848 $self->_set_value ($value); 4318 $self->_set_value ($value);
3849 $self->emit (changed => $value); 4319 $self->emit (changed => $value);
3850} 4320}
3851 4321
4322sub set_options {
4323 my ($self, $options) = @_;
4324
4325 $self->{options} = $options;
4326 $self->_set_value ($self->{value});
4327}
4328
3852############################################################################# 4329#############################################################################
3853 4330
3854package CFPlus::UI::Statusbox; 4331package DC::UI::Statusbox;
3855 4332
3856our @ISA = CFPlus::UI::VBox::; 4333our @ISA = DC::UI::VBox::;
3857 4334
3858sub new { 4335sub new {
3859 my $class = shift; 4336 my $class = shift;
3860 4337
3861 my $self = $class->SUPER::new ( 4338 my $self = $class->SUPER::new (
3862 fontsize => 0.8, 4339 fontsize => 0.8,
3863 @_, 4340 @_,
3864 ); 4341 );
3865 4342
3866 CFPlus::weaken (my $this = $self); 4343 DC::weaken (my $this = $self);
3867 4344
3868 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4345 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3869 4346
3870 $self 4347 $self
3871} 4348}
3872 4349
3873sub reorder { 4350sub reorder {
3874 my ($self) = @_; 4351 my ($self) = @_;
3875 my $NOW = Time::HiRes::time; 4352 my $NOW = AE::time;
3876 4353
3877 # freeze display when hovering over any label 4354 # freeze display when hovering over any label
3878 return if $CFPlus::UI::TOOLTIP->{owner} 4355 return if $DC::UI::TOOLTIP->{owner}
3879 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4356 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3880 values %{ $self->{item} }; 4357 values %{ $self->{item} };
3881 4358
3882 while (my ($k, $v) = each %{ $self->{item} }) { 4359 while (my ($k, $v) = each %{ $self->{item} }) {
3883 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4360 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3884 } 4361 }
4362
4363 $self->{timer}->set (1, 1);
3885 4364
3886 my @widgets; 4365 my @widgets;
3887 4366
3888 my @items = sort { 4367 my @items = sort {
3889 $a->{pri} <=> $b->{pri} 4368 $a->{pri} <=> $b->{pri}
3890 or $b->{id} <=> $a->{id} 4369 or $b->{id} <=> $a->{id}
3891 } values %{ $self->{item} }; 4370 } values %{ $self->{item} };
3892
3893 $self->{timer}->interval (1);
3894 4371
3895 my $count = 10 + 1; 4372 my $count = 10 + 1;
3896 for my $item (@items) { 4373 for my $item (@items) {
3897 last unless --$count; 4374 last unless --$count;
3898 4375
3905 for ($short) { 4382 for ($short) {
3906 s/^\s+//; 4383 s/^\s+//;
3907 s/\s+/ /g; 4384 s/\s+/ /g;
3908 } 4385 }
3909 4386
3910 new CFPlus::UI::Label 4387 new DC::UI::Label
3911 markup => $short, 4388 markup => $short,
3912 tooltip => $item->{tooltip}, 4389 tooltip => $item->{tooltip},
3913 tooltip_font => $::FONT_PROP, 4390 tooltip_font => $::FONT_PROP,
3914 tooltip_width => 0.67, 4391 tooltip_width => 0.67,
3915 fontsize => $item->{fontsize} || $self->{fontsize}, 4392 fontsize => $item->{fontsize} || $self->{fontsize},
3916 max_w => $::WIDTH * 0.44, 4393 max_w => $::WIDTH * 0.44,
4394 align => 0,
3917 fg => [@{ $item->{fg} }], 4395 fg => [@{ $item->{fg} }],
3918 can_events => 1, 4396 can_events => 1,
3919 can_hover => 1 4397 can_hover => 1
3920 }; 4398 };
3921 4399
3922 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4400 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3923 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4401 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3924 $label->update; 4402 $label->update;
3925 $label->set_max_size (undef, $label->{req_h} * $diff) 4403 $label->set_max_size (undef, $label->{req_h} * $diff)
3926 if $diff < 1; 4404 if $diff < 1;
3927 $self->{timer}->interval (1/30); 4405 $self->{timer}->set (1/30, 1/30);
3928 } else { 4406 } else {
3929 $label->{fg}[3] = $item->{fg}[3] || 1; 4407 $label->{fg}[3] = $item->{fg}[3] || 1;
3930 } 4408 }
3931 4409
3932 push @widgets, $label; 4410 push @widgets, $label;
3933 } 4411 }
4412
4413 my $hash = join ",", @widgets;
4414 return if $hash eq $self->{last_widget_hash};
4415 $self->{last_widget_hash} = $hash;
3934 4416
3935 $self->clear; 4417 $self->clear;
3936 $self->SUPER::add (reverse @widgets); 4418 $self->SUPER::add (reverse @widgets);
3937} 4419}
3938 4420
3974 $ROOT->on_refresh (reorder => sub { 4456 $ROOT->on_refresh (reorder => sub {
3975 $self->reorder; 4457 $self->reorder;
3976 }); 4458 });
3977} 4459}
3978 4460
4461sub clr_group {
4462 my ($self, $group) = @_;
4463
4464 if (delete $self->{item}{$group}) {
4465 $ROOT->on_refresh (reorder => sub {
4466 $self->reorder;
4467 });
4468 }
4469}
4470
3979sub reconfigure { 4471sub reconfigure {
3980 my ($self) = @_; 4472 my ($self) = @_;
3981 4473
3982 delete $_->{label} 4474 delete $_->{label}
3983 for values %{ $self->{item} || {} }; 4475 for values %{ $self->{item} || {} };
3994 $self->SUPER::destroy; 4486 $self->SUPER::destroy;
3995} 4487}
3996 4488
3997############################################################################# 4489#############################################################################
3998 4490
3999package CFPlus::UI::Root; 4491package DC::UI::Root;
4000 4492
4001our @ISA = CFPlus::UI::Container::; 4493our @ISA = DC::UI::Container::;
4002 4494
4003use List::Util qw(min max); 4495use List::Util qw(min max);
4004 4496
4005use CFPlus::OpenGL; 4497use DC::OpenGL;
4006 4498
4007sub new { 4499sub new {
4008 my $class = shift; 4500 my $class = shift;
4009 4501
4010 my $self = $class->SUPER::new ( 4502 my $self = $class->SUPER::new (
4011 visible => 1, 4503 visible => 1,
4012 @_, 4504 @_,
4013 ); 4505 );
4014 4506
4015 CFPlus::weaken ($self->{root} = $self); 4507 DC::weaken ($self->{root} = $self);
4016 4508
4017 $self 4509 $self
4018} 4510}
4019 4511
4020sub size_request { 4512sub size_request {
4068} 4560}
4069 4561
4070sub update { 4562sub update {
4071 my ($self) = @_; 4563 my ($self) = @_;
4072 4564
4073 $::WANT_REFRESH++; 4565 $::WANT_REFRESH = 1;
4074} 4566}
4075 4567
4076sub add { 4568sub add {
4077 my ($self, @children) = @_; 4569 my ($self, @children) = @_;
4078 4570
4145 4637
4146 delete $queue{$widget+0}; 4638 delete $queue{$widget+0};
4147 4639
4148 my ($w, $h) = $widget->size_request; 4640 my ($w, $h) = $widget->size_request;
4149 4641
4150 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4642 $w += $widget->{padding_x} * 2;
4151 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4643 $h += $widget->{padding_y} * 2;
4644
4645 $w = max $widget->{min_w}, $w;
4646 $h = max $widget->{min_h}, $h;
4152 4647
4153 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4648 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4154 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4649 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4155 4650
4156 $w = $widget->{force_w} if exists $widget->{force_w}; 4651 $w = $widget->{force_w} if exists $widget->{force_w};
4223 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4718 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4224 glMatrixMode GL_MODELVIEW; 4719 glMatrixMode GL_MODELVIEW;
4225 glLoadIdentity; 4720 glLoadIdentity;
4226 4721
4227 { 4722 {
4228 package CFPlus::UI::Base; 4723 package DC::UI::Base;
4229 4724
4230 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4725 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4231 (0, 0, $self->{w}, $self->{h}); 4726 (0, 0, $self->{w}, $self->{h});
4232 4727
4233 $self->_draw; 4728 $self->_draw;
4234 } 4729 }
4235} 4730}
4236 4731
4237############################################################################# 4732#############################################################################
4238 4733
4239package CFPlus::UI; 4734package DC::UI;
4240 4735
4241$ROOT = new CFPlus::UI::Root; 4736$ROOT = new DC::UI::Root;
4242$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4737$TOOLTIP = new DC::UI::Tooltip z => 900;
4243 4738
42441 47391
4245

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines