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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.453 by root, Wed Dec 26 20:46:39 2007 UTC

1package CFPlus::UI; 1package dc::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFPlus; 8use dc;
11use CFPlus::Pod; 9use dc::Pod;
12use CFPlus::Texture; 10use dc::Texture;
13 11
14our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
15 13
16our $LAYOUT; 14our $LAYOUT;
17our $ROOT; 15our $ROOT;
18our $TOOLTIP; 16our $TOOLTIP;
19our $BUTTON_STATE; 17our $BUTTON_STATE;
20 18
21our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
22 20
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
24 if (!$GRAB) { 24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 29 $TOOLTIP->hide;
29 30
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 33
32 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
33 35
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show; 37 $TOOLTIP->show;
40 } 38 }
41 39
42 return; 40 return;
43 } 41 }
44 } 42 }
45 } 43 }
46 44
47 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
49}); 48};
50 49
51sub get_layout { 50sub get_layout {
52 my $layout; 51 my $layout;
53 52
54 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
89 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
90 89
91 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
93 92
94 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
95 } 94 }
96} 95}
97 96
98sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
99 my ($ev) = @_; 98 my ($ev) = @_;
105 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
106 105
107 $GRAB = $widget; 106 $GRAB = $widget;
108 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
109 108
110 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
111 } 110 }
112 111
113 if ($GRAB) { 112 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 114 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & dc::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
118 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
119 } else { 122 } else {
120 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
121 } 124 }
122 } 125 }
136 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
137 $grab->update if $grab; 140 $grab->update if $grab;
138 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
139 142
140 check_hover $widget; 143 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
142 } 145 }
143} 146}
144 147
145sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
146 my ($ev) = @_; 149 my ($ev) = @_;
208 reconfigure_widgets; 211 reconfigure_widgets;
209} 212}
210 213
211############################################################################# 214#############################################################################
212 215
213package CFPlus::UI::Event; 216package dc::UI::Event;
214 217
215sub xy { 218sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217} 220}
218 221
219############################################################################# 222#############################################################################
220 223
221package CFPlus::UI::Base; 224package dc::UI::Base;
222 225
223use strict; 226use strict;
224 227
225use CFPlus::OpenGL; 228use dc::OpenGL;
226 229
227sub new { 230sub new {
228 my $class = shift; 231 my $class = shift;
229 232
230 my $self = bless { 233 my $self = bless {
235 h => undef, 238 h => undef,
236 can_events => 1, 239 can_events => 1,
237 @_ 240 @_
238 }, $class; 241 }, $class;
239 242
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 dc::weaken ($dc::UI::WIDGET{$self+0} = $self);
241 244
242 for (keys %$self) { 245 for (keys %$self) {
243 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
245 } 248 }
246 } 249 }
247 250
248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $dc::UI::LAYOUT->{$self->{name}}) {
249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 252 $self->{x} = $layout->{x} * $dc::UI::ROOT->{alloc_w} if exists $layout->{x};
250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 253 $self->{y} = $layout->{y} * $dc::UI::ROOT->{alloc_h} if exists $layout->{y};
251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 254 $self->{force_w} = $layout->{w} * $dc::UI::ROOT->{alloc_w} if exists $layout->{w};
252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 255 $self->{force_h} = $layout->{h} * $dc::UI::ROOT->{alloc_h} if exists $layout->{h};
253 256
254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
256 259
257 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
266 $self->hide; 269 $self->hide;
267 $self->emit ("destroy"); 270 $self->emit ("destroy");
268 %$self = (); 271 %$self = ();
269} 272}
270 273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
276}
277
271sub show { 278sub show {
272 my ($self) = @_; 279 my ($self) = @_;
273 280
274 return if $self->{parent}; 281 return if $self->{parent};
275 282
276 $CFPlus::UI::ROOT->add ($self); 283 $dc::UI::ROOT->add ($self);
277} 284}
278 285
279sub set_visible { 286sub set_visible {
280 my ($self) = @_; 287 my ($self) = @_;
281 288
302 delete $self->{root}; 309 delete $self->{root};
303 310
304 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
305 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
306 313
307 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $dc::UI::TOOLTIP_WATCHER->invoke
308 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
309 316
310 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
311 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
312} 319}
314sub set_visibility { 321sub set_visibility {
315 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
316 323
317 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
318 325
319 $visible ? $self->hide 326 $visible ? $self->show
320 : $self->show; 327 : $self->hide;
321} 328}
322 329
323sub toggle_visibility { 330sub toggle_visibility {
324 my ($self) = @_; 331 my ($self) = @_;
325 332
331sub hide { 338sub hide {
332 my ($self) = @_; 339 my ($self) = @_;
333 340
334 $self->set_invisible; 341 $self->set_invisible;
335 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
336 $self->{parent}->remove ($self) 346 $parent->remove ($self);
337 if $self->{parent}; 347 }
338} 348}
339 349
340sub move_abs { 350sub move_abs {
341 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
342 352
354 $self->{force_h} = $h; 364 $self->{force_h} = $h;
355 365
356 $self->realloc; 366 $self->realloc;
357} 367}
358 368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
377}
378
359sub size_request { 379sub size_request {
360 require Carp; 380 require Carp;
361 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
362} 382}
363 383
369 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
370 390
371 if ($self->{aspect}) { 391 if ($self->{aspect}) {
372 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
373 393
374 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 394 $w = List::Util::min $w, dc::ceil $h * $self->{aspect};
375 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 395 $h = List::Util::min $h, dc::ceil $w / $self->{aspect};
376 396
377 # use alignment to adjust x, y 397 # use alignment to adjust x, y
378 398
379 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
380 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
421 441
422 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
423 443
424 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
425 445
426 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($dc::UI::TOOLTIP->{owner} == $self) {
427 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $dc::UI::TOOLTIP->{owner};
428 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 448 $dc::UI::TOOLTIP_WATCHER->invoke;
429 } 449 }
430} 450}
431 451
432# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
433sub coord2local { 453sub coord2local {
434 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
435 455
436 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
437 457
438 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
439} 459}
440 460
441# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
442sub coord2global { 462sub coord2global {
443 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
444 464
445 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
446 466
447 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
448} 468}
449 469
450sub invoke_focus_in { 470sub invoke_focus_in {
499sub connect { 519sub connect {
500 my ($self, $signal, $cb) = @_; 520 my ($self, $signal, $cb) = @_;
501 521
502 push @{ $self->{signal_cb}{$signal} }, $cb; 522 push @{ $self->{signal_cb}{$signal} }, $cb;
503 523
504 defined wantarray and CFPlus::guard { 524 defined wantarray and dc::guard {
505 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
506 @{ $self->{signal_cb}{$signal} }; 526 @{ $self->{signal_cb}{$signal} };
507 } 527 }
508} 528}
509 529
530 ? $args[0]->xy ($self) 550 ? $args[0]->xy ($self)
531 : (); 551 : ();
532 552
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 553 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534 554
535 #d##TODO# stop propagating at first true, do not use sum 555 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 556 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 557 ($self->can ("invoke_$signal") || sub { 1 }), # closure
558 ) {
559 return $cb->($self, @args, @append) || next;
560 }
561
562 # parent
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 563 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 564}
540 565
541sub find_widget { 566#sub find_widget {
542 my ($self, $x, $y) = @_; 567# in .xs
543
544 return () unless $self->{can_events};
545
546 return $self
547 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
548 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
549
550 ()
551}
552 568
553sub set_parent { 569sub set_parent {
554 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
555 571
556 Scalar::Util::weaken ($self->{parent} = $parent); 572 dc::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 573 $self->set_visible if $parent->{visible};
558} 574}
559 575
560sub realloc { 576sub realloc {
561 my ($self) = @_; 577 my ($self) = @_;
587 603
588# using global variables seems a bit hacky, but passing through all drawing 604# using global variables seems a bit hacky, but passing through all drawing
589# functions seems pointless. 605# functions seems pointless.
590our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 606our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
591 607
592sub draw { 608#sub draw {
593 my ($self) = @_; 609#CFPlus.xs
594
595 return unless $self->{h} && $self->{w};
596
597 # update screen rectangle
598 local $draw_x = $draw_x + $self->{x};
599 local $draw_y = $draw_y + $self->{y};
600
601 # skip widgets that are entirely outside the drawing area
602 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
603 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
604
605 glPushMatrix;
606 glTranslate $self->{x}, $self->{y}, 0;
607
608 if ($self == $HOVER && $self->{can_hover}) {
609 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
610 glEnable GL_BLEND;
611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glBegin GL_QUADS;
613 glVertex 0 , 0;
614 glVertex $self->{w}, 0;
615 glVertex $self->{w}, $self->{h};
616 glVertex 0 , $self->{h};
617 glEnd;
618 glDisable GL_BLEND;
619 }
620
621 if ($ENV{CFPLUS_DEBUG} & 1) {
622 glPushMatrix;
623 glColor 1, 1, 0, 1;
624 glTranslate 0.375, 0.375;
625 glBegin GL_LINE_LOOP;
626 glVertex 0 , 0;
627 glVertex $self->{w} - 1, 0;
628 glVertex $self->{w} - 1, $self->{h} - 1;
629 glVertex 0 , $self->{h} - 1;
630 glEnd;
631 glPopMatrix;
632 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
633 }
634
635 $self->_draw;
636 glPopMatrix;
637}
638 610
639sub _draw { 611sub _draw {
640 my ($self) = @_; 612 my ($self) = @_;
641 613
642 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
643} 615}
644 616
645sub DESTROY { 617sub DESTROY {
646 my ($self) = @_; 618 my ($self) = @_;
647 619
648 return if CFPlus::in_destruct; 620 return if dc::in_destruct;
649 621
622 local $@;
650 eval { $self->destroy }; 623 eval { $self->destroy };
651 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
652 625
653 delete $WIDGET{$self+0}; 626 delete $WIDGET{$self+0};
654} 627}
655 628
656############################################################################# 629#############################################################################
657 630
658package CFPlus::UI::DrawBG; 631package dc::UI::DrawBG;
659 632
660our @ISA = CFPlus::UI::Base::; 633our @ISA = dc::UI::Base::;
661 634
662use strict; 635use strict;
663use CFPlus::OpenGL; 636use dc::OpenGL;
664 637
665sub new { 638sub new {
666 my $class = shift; 639 my $class = shift;
667
668 # range [value, low, high, page]
669 640
670 $class->SUPER::new ( 641 $class->SUPER::new (
671 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
672 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
673 @_ 644 @_
685 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
686 657
687 glEnable GL_BLEND; 658 glEnable GL_BLEND;
688 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
689 glColor_premultiply @$color; 660 glColor_premultiply @$color;
690
691 glBegin GL_QUADS;
692 glVertex 0 , 0;
693 glVertex 0 , $h;
694 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
695 glVertex $w, 0;
696 glEnd;
697
698 glDisable GL_BLEND; 662 glDisable GL_BLEND;
699 } 663 }
700} 664}
701 665
702############################################################################# 666#############################################################################
703 667
704package CFPlus::UI::Empty; 668package dc::UI::Empty;
705 669
706our @ISA = CFPlus::UI::Base::; 670our @ISA = dc::UI::Base::;
707 671
708sub new { 672sub new {
709 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
710 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
711} 675}
718 682
719sub draw { } 683sub draw { }
720 684
721############################################################################# 685#############################################################################
722 686
723package CFPlus::UI::Container; 687package dc::UI::Container;
724 688
725our @ISA = CFPlus::UI::Base::; 689our @ISA = dc::UI::Base::;
726 690
727sub new { 691sub new {
728 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
729 693
730 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
734 can_events => 0, 698 can_events => 0,
735 %arg, 699 %arg,
736 ); 700 );
737 701
738 $self->add (@$children) 702 $self->add (@$children)
739 if $children; 703 if $children && @$children;
740 704
741 $self 705 $self
742} 706}
743 707
744sub realloc { 708sub realloc {
753 my ($self, @widgets) = @_; 717 my ($self, @widgets) = @_;
754 718
755 $_->set_parent ($self) 719 $_->set_parent ($self)
756 for @widgets; 720 for @widgets;
757 721
722 # TODO: only do this in widgets that need it, e.g. root, fixed
758 use sort 'stable'; 723 use sort 'stable';
759 724
760 $self->{children} = [ 725 $self->{children} = [
761 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
762 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
763 ]; 728 ];
764 729
765 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
766} 735}
767 736
768sub children { 737sub children {
769 @{ $_[0]{children} } 738 @{ $_[0]{children} }
770} 739}
771 740
772sub remove { 741sub remove {
773 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
774 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
775 delete $child->{parent}; 747 delete $child->{parent};
776 $child->hide; 748 $child->hide;
777
778 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
779 751
780 $self->realloc; 752 $self->realloc;
781} 753}
782 754
783sub clear { 755sub clear {
784 my ($self) = @_; 756 my ($self) = @_;
785 757
786 my $children = delete $self->{children}; 758 my $children = $self->{children};
787 $self->{children} = []; 759 $self->{children} = [];
788 760
789 for (@$children) { 761 for (@$children) {
790 delete $_->{parent}; 762 delete $_->{parent};
791 $_->hide; 763 $_->hide;
811} 783}
812 784
813sub _draw { 785sub _draw {
814 my ($self) = @_; 786 my ($self) = @_;
815 787
816 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
817} 789}
818 790
819############################################################################# 791#############################################################################
820 792
821package CFPlus::UI::Bin; 793package dc::UI::Bin;
822 794
823our @ISA = CFPlus::UI::Container::; 795our @ISA = dc::UI::Container::;
824 796
825sub new { 797sub new {
826 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
827 799
828 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 800 my $child = (delete $arg{child}) || new dc::UI::Empty::;
829 801
830 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
831} 803}
832 804
833sub add { 805sub add {
834 my ($self, $child) = @_; 806 my ($self, $child) = @_;
835 807
836 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
837 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
838} 810}
839 811
840sub remove { 812sub remove {
841 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
842 814
843 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
844 816
845 $self->{children} = [new CFPlus::UI::Empty] 817 $self->{children} = [new dc::UI::Empty]
846 unless @{$self->{children}}; 818 unless @{$self->{children}};
847} 819}
848 820
849sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
850 822
859 831
860 1 832 1
861} 833}
862 834
863############################################################################# 835#############################################################################
864
865# back-buffered drawing area 836# back-buffered drawing area
866 837
867package CFPlus::UI::Window; 838package dc::UI::Window;
868 839
869our @ISA = CFPlus::UI::Bin::; 840our @ISA = dc::UI::Bin::;
870 841
871use CFPlus::OpenGL; 842use dc::OpenGL;
872 843
873sub new { 844sub new {
874 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
875 846
876 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
898} 869}
899 870
900sub render_child { 871sub render_child {
901 my ($self) = @_; 872 my ($self) = @_;
902 873
903 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 874 $self->{texture} = new_from_opengl dc::Texture $self->{w}, $self->{h}, sub {
904 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
905 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
906 877
907 { 878 {
908 package CFPlus::UI::Base; 879 package dc::UI::Base;
909 880
910 local ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
911 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
912 883
913 $self->_render; 884 $self->_render;
930 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
931} 902}
932 903
933############################################################################# 904#############################################################################
934 905
935package CFPlus::UI::ViewPort; 906package dc::UI::ViewPort;
936 907
908use List::Util qw(min max);
909
937our @ISA = CFPlus::UI::Window::; 910our @ISA = dc::UI::Window::;
938 911
939sub new { 912sub new {
940 my $class = shift; 913 my $class = shift;
941 914
942 $class->SUPER::new ( 915 $class->SUPER::new (
949sub size_request { 922sub size_request {
950 my ($self) = @_; 923 my ($self) = @_;
951 924
952 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 925 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
953 926
954 $w = 10 if $self->{scroll_x}; 927 $w = 1 if $self->{scroll_x};
955 $h = 10 if $self->{scroll_y}; 928 $h = 1 if $self->{scroll_y};
956 929
957 ($w, $h) 930 ($w, $h)
958} 931}
959 932
960sub invoke_size_allocate { 933sub invoke_size_allocate {
972} 945}
973 946
974sub set_offset { 947sub set_offset {
975 my ($self, $x, $y) = @_; 948 my ($self, $x, $y) = @_;
976 949
950 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
951 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
952
953 if ($x != $self->{view_x} or $y != $self->{view_y}) {
977 $self->{view_x} = int $x; 954 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 955 $self->{view_y} = $y;
979 956
957 $self->emit (changed => $x, $y);
980 $self->update; 958 $self->update;
959 }
960}
961
962sub set_center {
963 my ($self, $x, $y) = @_;
964
965 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
966}
967
968sub make_visible {
969 my ($self, $x, $y, $border) = @_;
970
971 if ( $x < $self->{view_x} + $self->{w} * $border
972 || $x > $self->{view_x} + $self->{w} * (1 - $border)
973 || $y < $self->{view_y} + $self->{h} * $border
974 || $y > $self->{view_y} + $self->{h} * (1 - $border)
975 ) {
976 $self->set_center ($x, $y);
977 }
981} 978}
982 979
983# hmm, this does not work for topleft of $self... but we should not ask for that 980# hmm, this does not work for topleft of $self... but we should not ask for that
984sub coord2local { 981sub coord2local {
985 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
1000 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
1001 998
1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004 ) { 1001 ) {
1005 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1002 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1006 } else { 1003 } else {
1007 $self->CFPlus::UI::Base::find_widget ($x, $y) 1004 $self->dc::UI::Base::find_widget ($x, $y)
1008 } 1005 }
1009} 1006}
1010 1007
1011sub _render { 1008sub _render {
1012 my ($self) = @_; 1009 my ($self) = @_;
1013 1010
1014 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1011 local $dc::UI::Base::draw_x = $dc::UI::Base::draw_x - $self->{view_x};
1015 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1012 local $dc::UI::Base::draw_y = $dc::UI::Base::draw_y - $self->{view_y};
1016 1013
1017 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1018 1015
1019 $self->SUPER::_render; 1016 $self->SUPER::_render;
1020} 1017}
1021 1018
1022############################################################################# 1019#############################################################################
1023 1020
1024package CFPlus::UI::ScrolledWindow; 1021package dc::UI::ScrolledWindow;
1025 1022
1026our @ISA = CFPlus::UI::HBox::; 1023our @ISA = dc::UI::Table::;
1027 1024
1028sub new { 1025sub new {
1029 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1030 1027
1031 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1032 1029
1033 my $self; 1030 my $self;
1034 1031
1035 my $slider = new CFPlus::UI::Slider 1032 my $hslider = new dc::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1035 vertical => 0,
1036 range => [0, 0, 1, 0.01], # HACK fix
1037 on_changed => sub {
1038 $self->{hpos} = $_[1];
1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 },
1041 ;
1042
1043 my $vslider = new dc::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
1036 vertical => 1, 1046 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1048 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1049 $self->{vpos} = $_[1];
1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1051 },
1041 ; 1052 ;
1042 1053
1043 $self = $class->SUPER::new ( 1054 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1055 scroll_x => 0,
1056 scroll_y => 1,
1045 can_events => 1, 1057 can_events => 1,
1046 slider => $slider, 1058 hslider => $hslider,
1059 vslider => $vslider,
1060 col_expand => [1, 0],
1061 row_expand => [1, 0],
1047 %arg, 1062 %arg,
1048 ); 1063 );
1049 1064
1065 $self->{vp} = new dc::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1068 expand => 1,
1069 scroll_x => $self->{scroll_x},
1070 scroll_y => $self->{scroll_y},
1071 on_changed => sub {
1072 my ($vp, $x, $y) = @_;
1073
1074 $vp->{parent}{hslider}->set_value ($x);
1075 $vp->{parent}{vslider}->set_value ($y);
1076
1077 0
1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1084 ;
1085
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1086 $self->SUPER::add ($self->{vp});
1087
1051 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
1052 1089
1053 $self 1090 $self
1054} 1091}
1055
1056#TODO# update range on size_allocate depending on child
1057 1092
1058sub add { 1093sub add {
1059 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1060 1095
1061 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1062} 1097}
1063 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1103sub update_slider {
1104 my ($self) = @_;
1105
1106 my $child = ($self->{vp} or return)->child;
1107
1108 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1115 $visible ? $self->SUPER::add ($self->{hslider})
1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1118 }
1119
1120 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->SUPER::remove ($self->{vslider});
1129 }
1130 }
1131}
1132
1133sub start_dragging {
1134 my ($self, $ev) = @_;
1135
1136 $self->grab_focus;
1137
1138 my $ox = $self->{vp}{view_x};
1139 my $oy = $self->{vp}{view_y};
1140
1141 $self->{motion} = sub {
1142 my ($ev, $x, $y) = @_;
1143
1144 $ox -= $ev->{xrel};
1145 $oy -= $ev->{yrel};
1146
1147 $self->{vp}->set_offset ($ox, $oy);
1148 };
1149}
1150
1064sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1066 1153
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->emit (mouse_wheel => $ev); 1154 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1155 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1070 1156
1071 1 1157 1
1072} 1158}
1073 1159
1074sub update_slider { 1160sub invoke_button_down {
1075 my ($self) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1076 1162
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1163 if ($ev->{button} == 2) {
1078} 1164 $self->start_dragging ($ev);
1165 return 1;
1166 }
1079 1167
1080sub update { 1168 0
1081 my ($self) = @_; 1169}
1082 1170
1083 $self->SUPER::update; 1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1084 1173
1085 $self->update_slider; 1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1086} 1190}
1087 1191
1088sub invoke_size_allocate { 1192sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1090 1194
1091 $self->update_slider; 1195 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1197}
1095 1198
1096############################################################################# 1199#############################################################################
1097 1200
1098package CFPlus::UI::Frame; 1201package dc::UI::Frame;
1099 1202
1100our @ISA = CFPlus::UI::Bin::; 1203our @ISA = dc::UI::Bin::;
1101 1204
1102use CFPlus::OpenGL; 1205use dc::OpenGL;
1103 1206
1104sub new { 1207sub new {
1105 my $class = shift; 1208 my $class = shift;
1106 1209
1107 $class->SUPER::new ( 1210 $class->SUPER::new (
1117 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1118 1221
1119 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1120 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1121 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1122
1123 glBegin GL_QUADS;
1124 glVertex 0 , 0;
1125 glVertex 0 , $h;
1126 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1127 glVertex $w, 0;
1128 glEnd;
1129
1130 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1131 } 1227 }
1132 1228
1133 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1134} 1230}
1135 1231
1136############################################################################# 1232#############################################################################
1137 1233
1138package CFPlus::UI::FancyFrame; 1234package dc::UI::FancyFrame;
1139 1235
1140our @ISA = CFPlus::UI::Bin::; 1236our @ISA = dc::UI::Bin::;
1141 1237
1142use CFPlus::OpenGL; 1238use dc::OpenGL;
1143 1239
1144sub new { 1240sub new {
1145 my ($class, %arg) = @_; 1241 my ($class, %arg) = @_;
1146 1242
1147 if ((exists $arg{label}) && !ref $arg{label}) { 1243 if ((exists $arg{label}) && !ref $arg{label}) {
1148 $arg{label} = new CFPlus::UI::Label 1244 $arg{label} = new dc::UI::Label
1149 align => 1, 1245 align => 1,
1150 valign => 0, 1246 valign => 0,
1151 text => $arg{label}, 1247 text => $arg{label},
1152 fontsize => ($arg{border} || 0.8) * 0.75; 1248 fontsize => ($arg{border} || 0.8) * 0.75;
1153 } 1249 }
1165 1261
1166sub add { 1262sub add {
1167 my ($self, @widgets) = @_; 1263 my ($self, @widgets) = @_;
1168 1264
1169 $self->SUPER::add (@widgets); 1265 $self->SUPER::add (@widgets);
1170 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1266 $self->dc::UI::Container::add ($self->{label}) if $self->{label};
1171} 1267}
1172 1268
1173sub border { 1269sub border {
1174 int $_[0]{border} * $::FONTSIZE 1270 int $_[0]{border} * $::FONTSIZE
1175} 1271}
1233 } 1329 }
1234} 1330}
1235 1331
1236############################################################################# 1332#############################################################################
1237 1333
1238package CFPlus::UI::Toplevel; 1334package dc::UI::Toplevel;
1239 1335
1240our @ISA = CFPlus::UI::Bin::; 1336our @ISA = dc::UI::Bin::;
1241 1337
1242use CFPlus::OpenGL; 1338use dc::OpenGL;
1243 1339
1244my $bg = 1340my $bg =
1245 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1341 new_from_file dc::Texture dc::find_rcfile "d1_bg.png",
1246 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1247 1343
1248my @border = 1344my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1250 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1346 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1347
1348my @icon =
1349 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1350 qw(x1_move.png x1_resize.png);
1251 1351
1252sub new { 1352sub new {
1253 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1254 1354
1255 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
1260 min_w => 64, 1360 min_w => 64,
1261 min_h => 32, 1361 min_h => 32,
1262 %arg, 1362 %arg,
1263 ); 1363 );
1264 1364
1265 $self->{title_widget} = new CFPlus::UI::Label 1365 $self->{title_widget} = new dc::UI::Label
1266 align => 0, 1366 align => 0,
1267 valign => 1, 1367 valign => 1,
1268 text => $self->{title}, 1368 text => $self->{title},
1269 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1270 if exists $self->{title}; 1370 if exists $self->{title};
1271 1371
1272 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1273 $self->{close_button} = 1373 $self->{close_button} =
1274 new CFPlus::UI::ImageButton 1374 new dc::UI::ImageButton
1275 path => 'x1_close.png', 1375 path => 'x1_close.png',
1276 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1277 1377
1278 $self->CFPlus::UI::Container::add ($self->{close_button}); 1378 $self->dc::UI::Container::add ($self->{close_button});
1279 } 1379 }
1280 1380
1281 $self 1381 $self
1282} 1382}
1283 1383
1284sub add { 1384sub add {
1285 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1286 1386
1287 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1288 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1388 $self->dc::UI::Container::add ($self->{close_button}) if $self->{close_button};
1289 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1389 $self->dc::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1290} 1390}
1291 1391
1292sub border { 1392sub border {
1293 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1394}
1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1294} 1403}
1295 1404
1296sub size_request { 1405sub size_request {
1297 my ($self) = @_; 1406 my ($self) = @_;
1298 1407
1424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425 1534
1426 my $border = $self->border; 1535 my $border = $self->border;
1427 1536
1428 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1429 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1433 1556
1434 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1436 1559
1437 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
1456 if $self->{close_button}; 1579 if $self->{close_button};
1457} 1580}
1458 1581
1459############################################################################# 1582#############################################################################
1460 1583
1461package CFPlus::UI::Table; 1584package dc::UI::Table;
1462 1585
1463our @ISA = CFPlus::UI::Base::; 1586our @ISA = dc::UI::Container::;
1464 1587
1465use List::Util qw(max sum); 1588use List::Util qw(max sum);
1466 1589
1467use CFPlus::OpenGL; 1590use dc::OpenGL;
1468 1591
1469sub new { 1592sub new {
1470 my $class = shift; 1593 my $class = shift;
1471 1594
1472 $class->SUPER::new ( 1595 $class->SUPER::new (
1473 col_expand => [], 1596 col_expand => [],
1597 row_expand => [],
1474 @_, 1598 @_,
1475 ) 1599 )
1476} 1600}
1477 1601
1478sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480}
1481
1482sub add { 1602sub add {
1603 my ($self, @widgets) = @_;
1604
1605 for my $child (@widgets) {
1606 $child->{c_rowspan} ||= 1;
1607 $child->{c_colspan} ||= 1;
1608 }
1609
1610 $self->SUPER::add (@widgets);
1611}
1612
1613sub add_at {
1483 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1484 1617
1485 while (@_) { 1618 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child;
1489 }
1490 1620
1491 $self->{force_realloc} = 1; 1621 $child->{c_row} = $row;
1492 $self->{force_size_alloc} = 1; 1622 $child->{c_col} = $col;
1493 $self->realloc;
1494}
1495 1623
1496sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1497 my ($self, $child) = @_; 1631 my ($self) = @_;
1498 1632
1499 # TODO: not yet implemented 1633 my (@w, @h);
1500}
1501
1502# TODO: move to container class maybe? send children a signal on removal?
1503sub clear {
1504 my ($self) = @_;
1505 1634
1506 my @children = $self->children; 1635 my @children = $self->children;
1507 delete $self->{children}; 1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 }
1508 1646 }
1509 for (@children) {
1510 delete $_->{parent};
1511 $_->hide;
1512 }
1513 1647
1514 $self->realloc; 1648 # second pass, rows
1515} 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1516
1517sub get_wh {
1518 my ($self) = @_;
1519
1520 my (@w, @h);
1521
1522 for my $y (0 .. $#{$self->{children}}) {
1523 my $row = $self->{children}[$y]
1524 or next;
1525
1526 for my $x (0 .. $#$row) {
1527 my $widget = $row->[$x]
1528 or next;
1529 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1530 1651
1531 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1532 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1533 } 1656 }
1534 } 1657 }
1535 1658
1536 (\@w, \@h) 1659 (\@w, \@h)
1537} 1660}
1553 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1554 1677
1555 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1557 1680
1558 # TODO: nicer code && do row_expand 1681 # now linearly scale the rows/columns to the allocated size
1559 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1562 1685
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1687
1567 CFPlus::UI::harmonize $ws; 1688 dc::UI::harmonize $ws;
1689
1690 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1;
1693
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695
1568 CFPlus::UI::harmonize $hs; 1696 dc::UI::harmonize $hs;
1569 1697
1570 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1571 1700
1572 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1573 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1574 or next;
1575 1703
1576 my $x = 0; 1704 $widget->configure (
1577 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1578 1707 );
1579 for my $c (0 .. $#$row) { 1708 }
1580 my $col_w = $ws->[$c];
1581 1709
1582 if (my $widget = $row->[$c]) { 1710 1
1583 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1584 }
1585 1712
1586 $x += $col_w; 1713#############################################################################
1714
1715package dc::UI::Fixed;
1716
1717use List::Util qw(min max);
1718
1719our @ISA = dc::UI::Container::;
1720
1721sub _scale($$$) {
1722 my ($rel, $val, $max) = @_;
1723
1724 $rel ? $val * $max : $val
1725}
1726
1727sub size_request {
1728 my ($self) = @_;
1729
1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1731
1732 # determine overall size by querying abs widgets
1733 for my $child ($self->visible_children) {
1734 unless ($child->{c_rel}) {
1735 my $x = $child->{c_x};
1736 my $y = $child->{c_y};
1737
1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1587 } 1740 }
1741 }
1588 1742
1589 $y += $row_h; 1743 my $W = $x2 - $x1;
1744 my $H = $y2 - $y1;
1745
1746 # now layout remaining widgets
1747 for my $child ($self->visible_children) {
1748 if ($child->{c_rel}) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1754 }
1755 }
1756
1757 my $W = $x2 - $x1;
1758 my $H = $y2 - $y1;
1759
1760 ($W, $H)
1761}
1762
1763sub invoke_size_allocate {
1764 my ($self, $W, $H) = @_;
1765
1766 for my $child ($self->visible_children) {
1767 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1768 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1769
1770 $x += $child->{c_halign} * $child->{req_w};
1771 $y += $child->{c_valign} * $child->{req_h};
1772
1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1590 } 1774 }
1591 1775
1592 1 1776 1
1593} 1777}
1594 1778
1595sub find_widget {
1596 my ($self, $x, $y) = @_;
1597
1598 $x -= $self->{x};
1599 $y -= $self->{y};
1600
1601 my $res;
1602
1603 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1604 $res = $_->find_widget ($x, $y)
1605 and return $res;
1606 }
1607
1608 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1609}
1610
1611sub _draw {
1612 my ($self) = @_;
1613
1614 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_;
1616 }
1617}
1618
1619############################################################################# 1779#############################################################################
1620 1780
1621package CFPlus::UI::Box; 1781package dc::UI::Box;
1622 1782
1623our @ISA = CFPlus::UI::Container::; 1783our @ISA = dc::UI::Container::;
1624 1784
1625sub size_request { 1785sub size_request {
1626 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1627 1789
1628 $self->{vertical} 1790 $self->{vertical}
1629 ? ( 1791 ? (
1630 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1631 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1632 ) 1794 )
1633 : ( 1795 : (
1634 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1635 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1636 ) 1798 )
1637} 1799}
1638 1800
1639sub invoke_size_allocate { 1801sub invoke_size_allocate {
1640 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
1661 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1662 for 0 .. $#children; 1824 for 0 .. $#children;
1663 } 1825 }
1664 } 1826 }
1665 1827
1666 CFPlus::UI::harmonize \@req; 1828 dc::UI::harmonize \@req;
1667 1829
1668 my $pos = 0; 1830 my $pos = 0;
1669 for (0 .. $#children) { 1831 for (0 .. $#children) {
1670 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1671 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1833 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1676 1 1838 1
1677} 1839}
1678 1840
1679############################################################################# 1841#############################################################################
1680 1842
1681package CFPlus::UI::HBox; 1843package dc::UI::HBox;
1682 1844
1683our @ISA = CFPlus::UI::Box::; 1845our @ISA = dc::UI::Box::;
1684 1846
1685sub new { 1847sub new {
1686 my $class = shift; 1848 my $class = shift;
1687 1849
1688 $class->SUPER::new ( 1850 $class->SUPER::new (
1691 ) 1853 )
1692} 1854}
1693 1855
1694############################################################################# 1856#############################################################################
1695 1857
1696package CFPlus::UI::VBox; 1858package dc::UI::VBox;
1697 1859
1698our @ISA = CFPlus::UI::Box::; 1860our @ISA = dc::UI::Box::;
1699 1861
1700sub new { 1862sub new {
1701 my $class = shift; 1863 my $class = shift;
1702 1864
1703 $class->SUPER::new ( 1865 $class->SUPER::new (
1706 ) 1868 )
1707} 1869}
1708 1870
1709############################################################################# 1871#############################################################################
1710 1872
1711package CFPlus::UI::Label; 1873package dc::UI::Label;
1712 1874
1713our @ISA = CFPlus::UI::DrawBG::; 1875our @ISA = dc::UI::DrawBG::;
1714 1876
1715use CFPlus::OpenGL; 1877use dc::OpenGL;
1716 1878
1717sub new { 1879sub new {
1718 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1719 1881
1720 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
1725 #text => initial text 1887 #text => initial text
1726 #markup => initial narkup 1888 #markup => initial narkup
1727 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1728 #style => 0, # render flags 1890 #style => 0, # render flags
1729 ellipsise => 3, # end 1891 ellipsise => 3, # end
1730 layout => (new CFPlus::Layout), 1892 layout => (new dc::Layout),
1731 fontsize => 1, 1893 fontsize => 1,
1732 align => -1, 1894 align => -1,
1733 valign => -1, 1895 valign => -1,
1734 padding_x => 2, 1896 padding_x => 2,
1735 padding_y => 2, 1897 padding_y => 2,
1736 can_events => 0, 1898 can_events => 0,
1737 %arg 1899 %arg
1738 ); 1900 );
1739 1901
1740 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1741 my $layout = new CFPlus::Layout; 1903 my $layout = new dc::Layout;
1742 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1743 $self->{template} = $layout; 1905 $self->{template} = $layout;
1744 } 1906 }
1745 1907
1746 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
1764 1926
1765 delete $self->{ox}; 1927 delete $self->{ox};
1766 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1767} 1929}
1768 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1769sub set_text { 1937sub set_text {
1770 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1771 1939
1772 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1773 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
1796 1964
1797sub size_request { 1965sub size_request {
1798 my ($self) = @_; 1966 my ($self) = @_;
1799 1967
1800 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1801 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1802 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1803 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1804 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1805 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1806 1976
1807 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
1879 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
1880 2050
1881 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1882 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1883 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1884 }; 2056 };
1885 2057
1886 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
1887 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = dc::OpenGL::glGenList;
1888 2060# dc::OpenGL::glNewList $self->{list};
1889 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2062# dc::OpenGL::glEndList;
2063# }
2064#
2065# dc::OpenGL::glCallList $self->{list};
2066
2067 $self->{layout}->draw;
1890} 2068}
2069
2070#sub destroy {
2071# my ($self) = @_;
2072#
2073# dc::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074#
2075# $self->SUPER::destroy;
2076#}
1891 2077
1892############################################################################# 2078#############################################################################
1893 2079
1894package CFPlus::UI::EntryBase; 2080package dc::UI::EntryBase;
1895 2081
1896our @ISA = CFPlus::UI::Label::; 2082our @ISA = dc::UI::Label::;
1897 2083
1898use CFPlus::OpenGL; 2084use dc::OpenGL;
1899 2085
1900sub new { 2086sub new {
1901 my $class = shift; 2087 my $class = shift;
1902 2088
1903 $class->SUPER::new ( 2089 $class->SUPER::new (
1904 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
1905 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
1906 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
1907 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
1908 can_hover => 1, 2096 can_hover => 1,
1909 can_focus => 1, 2097 can_focus => 1,
1910 valign => 0, 2098 valign => 0,
1911 can_events => 1, 2099 can_events => 1,
1912 ellipsise => 0, 2100 ellipsise => 0,
1962 my $sym = $ev->{sym}; 2150 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2151 my $uni = $ev->{unicode};
1964 2152
1965 my $text = $self->get_text; 2153 my $text = $self->get_text;
1966 2154
2155 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2156
1967 if ($uni == 8) { 2157 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2158 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2159 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2160 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2161 } elsif ($sym == dc::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2162 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2163 } elsif ($sym == dc::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2164 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2165 } elsif ($sym == dc::SDLK_HOME) {
2166 # what a hack
1976 $self->{cursor} = 0; 2167 $self->{cursor} =
2168 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2169 ? length $1
2170 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2171 } elsif ($sym == dc::SDLK_END) {
2172 # uh, again
2173 $self->{cursor} =
2174 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2175 ? $self->{cursor} + length $1
2176 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2177 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2178 $text = "";
1981 $self->{cursor} = 0; 2179 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2180 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2181 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2182 } elsif ($uni == 0x0d) {
2183 substr $text, $self->{cursor}++, 0, "\012";
2184 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2185 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2186 } else {
1987 return 0; 2187 return 0;
1988 } 2188 }
1989 2189
2040 glColor_premultiply @{$self->{bg}}; 2240 glColor_premultiply @{$self->{bg}};
2041 } 2241 }
2042 2242
2043 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2044 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2045 glBegin GL_QUADS;
2046 glVertex 0 , 0;
2047 glVertex 0 , $self->{h};
2048 glVertex $self->{w}, $self->{h}; 2245 glRect 0, 0, $self->{w}, $self->{h};
2049 glVertex $self->{w}, 0;
2050 glEnd;
2051 glDisable GL_BLEND; 2246 glDisable GL_BLEND;
2052 2247
2053 $self->SUPER::_draw; 2248 $self->SUPER::_draw;
2054 2249
2055 #TODO: force update every cursor change :( 2250 #TODO: force update every cursor change :(
2057 2252
2058 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2059 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2060 utf8::encode $text; 2255 utf8::encode $text;
2061 2256
2062 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2063 } 2258 }
2064 2259
2260 glColor_premultiply @{$self->{active_fg}};
2065 glBegin GL_LINES; 2261 glBegin GL_LINES;
2066 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2067 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2068 glEnd; 2264 glEnd;
2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2269 glLineWidth 1;
2270
2271 } else {
2272 glColor @{$self->{outline}};
2273 glBegin GL_LINE_STRIP;
2274 glVertex .5, $self->{h} * .5;
2275 glVertex .5, $self->{h} - 2.5;
2276 glVertex $self->{w} - .5, $self->{h} - 2.5;
2277 glVertex $self->{w} - .5, $self->{h} * .5;
2278 glEnd;
2069 } 2279 }
2070} 2280}
2071 2281
2072############################################################################# 2282#############################################################################
2073 2283
2074package CFPlus::UI::Entry; 2284package dc::UI::Entry;
2075 2285
2076our @ISA = CFPlus::UI::EntryBase::; 2286our @ISA = dc::UI::EntryBase::;
2077 2287
2078use CFPlus::OpenGL; 2288use dc::OpenGL;
2079 2289
2080sub invoke_key_down { 2290sub invoke_key_down {
2081 my ($self, $ev) = @_; 2291 my ($self, $ev) = @_;
2082 2292
2083 my $sym = $ev->{sym}; 2293 my $sym = $ev->{sym};
2089 $self->{history_pointer} = -1; 2299 $self->{history_pointer} = -1;
2090 $self->{history_saveback} = ''; 2300 $self->{history_saveback} = '';
2091 $self->emit (activate => $txt); 2301 $self->emit (activate => $txt);
2092 $self->update; 2302 $self->update;
2093 2303
2094 } elsif ($sym == CFPlus::SDLK_UP) { 2304 } elsif ($sym == dc::SDLK_UP) {
2095 if ($self->{history_pointer} < 0) { 2305 if ($self->{history_pointer} < 0) {
2096 $self->{history_saveback} = $self->get_text; 2306 $self->{history_saveback} = $self->get_text;
2097 } 2307 }
2098 if (@{$self->{history} || []} > 0) { 2308 if (@{$self->{history} || []} > 0) {
2099 $self->{history_pointer}++; 2309 $self->{history_pointer}++;
2101 $self->{history_pointer} = @{$self->{history} || []} - 1; 2311 $self->{history_pointer} = @{$self->{history} || []} - 1;
2102 } 2312 }
2103 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2104 } 2314 }
2105 2315
2106 } elsif ($sym == CFPlus::SDLK_DOWN) { 2316 } elsif ($sym == dc::SDLK_DOWN) {
2107 $self->{history_pointer}--; 2317 $self->{history_pointer}--;
2108 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2318 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2109 2319
2110 if ($self->{history_pointer} >= 0) { 2320 if ($self->{history_pointer} >= 0) {
2111 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2321 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2120 1 2330 1
2121} 2331}
2122 2332
2123############################################################################# 2333#############################################################################
2124 2334
2125package CFPlus::UI::TextEdit; 2335package dc::UI::TextEdit;
2126 2336
2127our @ISA = CFPlus::UI::EntryBase::; 2337our @ISA = dc::UI::EntryBase::;
2128 2338
2129use CFPlus::OpenGL; 2339use dc::OpenGL;
2130 2340
2131sub move_cursor_ver { 2341sub move_cursor_ver {
2132 my ($self, $dy) = @_; 2342 my ($self, $dy) = @_;
2133 2343
2134 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2344 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2146sub invoke_key_down { 2356sub invoke_key_down {
2147 my ($self, $ev) = @_; 2357 my ($self, $ev) = @_;
2148 2358
2149 my $sym = $ev->{sym}; 2359 my $sym = $ev->{sym};
2150 2360
2151 if ($sym == CFPlus::SDLK_UP) { 2361 if ($sym == dc::SDLK_UP) {
2152 $self->move_cursor_ver (-1); 2362 $self->move_cursor_ver (-1);
2153 } elsif ($sym == CFPlus::SDLK_DOWN) { 2363 } elsif ($sym == dc::SDLK_DOWN) {
2154 $self->move_cursor_ver (+1); 2364 $self->move_cursor_ver (+1);
2155 } else { 2365 } else {
2156 return $self->SUPER::invoke_key_down ($ev) 2366 return $self->SUPER::invoke_key_down ($ev)
2157 } 2367 }
2158 2368
2159 1 2369 1
2160} 2370}
2161 2371
2162############################################################################# 2372#############################################################################
2163 2373
2164package CFPlus::UI::Button; 2374package dc::UI::ButtonBin;
2165 2375
2166our @ISA = CFPlus::UI::Label::; 2376our @ISA = dc::UI::Bin::;
2167 2377
2168use CFPlus::OpenGL; 2378use dc::OpenGL;
2169 2379
2170my @tex = 2380my @tex =
2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2381 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2172 qw(b1_button_active.png); 2382 qw(b1_button_inactive.png b1_button_active.png);
2173 2383
2174sub new { 2384sub new {
2175 my $class = shift; 2385 my $class = shift;
2176 2386
2177 $class->SUPER::new ( 2387 $class->SUPER::new (
2178 padding_x => 4,
2179 padding_y => 4,
2180 fg => [1, 1, 1],
2181 active_fg => [0, 0, 1],
2182 can_hover => 1, 2388 can_hover => 1,
2183 align => 0, 2389 align => 0,
2184 valign => 0, 2390 valign => 0,
2185 can_events => 1, 2391 can_events => 1,
2186 @_ 2392 @_
2198} 2404}
2199 2405
2200sub _draw { 2406sub _draw {
2201 my ($self) = @_; 2407 my ($self) = @_;
2202 2408
2203 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2204
2205 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 glColor 0, 0, 0, 1; 2411 glColor 0, 0, 0, 1;
2208 2412
2413 my $tex = $tex[$GRAB == $self];
2209 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2414 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210 2415
2211 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
2212 2417
2213 $self->SUPER::_draw; 2418 $self->SUPER::_draw;
2214} 2419}
2215 2420
2216############################################################################# 2421#############################################################################
2217 2422
2218package CFPlus::UI::CheckBox; 2423package dc::UI::Button;
2219 2424
2220our @ISA = CFPlus::UI::DrawBG::; 2425our @ISA = dc::UI::Label::;
2426
2427use dc::OpenGL;
2221 2428
2222my @tex = 2429my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2430 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2431 qw(b1_button_inactive.png b1_button_active.png);
2432
2433sub new {
2434 my $class = shift;
2435
2436 $class->SUPER::new (
2437 padding_x => 4,
2438 padding_y => 4,
2439 fg => [1.0, 1.0, 1.0],
2440 active_fg => [0.8, 0.8, 0.8],
2441 can_hover => 1,
2442 align => 0,
2443 valign => 0,
2444 can_events => 1,
2445 @_
2446 )
2447}
2448
2449sub invoke_button_up {
2450 my ($self, $ev, $x, $y) = @_;
2451
2452 $self->emit ("activate")
2453 if $x >= 0 && $x < $self->{w}
2454 && $y >= 0 && $y < $self->{h};
2455
2456 1
2457}
2458
2459sub _draw {
2460 my ($self) = @_;
2461
2462 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2463
2464 glEnable GL_TEXTURE_2D;
2465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2466 glColor 0, 0, 0, 1;
2467
2468 my $tex = $tex[$GRAB == $self];
2469 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470
2471 glDisable GL_TEXTURE_2D;
2472
2473 $self->SUPER::_draw;
2474}
2475
2476#############################################################################
2477
2478package dc::UI::CheckBox;
2479
2480our @ISA = dc::UI::DrawBG::;
2481
2482my @tex =
2483 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2224 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2484 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2225 2485
2226use CFPlus::OpenGL; 2486use dc::OpenGL;
2227 2487
2228sub new { 2488sub new {
2229 my $class = shift; 2489 my $class = shift;
2230 2490
2231 $class->SUPER::new ( 2491 $class->SUPER::new (
2271sub _draw { 2531sub _draw {
2272 my ($self) = @_; 2532 my ($self) = @_;
2273 2533
2274 $self->SUPER::_draw; 2534 $self->SUPER::_draw;
2275 2535
2276 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2277 2537
2278 my ($w, $h) = @$self{qw(w h)}; 2538 my ($w, $h) = @$self{qw(w h)};
2279 2539
2280 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2540 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2281 2541
2288 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2289} 2549}
2290 2550
2291############################################################################# 2551#############################################################################
2292 2552
2293package CFPlus::UI::Image; 2553package dc::UI::Image;
2294 2554
2295our @ISA = CFPlus::UI::Base::; 2555our @ISA = dc::UI::Base::;
2296 2556
2297use CFPlus::OpenGL; 2557use dc::OpenGL;
2298 2558
2299our %texture_cache; 2559our %texture_cache;
2300 2560
2301sub new { 2561sub new {
2302 my $class = shift; 2562 my $class = shift;
2303 2563
2304 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2305 can_events => 0, 2565 can_events => 0,
2566 scale => 1,
2306 @_, 2567 @_,
2307 ); 2568 );
2308 2569
2309 $self->{path} || $self->{tex} 2570 $self->{path} || $self->{tex}
2310 or Carp::croak "'path' or 'tex' attributes required"; 2571 or Carp::croak "'path' or 'tex' attributes required";
2311 2572
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2573 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2574 new_from_file dc::Texture dc::find_rcfile $self->{path}, mipmap => 1;
2314 2575
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2576 dc::weaken $texture_cache{$self->{path}};
2316 2577
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2578 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2579
2319 $self 2580 $self
2320} 2581}
2321 2582
2322sub STORABLE_freeze { 2583sub STORABLE_freeze {
2323 my ($self, $cloning) = @_; 2584 my ($self, $cloning) = @_;
2324 2585
2325 $self->{path} 2586 $self->{path}
2326 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2587 or die "cannot serialise dc::UI::Image on non-loadable images\n";
2327 2588
2328 $self->{path} 2589 $self->{path}
2329} 2590}
2330 2591
2331sub STORABLE_attach { 2592sub STORABLE_attach {
2335} 2596}
2336 2597
2337sub size_request { 2598sub size_request {
2338 my ($self) = @_; 2599 my ($self) = @_;
2339 2600
2340 ($self->{tex}{w}, $self->{tex}{h}) 2601 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2341} 2602}
2342 2603
2343sub _draw { 2604sub _draw {
2344 my ($self) = @_; 2605 my ($self) = @_;
2345 2606
2355 } 2616 }
2356 2617
2357 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2358 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2359 2620
2360 $tex->draw_quad (0, 0, $w, $h); 2621 $tex->draw_quad_alpha (0, 0, $w, $h);
2361 2622
2362 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2363} 2624}
2364 2625
2365############################################################################# 2626#############################################################################
2366 2627
2367package CFPlus::UI::ImageButton; 2628package dc::UI::ImageButton;
2368 2629
2369our @ISA = CFPlus::UI::Image::; 2630our @ISA = dc::UI::Image::;
2370 2631
2371use CFPlus::OpenGL; 2632use dc::OpenGL;
2372 2633
2373my %textures; 2634my %textures;
2374 2635
2375sub new { 2636sub new {
2376 my $class = shift; 2637 my $class = shift;
2386 can_events => 1, 2647 can_events => 1,
2387 @_ 2648 @_
2388 ); 2649 );
2389} 2650}
2390 2651
2652sub invoke_button_down {
2653 my ($self, $ev, $x, $y) = @_;
2654
2655 1
2656}
2657
2391sub invoke_button_up { 2658sub invoke_button_up {
2392 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2393 2660
2394 $self->emit ("activate") 2661 $self->emit ("activate")
2395 if $x >= 0 && $x < $self->{w} 2662 if $x >= 0 && $x < $self->{w}
2398 1 2665 1
2399} 2666}
2400 2667
2401############################################################################# 2668#############################################################################
2402 2669
2403package CFPlus::UI::VGauge; 2670package dc::UI::VGauge;
2404 2671
2405our @ISA = CFPlus::UI::Base::; 2672our @ISA = dc::UI::Base::;
2406 2673
2407use List::Util qw(min max); 2674use List::Util qw(min max);
2408 2675
2409use CFPlus::OpenGL; 2676use dc::OpenGL;
2410 2677
2411my %tex = ( 2678my %tex = (
2412 food => [ 2679 food => [
2413 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2414 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2415 ], 2682 ],
2416 grace => [ 2683 grace => [
2417 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2418 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2685 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2419 ], 2686 ],
2420 hp => [ 2687 hp => [
2421 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2422 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2423 ], 2690 ],
2424 mana => [ 2691 mana => [
2425 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2426 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2693 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2427 ], 2694 ],
2428); 2695);
2429 2696
2430# eg. VGauge->new (gauge => 'food'), default gauge: food 2697# eg. VGauge->new (gauge => 'food'), default gauge: food
2533 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2534} 2801}
2535 2802
2536############################################################################# 2803#############################################################################
2537 2804
2805package dc::UI::Progress;
2806
2807our @ISA = dc::UI::Label::;
2808
2809use dc::OpenGL;
2810
2811sub new {
2812 my ($class, %arg) = @_;
2813
2814 my $self = $class->SUPER::new (
2815 fg => [1, 1, 1],
2816 bg => [0, 0, 1, 0.2],
2817 bar => [0.7, 0.5, 0.1, 0.8],
2818 outline => [0.4, 0.3, 0],
2819 fontsize => 0.9,
2820 valign => 0,
2821 align => 0,
2822 can_events => 1,
2823 ellipsise => 1,
2824 label => "%d%%",
2825 %arg,
2826 );
2827
2828 $self->set_value ($arg{value} || -1);
2829
2830 $self
2831}
2832
2833sub set_label {
2834 my ($self, $label) = @_;
2835
2836 return if $self->{label} eq $label;
2837 $self->{label} = $label;
2838
2839 $self->dc::UI::Progress::set_value (0 + delete $self->{value});
2840}
2841
2842sub set_value {
2843 my ($self, $value) = @_;
2844
2845 if ($self->{value} ne $value) {
2846 $self->{value} = $value;
2847
2848 if ($value < 0) {
2849 $self->set_text ("-");
2850 } else {
2851 $self->set_text (sprintf $self->{label}, $value * 100);
2852 }
2853
2854 $self->update;
2855 }
2856}
2857
2858sub _draw {
2859 my ($self) = @_;
2860
2861 glEnable GL_BLEND;
2862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2863
2864 if ($self->{value} >= 0) {
2865 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2866
2867 glColor_premultiply @{$self->{bar}};
2868 glRect 2, 2, $s, $self->{h} - 2;
2869 glColor_premultiply @{$self->{bg}};
2870 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2871 }
2872
2873 glColor_premultiply @{$self->{outline}};
2874 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2875
2876 glDisable GL_BLEND;
2877
2878 {
2879 local $self->{bg}; # do not draw background
2880 $self->SUPER::_draw;
2881 }
2882}
2883
2884#############################################################################
2885
2886package dc::UI::ExperienceProgress;
2887
2888our @ISA = dc::UI::Progress::;
2889
2890sub new {
2891 my ($class, %arg) = @_;
2892
2893 my $self = $class->SUPER::new (
2894 tooltip => sub {
2895 my ($self) = @_;
2896
2897 sprintf "level %d\n%s points\n%s next level\n%s to go",
2898 $self->{lvl},
2899 ::formsep ($self->{exp}),
2900 ::formsep ($self->{nxt}),
2901 ::formsep ($self->{nxt} - $self->{exp}),
2902 },
2903 %arg
2904 );
2905
2906 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2907 if $::CONN;
2908
2909 $self
2910}
2911
2912sub DESTROY {
2913 my ($self) = @_;
2914
2915 delete $::CONN->{on_exp_update}{$self+0}
2916 if $::CONN;
2917
2918 $self->SUPER::DESTROY;
2919}
2920
2921sub set_value {
2922 my ($self, $lvl, $exp) = @_;
2923
2924 $self->{lvl} = $lvl;
2925 $self->{exp} = $exp;
2926
2927 my $v = -1;
2928
2929 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2930 my $l0 = $table->[$lvl - 1];
2931 my $l1 = $table->[$lvl];
2932
2933 $self->{nxt} = $l1;
2934
2935 $v = ($exp - $l0) / ($l1 - $l0);
2936 }
2937
2938 $self->SUPER::set_value ($v);
2939}
2940
2941#############################################################################
2942
2538package CFPlus::UI::Gauge; 2943package dc::UI::Gauge;
2539 2944
2540our @ISA = CFPlus::UI::VBox::; 2945our @ISA = dc::UI::VBox::;
2541 2946
2542sub new { 2947sub new {
2543 my ($class, %arg) = @_; 2948 my ($class, %arg) = @_;
2544 2949
2545 my $self = $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
2547 can_hover => 1, 2952 can_hover => 1,
2548 can_events => 1, 2953 can_events => 1,
2549 %arg, 2954 %arg,
2550 ); 2955 );
2551 2956
2552 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2957 $self->add ($self->{value} = new dc::UI::Label valign => +1, align => 0, template => "999");
2553 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2958 $self->add ($self->{gauge} = new dc::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2554 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2959 $self->add ($self->{max} = new dc::UI::Label valign => -1, align => 0, template => "999");
2555 2960
2556 $self 2961 $self
2557} 2962}
2558 2963
2559sub set_fontsize { 2964sub set_fontsize {
2580 $self->{value}->set_text ($val); 2985 $self->{value}->set_text ($val);
2581} 2986}
2582 2987
2583############################################################################# 2988#############################################################################
2584 2989
2585package CFPlus::UI::Slider; 2990package dc::UI::Slider;
2586 2991
2587use strict; 2992use strict;
2588 2993
2589use CFPlus::OpenGL; 2994use dc::OpenGL;
2590 2995
2591our @ISA = CFPlus::UI::DrawBG::; 2996our @ISA = dc::UI::DrawBG::;
2592 2997
2593my @tex = 2998my @tex =
2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 2999 map { new_from_file dc::Texture dc::find_rcfile $_ }
2595 qw(s1_slider.png s1_slider_bg.png); 3000 qw(s1_slider.png s1_slider_bg.png);
2596 3001
2597sub new { 3002sub new {
2598 my $class = shift; 3003 my $class = shift;
2599 3004
2667 3072
2668 $self->SUPER::invoke_button_down ($ev, $x, $y); 3073 $self->SUPER::invoke_button_down ($ev, $x, $y);
2669 3074
2670 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3075 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2671 3076
2672 $self->invoke_mouse_motion ($ev, $x, $y) 3077 $self->invoke_mouse_motion ($ev, $x, $y);
3078
3079 1
2673} 3080}
2674 3081
2675sub invoke_mouse_motion { 3082sub invoke_mouse_motion {
2676 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2677 3084
2693sub invoke_mouse_wheel { 3100sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2695 3102
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3103 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 3104
3105 my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;
3106
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 3108
2700 ! ! $delta 3109 1
2701} 3110}
2702 3111
2703sub update { 3112sub update {
2704 my ($self) = @_; 3113 my ($self) = @_;
2705 3114
2754 glDisable GL_TEXTURE_2D; 3163 glDisable GL_TEXTURE_2D;
2755} 3164}
2756 3165
2757############################################################################# 3166#############################################################################
2758 3167
2759package CFPlus::UI::ValSlider; 3168package dc::UI::ValSlider;
2760 3169
2761our @ISA = CFPlus::UI::HBox::; 3170our @ISA = dc::UI::HBox::;
2762 3171
2763sub new { 3172sub new {
2764 my ($class, %arg) = @_; 3173 my ($class, %arg) = @_;
2765 3174
2766 my $range = delete $arg{range}; 3175 my $range = delete $arg{range};
2767 3176
2768 my $self = $class->SUPER::new ( 3177 my $self = $class->SUPER::new (
2769 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3178 slider => (new dc::UI::Slider expand => 1, range => $range),
2770 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3179 entry => (new dc::UI::Label text => "", template => delete $arg{template}),
2771 to_value => sub { shift }, 3180 to_value => sub { shift },
2772 from_value => sub { shift }, 3181 from_value => sub { shift },
2773 %arg, 3182 %arg,
2774 ); 3183 );
2775 3184
2795sub set_range { shift->{slider}->set_range (@_) } 3204sub set_range { shift->{slider}->set_range (@_) }
2796sub set_value { shift->{slider}->set_value (@_) } 3205sub set_value { shift->{slider}->set_value (@_) }
2797 3206
2798############################################################################# 3207#############################################################################
2799 3208
2800package CFPlus::UI::TextScroller; 3209package dc::UI::TextScroller;
2801 3210
2802our @ISA = CFPlus::UI::HBox::; 3211our @ISA = dc::UI::HBox::;
2803 3212
2804use CFPlus::OpenGL; 3213use dc::OpenGL;
2805 3214
2806sub new { 3215sub new {
2807 my $class = shift; 3216 my $class = shift;
2808 3217
2809 my $self = $class->SUPER::new ( 3218 my $self = $class->SUPER::new (
2811 can_events => 1, 3220 can_events => 1,
2812 indent => 0, 3221 indent => 0,
2813 #font => default_font 3222 #font => default_font
2814 @_, 3223 @_,
2815 3224
2816 layout => (new CFPlus::Layout), 3225 layout => (new dc::Layout),
2817 par => [], 3226 par => [],
3227 max_par => 0,
2818 height => 0, 3228 height => 0,
2819 children => [ 3229 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3230 (new dc::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3231 (new dc::UI::Slider vertical => 1),
2822 ], 3232 ],
2823 ); 3233 );
2824 3234
2825 $self->{children}[1]->connect (changed => sub { $self->update }); 3235 $self->{children}[1]->connect (changed => sub { $self->update });
2826 3236
2835} 3245}
2836 3246
2837sub size_request { 3247sub size_request {
2838 my ($self) = @_; 3248 my ($self) = @_;
2839 3249
2840 my ($empty, $slider) = @{ $self->{children} }; 3250 my ($empty, $slider) = $self->visible_children;
2841 3251
2842 local $self->{children} = [$empty, $slider]; 3252 local $self->{children} = [$empty, $slider];
2843 $self->SUPER::size_request 3253 $self->SUPER::size_request
2844} 3254}
2845 3255
2947 3357
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3358 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3359 push @{$self->{par}}, $para;
2950 } 3360 }
2951 3361
3362 if (my $max = $self->{max_par}) {
3363 shift @{$self->{par}} while @{$self->{par}} > $max;
3364 }
3365
2952 $self->{need_reflow}++; 3366 $self->{need_reflow}++;
2953 $self->update; 3367 $self->update;
2954} 3368}
2955 3369
2956sub scroll_to_bottom { 3370sub scroll_to_bottom {
3005 $ROOT->on_post_alloc ($self => sub { 3419 $ROOT->on_post_alloc ($self => sub {
3006 $self->force_uptodate; 3420 $self->force_uptodate;
3007 3421
3008 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3422 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3009 3423
3010 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3424 $self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {
3011 glClearColor 0, 0, 0, 0; 3425 glClearColor 0, 0, 0, 0;
3012 glClear GL_COLOR_BUFFER_BIT; 3426 glClear GL_COLOR_BUFFER_BIT;
3013 3427
3014 package CFPlus::UI::Base; 3428 package dc::UI::Base;
3015 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3429 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3016 (0, 0, $self->{w}, $self->{h}); 3430 (0, 0, $self->{w}, $self->{h});
3017 3431
3018 my $top = int $self->{children}[1]{range}[0]; 3432 my $top = int $self->{children}[1]{range}[0];
3019 3433
3030 3444
3031 if ($y0 < $y + $h && $y < $y1) { 3445 if ($y0 < $y + $h && $y < $y1) {
3032 my $layout = $self->get_layout ($para); 3446 my $layout = $self->get_layout ($para);
3033 3447
3034 $layout->render ($para->{indent}, $y - $y0); 3448 $layout->render ($para->{indent}, $y - $y0);
3449 $layout->draw;
3035 3450
3036 if (my @w = @{ $para->{widget} }) { 3451 if (my @w = @{ $para->{widget} }) {
3037 my @s = $layout->get_shapes; 3452 my @s = $layout->get_shapes;
3038 3453
3039 for (@w) { 3454 for (@w) {
3077 $self->{children}[1]->draw; 3492 $self->{children}[1]->draw;
3078} 3493}
3079 3494
3080############################################################################# 3495#############################################################################
3081 3496
3082package CFPlus::UI::Animator; 3497package dc::UI::Animator;
3083 3498
3084use CFPlus::OpenGL; 3499use dc::OpenGL;
3085 3500
3086our @ISA = CFPlus::UI::Bin::; 3501our @ISA = dc::UI::Bin::;
3087 3502
3088sub moveto { 3503sub moveto {
3089 my ($self, $x, $y) = @_; 3504 my ($self, $x, $y) = @_;
3090 3505
3091 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3506 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3119 glPopMatrix; 3534 glPopMatrix;
3120} 3535}
3121 3536
3122############################################################################# 3537#############################################################################
3123 3538
3124package CFPlus::UI::Flopper; 3539package dc::UI::Flopper;
3125 3540
3126our @ISA = CFPlus::UI::Button::; 3541our @ISA = dc::UI::Button::;
3127 3542
3128sub new { 3543sub new {
3129 my $class = shift; 3544 my $class = shift;
3130 3545
3131 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
3143 $self->{other}->toggle_visibility; 3558 $self->{other}->toggle_visibility;
3144} 3559}
3145 3560
3146############################################################################# 3561#############################################################################
3147 3562
3148package CFPlus::UI::Tooltip; 3563package dc::UI::Tooltip;
3149 3564
3150our @ISA = CFPlus::UI::Bin::; 3565our @ISA = dc::UI::Bin::;
3151 3566
3152use CFPlus::OpenGL; 3567use dc::OpenGL;
3153 3568
3154sub new { 3569sub new {
3155 my $class = shift; 3570 my $class = shift;
3156 3571
3157 $class->SUPER::new ( 3572 $class->SUPER::new (
3161} 3576}
3162 3577
3163sub set_tooltip_from { 3578sub set_tooltip_from {
3164 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
3165 3580
3166 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3167 if $widget->{tooltip} =~ /^#(.*)$/;
3168
3169 my $tooltip = $widget->{tooltip}; 3581 my $tip = $widget->{tooltip};
3582 $tip = $tip->($widget) if "CODE" eq ref $tip;
3583
3584 $tip = dc::Pod::section_label tooltip => $1
3585 if $tip =~ /^#(.*)$/;
3170 3586
3171 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
3172 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
3173 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3174 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
3175 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
3176 } 3592 }
3177 3593
3178 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
3179 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
3180 3596
3181 $self->add (new CFPlus::UI::Label 3597 $self->add (new dc::UI::Label
3182 markup => $tooltip, 3598 markup => $tip,
3183 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3184 fontsize => 0.8, 3600 fontsize => 0.8,
3185 style => 1, # FLAG_INVERSE 3601 style => 1, # FLAG_INVERSE
3186 ellipsise => 0, 3602 ellipsise => 0,
3187 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
3225} 3641}
3226 3642
3227sub _draw { 3643sub _draw {
3228 my ($self) = @_; 3644 my ($self) = @_;
3229 3645
3230 glTranslate 0.375, 0.375;
3231
3232 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
3233 3647
3234 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
3235 glBegin GL_QUADS; 3649 glRect 0, 0, $w, $h;
3236 glVertex 0 , 0;
3237 glVertex 0 , $h;
3238 glVertex $w, $h;
3239 glVertex $w, 0;
3240 glEnd;
3241 3650
3242 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
3243 glBegin GL_LINE_LOOP; 3652 glRect_lineloop .5, .5, $w + .5, $h + .5;
3244 glVertex 0 , 0;
3245 glVertex 0 , $h;
3246 glVertex $w, $h;
3247 glVertex $w, 0;
3248 glEnd;
3249 3653
3250 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
3251 3655
3252 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3253} 3657}
3254 3658
3255############################################################################# 3659#############################################################################
3256 3660
3257package CFPlus::UI::Face; 3661package dc::UI::Face;
3258 3662
3259our @ISA = CFPlus::UI::DrawBG::; 3663our @ISA = dc::UI::DrawBG::;
3260 3664
3261use CFPlus::OpenGL; 3665use dc::OpenGL;
3262 3666
3263sub new { 3667sub new {
3264 my $class = shift; 3668 my $class = shift;
3265 3669
3266 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
3671 size_w => 32,
3672 size_h => 8,
3267 aspect => 1, 3673 aspect => 1,
3268 can_events => 0, 3674 can_events => 0,
3269 @_, 3675 @_,
3270 ); 3676 );
3271 3677
3272 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3679 dc::weaken (my $widget = $self);
3274 3680
3275 $self->{timer} = Event->timer ( 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3277 hard => 1, 3683 return unless $::CONN;
3278 interval => $self->{animspeed}, 3684
3279 cb => sub { 3685 my $w = $widget
3686 or return;
3687
3280 ++$widget->{frame}; 3688 ++$w->{frame};
3689 $w->update_face;
3690
3691 # somehow, $widget can go away
3281 $widget->update; 3692 $w->update;
3282 }, 3693 $w->update_timer;
3283 ); 3694 };
3695
3696 $self->update_face;
3697 $self->update_timer;
3284 } 3698 }
3285 3699
3286 $self 3700 $self
3287} 3701}
3288 3702
3703sub update_timer {
3704 my ($self) = @_;
3705
3706 return unless $self->{timer};
3707
3708 if ($self->{visible}) {
3709 $self->{timer}->start;
3710 } else {
3711 $self->{timer}->stop;
3712 }
3713}
3714
3715sub update_face {
3716 my ($self) = @_;
3717
3718 if ($::CONN) {
3719 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3720 if ($anim && @$anim) {
3721 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3722 delete $self->{face_change_cb};
3723
3724 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3725 unless ($tex->{name} || $tex->{loading}) {
3726 $tex->upload (sub { $self->reconfigure });
3727 }
3728 }
3729 }
3730 }
3731 }
3732}
3733
3289sub size_request { 3734sub size_request {
3290 (32, 8) 3735 my ($self) = @_;
3736
3737 if ($::CONN) {
3738 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3739 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3740 if ($tex->{name}) {
3741 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3742 } elsif (!$tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746
3747 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3748 }
3749 }
3750
3751 ($self->{size_w} || 8, $self->{size_h} || 8)
3291} 3752}
3292 3753
3293sub update { 3754sub update {
3294 my ($self) = @_; 3755 my ($self) = @_;
3295 3756
3296 return unless $self->{visible}; 3757 return unless $self->{visible};
3297 3758
3298 $self->SUPER::update; 3759 $self->SUPER::update;
3299} 3760}
3300 3761
3762sub invoke_visibility_change {
3763 my ($self) = @_;
3764
3765 $self->update_timer;
3766
3767 0
3768}
3769
3301sub _draw { 3770sub _draw {
3302 my ($self) = @_; 3771 my ($self) = @_;
3303 3772
3304 return unless $::CONN;
3305
3306 $self->SUPER::_draw; 3773 $self->SUPER::_draw;
3307 3774
3308 my $face; 3775 if (my $tex = $self->{tex}) {
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}];
3312
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3318
3319 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3776 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3778 glColor 0, 0, 0, 1;
3323 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3779 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3324 glDisable GL_TEXTURE_2D; 3780 glDisable GL_TEXTURE_2D;
3326} 3782}
3327 3783
3328sub destroy { 3784sub destroy {
3329 my ($self) = @_; 3785 my ($self) = @_;
3330 3786
3331 $self->{timer}->cancel 3787 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3788 if $self->{timer};
3333 3789
3334 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3335} 3791}
3336 3792
3337############################################################################# 3793#############################################################################
3338 3794
3339package CFPlus::UI::Buttonbar; 3795package dc::UI::Buttonbar;
3340 3796
3341our @ISA = CFPlus::UI::HBox::; 3797our @ISA = dc::UI::HBox::;
3342 3798
3343# TODO: should actually wrap buttons and other goodies. 3799# TODO: should actually wrap buttons and other goodies.
3344 3800
3345############################################################################# 3801#############################################################################
3346 3802
3347package CFPlus::UI::Menu; 3803package dc::UI::Menu;
3348 3804
3349our @ISA = CFPlus::UI::Toplevel::; 3805our @ISA = dc::UI::Toplevel::;
3350 3806
3351use CFPlus::OpenGL; 3807use dc::OpenGL;
3352 3808
3353sub new { 3809sub new {
3354 my $class = shift; 3810 my $class = shift;
3355 3811
3356 my $self = $class->SUPER::new ( 3812 my $self = $class->SUPER::new (
3357 items => [], 3813 items => [],
3358 z => 100, 3814 z => 100,
3359 @_, 3815 @_,
3360 ); 3816 );
3361 3817
3362 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3818 $self->add ($self->{vbox} = new dc::UI::VBox);
3363 3819
3364 for my $item (@{ $self->{items} }) { 3820 for my $item (@{ $self->{items} }) {
3365 my ($widget, $cb, $tooltip) = @$item; 3821 my ($widget, $cb, $tooltip) = @$item;
3366 3822
3367 # handle various types of items, only text for now 3823 # handle various types of items, only text for now
3368 if (!ref $widget) { 3824 if (!ref $widget) {
3369 if ($widget =~ /\t/) { 3825 if ($widget =~ /\t/) {
3370 my ($left, $right) = split /\t/, $widget, 2; 3826 my ($left, $right) = split /\t/, $widget, 2;
3371 3827
3372 $widget = new CFPlus::UI::HBox 3828 $widget = new dc::UI::HBox
3373 can_hover => 1, 3829 can_hover => 1,
3374 can_events => 1, 3830 can_events => 1,
3375 tooltip => $tooltip, 3831 tooltip => $tooltip,
3376 children => [ 3832 children => [
3377 (new CFPlus::UI::Label markup => $left, expand => 1), 3833 (new dc::UI::Label markup => $left, expand => 1),
3378 (new CFPlus::UI::Label markup => $right, align => +1), 3834 (new dc::UI::Label markup => $right, align => +1),
3379 ], 3835 ],
3380 ; 3836 ;
3381 3837
3382 } else { 3838 } else {
3383 $widget = new CFPlus::UI::Label 3839 $widget = new dc::UI::Label
3384 can_hover => 1, 3840 can_hover => 1,
3385 can_events => 1, 3841 can_events => 1,
3386 markup => $widget, 3842 markup => $widget,
3387 tooltip => $tooltip; 3843 tooltip => $tooltip;
3388 } 3844 }
3436 1 3892 1
3437} 3893}
3438 3894
3439############################################################################# 3895#############################################################################
3440 3896
3441package CFPlus::UI::Multiplexer; 3897package dc::UI::Multiplexer;
3442 3898
3443our @ISA = CFPlus::UI::Container::; 3899our @ISA = dc::UI::Container::;
3444 3900
3445sub new { 3901sub new {
3446 my $class = shift; 3902 my $class = shift;
3447 3903
3448 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
3509 $self->{current}->draw; 3965 $self->{current}->draw;
3510} 3966}
3511 3967
3512############################################################################# 3968#############################################################################
3513 3969
3514package CFPlus::UI::Notebook; 3970package dc::UI::Notebook;
3515 3971
3972use dc::OpenGL;
3973
3516our @ISA = CFPlus::UI::VBox::; 3974our @ISA = dc::UI::VBox::;
3517 3975
3518sub new { 3976sub new {
3519 my $class = shift; 3977 my $class = shift;
3520 3978
3521 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3522 buttonbar => (new CFPlus::UI::Buttonbar), 3980 buttonbar => (new dc::UI::Buttonbar),
3523 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3981 multiplexer => (new dc::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2],
3524 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3525 @_, 3984 @_,
3526 ); 3985 );
3527 3986
3528 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3529 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3988 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3530 3989
3990 {
3991 Scalar::Util::weaken (my $wself = $self);
3992
3993 $self->{multiplexer}->connect (c_add => sub {
3994 my ($mplex, $widgets) = @_;
3995
3996 for my $child (@$widgets) {
3997 Scalar::Util::weaken $child;
3998 $child->{c_tab_} ||= do {
3999 my $tab =
4000 (UNIVERSAL::isa $child->{c_tab}, "dc::UI::Base")
4001 ? $child->{c_tab}
4002 : new dc::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4003
4004 $tab->connect (activate => sub {
4005 $wself->set_current_page ($child);
4006 });
4007
4008 $tab
4009 };
4010
4011 $self->{buttonbar}->add ($child->{c_tab_});
4012 }
4013 });
4014
4015 $self->{multiplexer}->connect (c_remove => sub {
4016 my ($mplex, $widgets) = @_;
4017
4018 for my $child (@$widgets) {
4019 $wself->{buttonbar}->remove ($child->{c_tab_});
4020 }
4021 });
4022 }
4023
3531 $self 4024 $self
3532} 4025}
3533 4026
3534sub add { 4027sub add {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->add (@widgets)
4031}
4032
4033sub remove {
4034 my ($self, @widgets) = @_;
4035
4036 $self->{multiplexer}->remove (@widgets)
4037}
4038
4039sub pages {
4040 my ($self) = @_;
4041 $self->{multiplexer}->children
4042}
4043
4044sub add_tab {
3535 my ($self, $title, $widget, $tooltip) = @_; 4045 my ($self, $title, $widget, $tooltip) = @_;
3536 4046
3537 Scalar::Util::weaken $self; 4047 $title = [$title, $tooltip] unless ref $title;
4048 $widget->{c_tab} = $title;
3538 4049
3539 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title,
3541 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) },
3543 );
3544
3545 $self->{multiplexer}->add ($widget); 4050 $self->add ($widget);
3546} 4051}
3547 4052
3548sub get_current_page { 4053sub get_current_page {
3549 my ($self) = @_; 4054 my ($self) = @_;
3550 4055
3556 4061
3557 $self->{multiplexer}->set_current_page ($page); 4062 $self->{multiplexer}->set_current_page ($page);
3558 $self->emit (page_changed => $self->{multiplexer}{current}); 4063 $self->emit (page_changed => $self->{multiplexer}{current});
3559} 4064}
3560 4065
4066sub _draw {
4067 my ($self) = @_;
4068
4069 $self->SUPER::_draw ();
4070
4071 if (my $cur = $self->{multiplexer}{current}) {
4072 if ($cur = $cur->{c_tab_}) {
4073 glTranslate $self->{buttonbar}{x} + $cur->{x},
4074 $self->{buttonbar}{y} + $cur->{y};
4075 glLineWidth 3;
4076 #glEnable GL_BLEND;
4077 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4078 glColor @{$self->{active_outline}};
4079 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4080 glLineWidth 1;
4081 #glDisable GL_BLEND;
4082 }
4083 }
4084}
4085
3561############################################################################# 4086#############################################################################
3562 4087
3563package CFPlus::UI::Selector; 4088package dc::UI::Selector;
3564 4089
3565use utf8; 4090use utf8;
3566 4091
3567our @ISA = CFPlus::UI::Button::; 4092our @ISA = dc::UI::Button::;
3568 4093
3569sub new { 4094sub new {
3570 my $class = shift; 4095 my $class = shift;
3571 4096
3572 my $self = $class->SUPER::new ( 4097 my $self = $class->SUPER::new (
3589 my ($value, $title, $tooltip) = @$_; 4114 my ($value, $title, $tooltip) = @$_;
3590 4115
3591 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4116 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3592 } 4117 }
3593 4118
3594 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4119 dc::UI::Menu->new (items => \@menu_items)->popup ($ev);
3595} 4120}
3596 4121
3597sub _set_value { 4122sub _set_value {
3598 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
3599 4124
3600 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
3601 or return; 4127 or return;
3602 4128
3603 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
3604 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
3605 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
3606} 4132}
3607 4133
3608sub set_value { 4134sub set_value {
3609 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3610 4136
3612 4138
3613 $self->_set_value ($value); 4139 $self->_set_value ($value);
3614 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
3615} 4141}
3616 4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
4148}
4149
3617############################################################################# 4150#############################################################################
3618 4151
3619package CFPlus::UI::Statusbox; 4152package dc::UI::Statusbox;
3620 4153
3621our @ISA = CFPlus::UI::VBox::; 4154our @ISA = dc::UI::VBox::;
3622 4155
3623sub new { 4156sub new {
3624 my $class = shift; 4157 my $class = shift;
3625 4158
3626 my $self = $class->SUPER::new ( 4159 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 4160 fontsize => 0.8,
3628 @_, 4161 @_,
3629 ); 4162 );
3630 4163
3631 Scalar::Util::weaken (my $this = $self); 4164 dc::weaken (my $this = $self);
3632 4165
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3634 4167
3635 $self 4168 $self
3636} 4169}
3637 4170
3638sub reorder { 4171sub reorder {
3639 my ($self) = @_; 4172 my ($self) = @_;
3640 my $NOW = Time::HiRes::time; 4173 my $NOW = Time::HiRes::time;
3641 4174
3642 # freeze display when hovering over any label 4175 # freeze display when hovering over any label
3643 return if $CFPlus::UI::TOOLTIP->{owner} 4176 return if $dc::UI::TOOLTIP->{owner}
3644 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4177 && grep $dc::UI::TOOLTIP->{owner} == $_->{label},
3645 values %{ $self->{item} }; 4178 values %{ $self->{item} };
3646 4179
3647 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
3648 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3649 } 4182 }
4183
4184 $self->{timer}->set (1, 1);
3650 4185
3651 my @widgets; 4186 my @widgets;
3652 4187
3653 my @items = sort { 4188 my @items = sort {
3654 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3655 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3656 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3657
3658 $self->{timer}->interval (1);
3659 4192
3660 my $count = 10 + 1; 4193 my $count = 10 + 1;
3661 for my $item (@items) { 4194 for my $item (@items) {
3662 last unless --$count; 4195 last unless --$count;
3663 4196
3670 for ($short) { 4203 for ($short) {
3671 s/^\s+//; 4204 s/^\s+//;
3672 s/\s+/ /g; 4205 s/\s+/ /g;
3673 } 4206 }
3674 4207
3675 new CFPlus::UI::Label 4208 new dc::UI::Label
3676 markup => $short, 4209 markup => $short,
3677 tooltip => $item->{tooltip}, 4210 tooltip => $item->{tooltip},
3678 tooltip_font => $::FONT_PROP, 4211 tooltip_font => $::FONT_PROP,
3679 tooltip_width => 0.67, 4212 tooltip_width => 0.67,
3680 fontsize => $item->{fontsize} || $self->{fontsize}, 4213 fontsize => $item->{fontsize} || $self->{fontsize},
3687 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3688 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3689 $label->update; 4222 $label->update;
3690 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3691 if $diff < 1; 4224 if $diff < 1;
3692 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3693 } else { 4226 } else {
3694 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3695 } 4228 }
3696 4229
3697 push @widgets, $label; 4230 push @widgets, $label;
3759 $self->SUPER::destroy; 4292 $self->SUPER::destroy;
3760} 4293}
3761 4294
3762############################################################################# 4295#############################################################################
3763 4296
3764package CFPlus::UI::Root; 4297package dc::UI::Root;
3765 4298
3766our @ISA = CFPlus::UI::Container::; 4299our @ISA = dc::UI::Container::;
3767 4300
3768use List::Util qw(min max); 4301use List::Util qw(min max);
3769 4302
3770use CFPlus::OpenGL; 4303use dc::OpenGL;
3771 4304
3772sub new { 4305sub new {
3773 my $class = shift; 4306 my $class = shift;
3774 4307
3775 my $self = $class->SUPER::new ( 4308 my $self = $class->SUPER::new (
3776 visible => 1, 4309 visible => 1,
3777 @_, 4310 @_,
3778 ); 4311 );
3779 4312
3780 Scalar::Util::weaken ($self->{root} = $self); 4313 dc::weaken ($self->{root} = $self);
3781 4314
3782 $self 4315 $self
3783} 4316}
3784 4317
3785sub size_request { 4318sub size_request {
3833} 4366}
3834 4367
3835sub update { 4368sub update {
3836 my ($self) = @_; 4369 my ($self) = @_;
3837 4370
3838 $::WANT_REFRESH++; 4371 $::WANT_REFRESH = 1;
3839} 4372}
3840 4373
3841sub add { 4374sub add {
3842 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
3843 4376
3880 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
3881 $_->() 4414 $_->()
3882 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
3883 } 4416 }
3884 4417
3885 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
3886 my %queue; 4419 my %queue;
3887 my @queue; 4420 my @queue;
3888 my $widget; 4421 my $widget;
3889 4422
3890 outer: 4423 outer:
3937 } 4470 }
3938 } 4471 }
3939 4472
3940 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
3941 } 4474 }
3942 }
3943 4475
3944 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
3945 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
3946 values %$size_alloc; 4478 values %$size_alloc;
3947 4479
3948 while () { 4480 while () {
3949 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
3950 4482
3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3952 4484
3953 $w = 0 if $w < 0;
3954 $h = 0 if $h < 0;
3955
3956 $w = max $widget->{min_w}, $w; 4485 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h; 4486 $h = max $widget->{min_h}, $h;
3958 4487
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961 4490
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964 4493
3965 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
3966 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
3967 4496
3968 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4497 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3969 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
3970 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
3971 4500
3972 $widget->{w} = $w; 4501 $widget->{w} = $w;
3973 $widget->{h} = $h; 4502 $widget->{h} = $h;
3974 4503
3975 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
3976 } 4506 }
3977 } 4507 }
3978 } 4508 }
3979 4509
3980 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
3981 $_->() 4511 $_->()
3982 for values %{delete $self->{post_alloc_hook}}; 4512 for values %{delete $self->{post_alloc_hook}};
3983 } 4513 }
3984
3985 4514
3986 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4515 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4516 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988 glClear GL_COLOR_BUFFER_BIT; 4517 glClear GL_COLOR_BUFFER_BIT;
3989 4518
3992 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3993 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
3994 glLoadIdentity; 4523 glLoadIdentity;
3995 4524
3996 { 4525 {
3997 package CFPlus::UI::Base; 4526 package dc::UI::Base;
3998 4527
3999 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4000 (0, 0, $self->{w}, $self->{h}); 4529 (0, 0, $self->{w}, $self->{h});
4001 4530
4002 $self->_draw; 4531 $self->_draw;
4003 } 4532 }
4004} 4533}
4005 4534
4006############################################################################# 4535#############################################################################
4007 4536
4008package CFPlus::UI; 4537package dc::UI;
4009 4538
4010$ROOT = new CFPlus::UI::Root; 4539$ROOT = new dc::UI::Root;
4011$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4540$TOOLTIP = new dc::UI::Tooltip z => 900;
4012 4541
40131 45421
4014 4543

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines