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.375 by root, Mon Jul 16 20:12:19 2007 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 List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use dc;
10use CFPlus::Pod; 9use dc::Pod;
11use CFPlus::Texture; 10use dc::Texture;
12 11
13our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
14 13
15our $LAYOUT; 14our $LAYOUT;
16our $ROOT; 15our $ROOT;
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
118 $ev->{dx} = 0;
119 $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
120 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
121 } else { 122 } else {
122 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
123 } 124 }
124 } 125 }
138 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
139 $grab->update if $grab; 140 $grab->update if $grab;
140 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
141 142
142 check_hover $widget; 143 check_hover $widget;
143 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
144 } 145 }
145} 146}
146 147
147sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
148 my ($ev) = @_; 149 my ($ev) = @_;
210 reconfigure_widgets; 211 reconfigure_widgets;
211} 212}
212 213
213############################################################################# 214#############################################################################
214 215
215package CFPlus::UI::Event; 216package dc::UI::Event;
216 217
217sub xy { 218sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 219 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219} 220}
220 221
221############################################################################# 222#############################################################################
222 223
223package CFPlus::UI::Base; 224package dc::UI::Base;
224 225
225use strict; 226use strict;
226 227
227use CFPlus::OpenGL; 228use dc::OpenGL;
228 229
229sub new { 230sub new {
230 my $class = shift; 231 my $class = shift;
231 232
232 my $self = bless { 233 my $self = bless {
237 h => undef, 238 h => undef,
238 can_events => 1, 239 can_events => 1,
239 @_ 240 @_
240 }, $class; 241 }, $class;
241 242
242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 dc::weaken ($dc::UI::WIDGET{$self+0} = $self);
243 244
244 for (keys %$self) { 245 for (keys %$self) {
245 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
246 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
247 } 248 }
248 } 249 }
249 250
250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 251 if (my $layout = $dc::UI::LAYOUT->{$self->{name}}) {
251 $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};
252 $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};
253 $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};
254 $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};
255 256
256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 257 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 258 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258 259
259 $self->show if $layout->{show}; 260 $self->show if $layout->{show};
269 $self->emit ("destroy"); 270 $self->emit ("destroy");
270 %$self = (); 271 %$self = ();
271} 272}
272 273
273sub TO_JSON { 274sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
275} 276}
276 277
277sub show { 278sub show {
278 my ($self) = @_; 279 my ($self) = @_;
279 280
280 return if $self->{parent}; 281 return if $self->{parent};
281 282
282 $CFPlus::UI::ROOT->add ($self); 283 $dc::UI::ROOT->add ($self);
283} 284}
284 285
285sub set_visible { 286sub set_visible {
286 my ($self) = @_; 287 my ($self) = @_;
287 288
308 delete $self->{root}; 309 delete $self->{root};
309 310
310 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
311 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
312 313
313 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $dc::UI::TOOLTIP_WATCHER->invoke
314 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
315 316
316 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
317 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
318} 319}
337sub hide { 338sub hide {
338 my ($self) = @_; 339 my ($self) = @_;
339 340
340 $self->set_invisible; 341 $self->set_invisible;
341 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
342 $self->{parent}->remove ($self) 346 $parent->remove ($self);
343 if $self->{parent}; 347 }
344} 348}
345 349
346sub move_abs { 350sub move_abs {
347 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
348 352
360 $self->{force_h} = $h; 364 $self->{force_h} = $h;
361 365
362 $self->realloc; 366 $self->realloc;
363} 367}
364 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
365sub size_request { 379sub size_request {
366 require Carp; 380 require Carp;
367 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
368} 382}
369 383
375 my ($self, $x, $y, $w, $h) = @_; 389 my ($self, $x, $y, $w, $h) = @_;
376 390
377 if ($self->{aspect}) { 391 if ($self->{aspect}) {
378 my ($ow, $oh) = ($w, $h); 392 my ($ow, $oh) = ($w, $h);
379 393
380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 394 $w = List::Util::min $w, dc::ceil $h * $self->{aspect};
381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 395 $h = List::Util::min $h, dc::ceil $w / $self->{aspect};
382 396
383 # use alignment to adjust x, y 397 # use alignment to adjust x, y
384 398
385 $x += int 0.5 * ($ow - $w); 399 $x += int 0.5 * ($ow - $w);
386 $y += int 0.5 * ($oh - $h); 400 $y += int 0.5 * ($oh - $h);
427 441
428 return if $self->{tooltip} eq $tooltip; 442 return if $self->{tooltip} eq $tooltip;
429 443
430 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
431 445
432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($dc::UI::TOOLTIP->{owner} == $self) {
433 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $dc::UI::TOOLTIP->{owner};
434 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 448 $dc::UI::TOOLTIP_WATCHER->invoke;
435 } 449 }
436} 450}
437 451
438# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
439sub coord2local { 453sub coord2local {
440 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
441 455
442 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
443 457
444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445} 459}
446 460
447# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
448sub coord2global { 462sub coord2global {
449 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
450 464
451 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
452 466
453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454} 468}
455 469
456sub invoke_focus_in { 470sub invoke_focus_in {
505sub connect { 519sub connect {
506 my ($self, $signal, $cb) = @_; 520 my ($self, $signal, $cb) = @_;
507 521
508 push @{ $self->{signal_cb}{$signal} }, $cb; 522 push @{ $self->{signal_cb}{$signal} }, $cb;
509 523
510 defined wantarray and CFPlus::guard { 524 defined wantarray and dc::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 525 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} }; 526 @{ $self->{signal_cb}{$signal} };
513 } 527 }
514} 528}
515 529
547 561
548 # parent 562 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 563 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 564}
551 565
552sub find_widget { 566#sub find_widget {
553 my ($self, $x, $y) = @_; 567# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 568
564sub set_parent { 569sub set_parent {
565 my ($self, $parent) = @_; 570 my ($self, $parent) = @_;
566 571
567 CFPlus::weaken ($self->{parent} = $parent); 572 dc::weaken ($self->{parent} = $parent);
568 $self->set_visible if $parent->{visible}; 573 $self->set_visible if $parent->{visible};
569} 574}
570 575
571sub realloc { 576sub realloc {
572 my ($self) = @_; 577 my ($self) = @_;
598 603
599# 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
600# functions seems pointless. 605# functions seems pointless.
601our ($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
602 607
603sub draw { 608#sub draw {
604 my ($self) = @_; 609#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 610
650sub _draw { 611sub _draw {
651 my ($self) = @_; 612 my ($self) = @_;
652 613
653 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
654} 615}
655 616
656my $cntx;#d#
657sub DESTROY { 617sub DESTROY {
658 my ($self) = @_; 618 my ($self) = @_;
659 619
660 return if CFPlus::in_destruct; 620 return if dc::in_destruct;
661 621
622 local $@;
662 eval { $self->destroy }; 623 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 625
665 delete $WIDGET{$self+0}; 626 delete $WIDGET{$self+0};
666} 627}
667 628
668############################################################################# 629#############################################################################
669 630
670package CFPlus::UI::DrawBG; 631package dc::UI::DrawBG;
671 632
672our @ISA = CFPlus::UI::Base::; 633our @ISA = dc::UI::Base::;
673 634
674use strict; 635use strict;
675use CFPlus::OpenGL; 636use dc::OpenGL;
676 637
677sub new { 638sub new {
678 my $class = shift; 639 my $class = shift;
679
680 # range [value, low, high, page]
681 640
682 $class->SUPER::new ( 641 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
685 @_ 644 @_
697 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
698 657
699 glEnable GL_BLEND; 658 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 660 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 662 glDisable GL_BLEND;
711 } 663 }
712} 664}
713 665
714############################################################################# 666#############################################################################
715 667
716package CFPlus::UI::Empty; 668package dc::UI::Empty;
717 669
718our @ISA = CFPlus::UI::Base::; 670our @ISA = dc::UI::Base::;
719 671
720sub new { 672sub new {
721 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
722 $class->SUPER::new (can_events => 0, %arg); 674 $class->SUPER::new (can_events => 0, %arg);
723} 675}
730 682
731sub draw { } 683sub draw { }
732 684
733############################################################################# 685#############################################################################
734 686
735package CFPlus::UI::Container; 687package dc::UI::Container;
736 688
737our @ISA = CFPlus::UI::Base::; 689our @ISA = dc::UI::Base::;
738 690
739sub new { 691sub new {
740 my ($class, %arg) = @_; 692 my ($class, %arg) = @_;
741 693
742 my $children = delete $arg{children}; 694 my $children = delete $arg{children};
746 can_events => 0, 698 can_events => 0,
747 %arg, 699 %arg,
748 ); 700 );
749 701
750 $self->add (@$children) 702 $self->add (@$children)
751 if $children; 703 if $children && @$children;
752 704
753 $self 705 $self
754} 706}
755 707
756sub realloc { 708sub realloc {
765 my ($self, @widgets) = @_; 717 my ($self, @widgets) = @_;
766 718
767 $_->set_parent ($self) 719 $_->set_parent ($self)
768 for @widgets; 720 for @widgets;
769 721
722 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 723 use sort 'stable';
771 724
772 $self->{children} = [ 725 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
775 ]; 728 ];
776 729
777 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
778} 735}
779 736
780sub children { 737sub children {
781 @{ $_[0]{children} } 738 @{ $_[0]{children} }
782} 739}
783 740
784sub remove { 741sub remove {
785 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
786 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
787 delete $child->{parent}; 747 delete $child->{parent};
788 $child->hide; 748 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
791 751
792 $self->realloc; 752 $self->realloc;
793} 753}
794 754
795sub clear { 755sub clear {
796 my ($self) = @_; 756 my ($self) = @_;
797 757
798 my $children = delete $self->{children}; 758 my $children = $self->{children};
799 $self->{children} = []; 759 $self->{children} = [];
800 760
801 for (@$children) { 761 for (@$children) {
802 delete $_->{parent}; 762 delete $_->{parent};
803 $_->hide; 763 $_->hide;
823} 783}
824 784
825sub _draw { 785sub _draw {
826 my ($self) = @_; 786 my ($self) = @_;
827 787
828 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
829} 789}
830 790
831############################################################################# 791#############################################################################
832 792
833package CFPlus::UI::Bin; 793package dc::UI::Bin;
834 794
835our @ISA = CFPlus::UI::Container::; 795our @ISA = dc::UI::Container::;
836 796
837sub new { 797sub new {
838 my ($class, %arg) = @_; 798 my ($class, %arg) = @_;
839 799
840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 800 my $child = (delete $arg{child}) || new dc::UI::Empty::;
841 801
842 $class->SUPER::new (children => [$child], %arg) 802 $class->SUPER::new (children => [$child], %arg)
843} 803}
844 804
845sub add { 805sub add {
846 my ($self, $child) = @_; 806 my ($self, $child) = @_;
847 807
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
849 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
850} 810}
851 811
852sub remove { 812sub remove {
853 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
854 814
855 $self->SUPER::remove ($widget); 815 $self->SUPER::remove ($widget);
856 816
857 $self->{children} = [new CFPlus::UI::Empty] 817 $self->{children} = [new dc::UI::Empty]
858 unless @{$self->{children}}; 818 unless @{$self->{children}};
859} 819}
860 820
861sub child { $_[0]->{children}[0] } 821sub child { $_[0]->{children}[0] }
862 822
871 831
872 1 832 1
873} 833}
874 834
875############################################################################# 835#############################################################################
876
877# back-buffered drawing area 836# back-buffered drawing area
878 837
879package CFPlus::UI::Window; 838package dc::UI::Window;
880 839
881our @ISA = CFPlus::UI::Bin::; 840our @ISA = dc::UI::Bin::;
882 841
883use CFPlus::OpenGL; 842use dc::OpenGL;
884 843
885sub new { 844sub new {
886 my ($class, %arg) = @_; 845 my ($class, %arg) = @_;
887 846
888 my $self = $class->SUPER::new (%arg); 847 my $self = $class->SUPER::new (%arg);
910} 869}
911 870
912sub render_child { 871sub render_child {
913 my ($self) = @_; 872 my ($self) = @_;
914 873
915 $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 {
916 glClearColor 0, 0, 0, 0; 875 glClearColor 0, 0, 0, 0;
917 glClear GL_COLOR_BUFFER_BIT; 876 glClear GL_COLOR_BUFFER_BIT;
918 877
919 { 878 {
920 package CFPlus::UI::Base; 879 package dc::UI::Base;
921 880
922 local ($draw_x, $draw_y, $draw_w, $draw_h) = 881 local ($draw_x, $draw_y, $draw_w, $draw_h) =
923 (0, 0, $self->{w}, $self->{h}); 882 (0, 0, $self->{w}, $self->{h});
924 883
925 $self->_render; 884 $self->_render;
942 glDisable GL_TEXTURE_2D; 901 glDisable GL_TEXTURE_2D;
943} 902}
944 903
945############################################################################# 904#############################################################################
946 905
947package CFPlus::UI::ViewPort; 906package dc::UI::ViewPort;
948 907
949use List::Util qw(min max); 908use List::Util qw(min max);
950 909
951our @ISA = CFPlus::UI::Window::; 910our @ISA = dc::UI::Window::;
952 911
953sub new { 912sub new {
954 my $class = shift; 913 my $class = shift;
955 914
956 $class->SUPER::new ( 915 $class->SUPER::new (
963sub size_request { 922sub size_request {
964 my ($self) = @_; 923 my ($self) = @_;
965 924
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 925 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 926
968 $w = 10 if $self->{scroll_x}; 927 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 928 $h = 1 if $self->{scroll_y};
970 929
971 ($w, $h) 930 ($w, $h)
972} 931}
973 932
974sub invoke_size_allocate { 933sub invoke_size_allocate {
986} 945}
987 946
988sub set_offset { 947sub set_offset {
989 my ($self, $x, $y) = @_; 948 my ($self, $x, $y) = @_;
990 949
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 950 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 951 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 952
953 if ($x != $self->{view_x} or $y != $self->{view_y}) {
954 $self->{view_x} = $x;
955 $self->{view_y} = $y;
956
957 $self->emit (changed => $x, $y);
994 $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 }
995} 978}
996 979
997# 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
998sub coord2local { 981sub coord2local {
999 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
1014 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
1015 998
1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1018 ) { 1001 ) {
1019 $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})
1020 } else { 1003 } else {
1021 $self->CFPlus::UI::Base::find_widget ($x, $y) 1004 $self->dc::UI::Base::find_widget ($x, $y)
1022 } 1005 }
1023} 1006}
1024 1007
1025sub _render { 1008sub _render {
1026 my ($self) = @_; 1009 my ($self) = @_;
1027 1010
1028 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};
1029 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};
1030 1013
1031 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1032 1015
1033 $self->SUPER::_render; 1016 $self->SUPER::_render;
1034} 1017}
1035 1018
1036############################################################################# 1019#############################################################################
1037 1020
1038package CFPlus::UI::ScrolledWindow; 1021package dc::UI::ScrolledWindow;
1039 1022
1040our @ISA = CFPlus::UI::Table::; 1023our @ISA = dc::UI::Table::;
1041 1024
1042sub new { 1025sub new {
1043 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1044 1027
1045 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1046 1029
1047 my $self; 1030 my $self;
1048 1031
1049 my $hslider = new CFPlus::UI::Slider 1032 my $hslider = new dc::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1050 vertical => 0, 1035 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix 1036 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub { 1037 on_changed => sub {
1053 $self->{hpos} = $_[1]; 1038 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 }, 1040 },
1056 ; 1041 ;
1057 1042
1058 my $vslider = new CFPlus::UI::Slider 1043 my $vslider = new dc::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
1059 vertical => 1, 1046 vertical => 1,
1060 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1061 on_changed => sub { 1048 on_changed => sub {
1062 $self->{vpos} = $_[1]; 1049 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1073 col_expand => [1, 0], 1060 col_expand => [1, 0],
1074 row_expand => [1, 0], 1061 row_expand => [1, 0],
1075 %arg, 1062 %arg,
1076 ); 1063 );
1077 1064
1078 $self->{vp} = new CFPlus::UI::ViewPort 1065 $self->{vp} = new dc::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1079 expand => 1, 1068 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1069 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y}, 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 },
1082 ; 1084 ;
1083 1085
1084 $self->SUPER::add (0, 0, $self->{vp}); 1086 $self->SUPER::add ($self->{vp});
1085 1087
1086 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
1087 1089
1088 $self 1090 $self
1089} 1091}
1090
1091#TODO# update range on size_allocate depending on child
1092 1092
1093sub add { 1093sub add {
1094 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1095 1095
1096 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1097} 1097}
1098 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1099sub update_slider { 1103sub update_slider {
1100 my ($self) = @_; 1104 my ($self) = @_;
1101 1105
1102 my $child = ($self->{vp} or return)->child; 1106 my $child = ($self->{vp} or return)->child;
1103 1107
1108 if ($self->{scroll_x}) {
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1105 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1106 1111
1107 my $visible = $w1 > $w2; 1112 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) { 1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1115 $visible ? $self->SUPER::add ($self->{hslider})
1110 : $self->{hslider}->hide; 1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1111 } 1118 }
1112 1119
1120 if ($self->{scroll_y}) {
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1114 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1115 1123
1116 my $visible = $h1 > $h2; 1124 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) { 1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1127 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->{vslider}->hide; 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);
1120 } 1148 };
1121}
1122
1123sub update {
1124 my ($self) = @_;
1125
1126 $self->SUPER::update;
1127 $self->update_slider;
1128} 1149}
1129 1150
1130sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1131 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1132 1153
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $self->{vslider}->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};
1136 1156
1137 1 1157 1
1138} 1158}
1139 1159
1140sub invoke_button_down { 1160sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1142 1162
1143 if ($ev->{button} == 2) { 1163 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1164 $self->start_dragging ($ev);
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1148
1149 $self->{vp}->set_offset (
1150 $self->{vp}{view_x} - $ev->{xrel},
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1154
1155 return 1; 1165 return 1;
1156 } 1166 }
1157 1167
1158 0 1168 0
1159} 1169}
1186 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1187} 1197}
1188 1198
1189############################################################################# 1199#############################################################################
1190 1200
1191package CFPlus::UI::Frame; 1201package dc::UI::Frame;
1192 1202
1193our @ISA = CFPlus::UI::Bin::; 1203our @ISA = dc::UI::Bin::;
1194 1204
1195use CFPlus::OpenGL; 1205use dc::OpenGL;
1196 1206
1197sub new { 1207sub new {
1198 my $class = shift; 1208 my $class = shift;
1199 1209
1200 $class->SUPER::new ( 1210 $class->SUPER::new (
1210 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1211 1221
1212 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1213 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1214 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1215
1216 glBegin GL_QUADS;
1217 glVertex 0 , 0;
1218 glVertex 0 , $h;
1219 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1220 glVertex $w, 0;
1221 glEnd;
1222
1223 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1224 } 1227 }
1225 1228
1226 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1227} 1230}
1228 1231
1229############################################################################# 1232#############################################################################
1230 1233
1231package CFPlus::UI::FancyFrame; 1234package dc::UI::FancyFrame;
1232 1235
1233our @ISA = CFPlus::UI::Bin::; 1236our @ISA = dc::UI::Bin::;
1234 1237
1235use CFPlus::OpenGL; 1238use dc::OpenGL;
1236 1239
1237sub new { 1240sub new {
1238 my ($class, %arg) = @_; 1241 my ($class, %arg) = @_;
1239 1242
1240 if ((exists $arg{label}) && !ref $arg{label}) { 1243 if ((exists $arg{label}) && !ref $arg{label}) {
1241 $arg{label} = new CFPlus::UI::Label 1244 $arg{label} = new dc::UI::Label
1242 align => 1, 1245 align => 1,
1243 valign => 0, 1246 valign => 0,
1244 text => $arg{label}, 1247 text => $arg{label},
1245 fontsize => ($arg{border} || 0.8) * 0.75; 1248 fontsize => ($arg{border} || 0.8) * 0.75;
1246 } 1249 }
1258 1261
1259sub add { 1262sub add {
1260 my ($self, @widgets) = @_; 1263 my ($self, @widgets) = @_;
1261 1264
1262 $self->SUPER::add (@widgets); 1265 $self->SUPER::add (@widgets);
1263 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1266 $self->dc::UI::Container::add ($self->{label}) if $self->{label};
1264} 1267}
1265 1268
1266sub border { 1269sub border {
1267 int $_[0]{border} * $::FONTSIZE 1270 int $_[0]{border} * $::FONTSIZE
1268} 1271}
1326 } 1329 }
1327} 1330}
1328 1331
1329############################################################################# 1332#############################################################################
1330 1333
1331package CFPlus::UI::Toplevel; 1334package dc::UI::Toplevel;
1332 1335
1333our @ISA = CFPlus::UI::Bin::; 1336our @ISA = dc::UI::Bin::;
1334 1337
1335use CFPlus::OpenGL; 1338use dc::OpenGL;
1336 1339
1337my $bg = 1340my $bg =
1338 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1341 new_from_file dc::Texture dc::find_rcfile "d1_bg.png",
1339 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1340 1343
1341my @border = 1344my @border =
1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1343 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);
1344 1351
1345sub new { 1352sub new {
1346 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1347 1354
1348 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
1353 min_w => 64, 1360 min_w => 64,
1354 min_h => 32, 1361 min_h => 32,
1355 %arg, 1362 %arg,
1356 ); 1363 );
1357 1364
1358 $self->{title_widget} = new CFPlus::UI::Label 1365 $self->{title_widget} = new dc::UI::Label
1359 align => 0, 1366 align => 0,
1360 valign => 1, 1367 valign => 1,
1361 text => $self->{title}, 1368 text => $self->{title},
1362 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1363 if exists $self->{title}; 1370 if exists $self->{title};
1364 1371
1365 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1366 $self->{close_button} = 1373 $self->{close_button} =
1367 new CFPlus::UI::ImageButton 1374 new dc::UI::ImageButton
1368 path => 'x1_close.png', 1375 path => 'x1_close.png',
1369 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1370 1377
1371 $self->CFPlus::UI::Container::add ($self->{close_button}); 1378 $self->dc::UI::Container::add ($self->{close_button});
1372 } 1379 }
1373 1380
1374 $self 1381 $self
1375} 1382}
1376 1383
1377sub add { 1384sub add {
1378 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1379 1386
1380 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1381 $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};
1382 $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};
1383} 1390}
1384 1391
1385sub border { 1392sub border {
1386 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
1387} 1403}
1388 1404
1389sub size_request { 1405sub size_request {
1390 my ($self) = @_; 1406 my ($self) = @_;
1391 1407
1517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1518 1534
1519 my $border = $self->border; 1535 my $border = $self->border;
1520 1536
1521 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1522 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1523 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1524 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1525 $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);
1526 1556
1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1529 1559
1530 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
1549 if $self->{close_button}; 1579 if $self->{close_button};
1550} 1580}
1551 1581
1552############################################################################# 1582#############################################################################
1553 1583
1554package CFPlus::UI::Table; 1584package dc::UI::Table;
1555 1585
1556our @ISA = CFPlus::UI::Base::; 1586our @ISA = dc::UI::Container::;
1557 1587
1558use List::Util qw(max sum); 1588use List::Util qw(max sum);
1559 1589
1560use CFPlus::OpenGL; 1590use dc::OpenGL;
1561 1591
1562sub new { 1592sub new {
1563 my $class = shift; 1593 my $class = shift;
1564 1594
1565 $class->SUPER::new ( 1595 $class->SUPER::new (
1566 children => [],
1567 col_expand => [], 1596 col_expand => [],
1568 row_expand => [], 1597 row_expand => [],
1569 @_, 1598 @_,
1570 ) 1599 )
1571} 1600}
1572 1601
1573sub children {
1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1575}
1576
1577# TODO: store row/col info in child widget and use standard add/del
1578sub 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 {
1579 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1580 1617
1581 while (@_) { 1618 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1583 $child->set_parent ($self);
1584 $self->{children}[$y][$x] = $child;
1585 }
1586 1620
1587 $self->{force_realloc} = 1; 1621 $child->{c_row} = $row;
1588 $self->{force_size_alloc} = 1; 1622 $child->{c_col} = $col;
1589 $self->realloc;
1590}
1591 1623
1592sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1593 my ($self, $child) = @_; 1631 my ($self) = @_;
1594 1632
1595 for (@{ $self->{children} }) { 1633 my (@w, @h);
1596 for (@{ $_ || [] }) { 1634
1597 $_ = undef if $_ == $child; 1635 my @children = $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];
1598 } 1645 }
1599 } 1646 }
1600}
1601 1647
1602# TODO: move to container class maybe? send children a signal on removal? 1648 # second pass, rows
1603sub clear { 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1604 my ($self) = @_;
1605
1606 my @children = $self->children;
1607 delete $self->{children};
1608
1609 for (@children) {
1610 delete $_->{parent};
1611 $_->hide;
1612 }
1613
1614 $self->realloc;
1615}
1616
1617sub get_wh {
1618 my ($self) = @_;
1619
1620 my (@w, @h);
1621
1622 for my $y (0 .. $#{$self->{children}}) {
1623 my $row = $self->{children}[$y]
1624 or next;
1625
1626 for my $x (0 .. $#$row) {
1627 my $widget = $row->[$x]
1628 or next;
1629 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1630 1651
1631 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1632 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1633 } 1656 }
1634 } 1657 }
1635 1658
1636 (\@w, \@h) 1659 (\@w, \@h)
1637} 1660}
1653 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1654 1677
1655 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1656 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1657 1680
1658 # TODO: nicer code 1681 # now linearly scale the rows/columns to the allocated size
1659 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1660 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1661 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1662 1685
1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1664 1687
1665 CFPlus::UI::harmonize $ws; 1688 dc::UI::harmonize $ws;
1666 1689
1667 my @row_expand = @{$self->{row_expand}}; 1690 my @row_expand = @{$self->{row_expand}};
1668 @row_expand = (1) x @$ws unless @row_expand; 1691 @row_expand = (1) x @$ws unless @row_expand;
1669 my $row_expand = (sum @row_expand) || 1; 1692 my $row_expand = (sum @row_expand) || 1;
1670 1693
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672 1695
1673 CFPlus::UI::harmonize $hs; 1696 dc::UI::harmonize $hs;
1674 1697
1675 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1676 1700
1677 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1678 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)};
1679 or next;
1680 1703
1681 my $x = 0; 1704 $widget->configure (
1682 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1683 1707 );
1684 for my $c (0 .. $#$row) {
1685 my $col_w = $ws->[$c];
1686
1687 if (my $widget = $row->[$c]) {
1688 $widget->configure ($x, $y, $col_w, $row_h);
1689 }
1690
1691 $x += $col_w;
1692 }
1693
1694 $y += $row_h;
1695 } 1708 }
1696 1709
1697 1 1710 1
1698} 1711}
1699 1712
1700sub find_widget {
1701 my ($self, $x, $y) = @_;
1702
1703 $x -= $self->{x};
1704 $y -= $self->{y};
1705
1706 my $res;
1707
1708 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1709 $res = $_->find_widget ($x, $y)
1710 and return $res;
1711 }
1712
1713 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1714}
1715
1716sub _draw {
1717 my ($self) = @_;
1718
1719 for (grep $_, @{$self->{children}}) {
1720 $_->draw for grep $_, @$_;
1721 }
1722}
1723
1724############################################################################# 1713#############################################################################
1725 1714
1726package CFPlus::UI::Fixed; 1715package dc::UI::Fixed;
1727 1716
1728use List::Util qw(min max); 1717use List::Util qw(min max);
1729 1718
1730our @ISA = CFPlus::UI::Container::; 1719our @ISA = dc::UI::Container::;
1731
1732sub add {
1733 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1734
1735 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1736 $self->SUPER::add ($child);
1737}
1738 1720
1739sub _scale($$$) { 1721sub _scale($$$) {
1740 my ($mode, $val, $max) = @_; 1722 my ($rel, $val, $max) = @_;
1741 1723
1742 $mode eq "abs" ? $val 1724 $rel ? $val * $max : $val
1743 : $mode eq "rel" ? $val * $max
1744 : 0
1745} 1725}
1746 1726
1747sub size_request { 1727sub size_request {
1748 my ($self) = @_; 1728 my ($self) = @_;
1749 1729
1750 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1751 1731
1752 # determine overall size by querying abs widgets 1732 # determine overall size by querying abs widgets
1753 for my $child ($self->visible_children) { 1733 for my $child ($self->visible_children) {
1754 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1734 unless ($child->{c_rel}) {
1735 my $x = $child->{c_x};
1736 my $y = $child->{c_y};
1755 1737
1756 if ($pos eq "abs") {
1757 $w = _scale $size, $w, $child->{req_w};
1758 $h = _scale $size, $h, $child->{req_h};
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1762 } 1740 }
1763 } 1741 }
1764 1742
1765 my $W = $x2 - $x1; 1743 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1; 1744 my $H = $y2 - $y1;
1767 1745
1768 # now layout remaining widgets 1746 # now layout remaining widgets
1769 for my $child ($self->visible_children) { 1747 for my $child ($self->visible_children) {
1770 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 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;
1771 1751
1772 if ($pos ne "abs") {
1773 $x = _scale $pos, $x, $W;
1774 $y = _scale $pos, $x, $H;
1775 $w = _scale $size, $w, $child->{req_w};
1776 $h = _scale $size, $h, $child->{req_h};
1777
1778 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1779 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1780 } 1754 }
1781 } 1755 }
1782 1756
1783 my $W = $x2 - $x1; 1757 my $W = $x2 - $x1;
1784 my $H = $y2 - $y1; 1758 my $H = $y2 - $y1;
1788 1762
1789sub invoke_size_allocate { 1763sub invoke_size_allocate {
1790 my ($self, $W, $H) = @_; 1764 my ($self, $W, $H) = @_;
1791 1765
1792 for my $child ($self->visible_children) { 1766 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1767 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1768 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1794 1769
1795 $x = _scale $pos, $x, $W; 1770 $x += $child->{c_halign} * $child->{req_w};
1796 $y = _scale $pos, $x, $H; 1771 $y += $child->{c_valign} * $child->{req_h};
1797 $w = _scale $size, $w, $child->{req_w};
1798 $h = _scale $size, $h, $child->{req_h};
1799 1772
1800 $child->configure ($x, $y, $w, $h); 1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1801 } 1774 }
1802 1775
1803 1 1776 1
1804} 1777}
1805 1778
1806############################################################################# 1779#############################################################################
1807 1780
1808package CFPlus::UI::Box; 1781package dc::UI::Box;
1809 1782
1810our @ISA = CFPlus::UI::Container::; 1783our @ISA = dc::UI::Container::;
1811 1784
1812sub size_request { 1785sub size_request {
1813 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1814 1789
1815 $self->{vertical} 1790 $self->{vertical}
1816 ? ( 1791 ? (
1817 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1818 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1819 ) 1794 )
1820 : ( 1795 : (
1821 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1822 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1823 ) 1798 )
1824} 1799}
1825 1800
1826sub invoke_size_allocate { 1801sub invoke_size_allocate {
1827 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
1848 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1849 for 0 .. $#children; 1824 for 0 .. $#children;
1850 } 1825 }
1851 } 1826 }
1852 1827
1853 CFPlus::UI::harmonize \@req; 1828 dc::UI::harmonize \@req;
1854 1829
1855 my $pos = 0; 1830 my $pos = 0;
1856 for (0 .. $#children) { 1831 for (0 .. $#children) {
1857 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1858 $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));
1863 1 1838 1
1864} 1839}
1865 1840
1866############################################################################# 1841#############################################################################
1867 1842
1868package CFPlus::UI::HBox; 1843package dc::UI::HBox;
1869 1844
1870our @ISA = CFPlus::UI::Box::; 1845our @ISA = dc::UI::Box::;
1871 1846
1872sub new { 1847sub new {
1873 my $class = shift; 1848 my $class = shift;
1874 1849
1875 $class->SUPER::new ( 1850 $class->SUPER::new (
1878 ) 1853 )
1879} 1854}
1880 1855
1881############################################################################# 1856#############################################################################
1882 1857
1883package CFPlus::UI::VBox; 1858package dc::UI::VBox;
1884 1859
1885our @ISA = CFPlus::UI::Box::; 1860our @ISA = dc::UI::Box::;
1886 1861
1887sub new { 1862sub new {
1888 my $class = shift; 1863 my $class = shift;
1889 1864
1890 $class->SUPER::new ( 1865 $class->SUPER::new (
1893 ) 1868 )
1894} 1869}
1895 1870
1896############################################################################# 1871#############################################################################
1897 1872
1898package CFPlus::UI::Label; 1873package dc::UI::Label;
1899 1874
1900our @ISA = CFPlus::UI::DrawBG::; 1875our @ISA = dc::UI::DrawBG::;
1901 1876
1902use CFPlus::OpenGL; 1877use dc::OpenGL;
1903 1878
1904sub new { 1879sub new {
1905 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1906 1881
1907 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
1912 #text => initial text 1887 #text => initial text
1913 #markup => initial narkup 1888 #markup => initial narkup
1914 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1915 #style => 0, # render flags 1890 #style => 0, # render flags
1916 ellipsise => 3, # end 1891 ellipsise => 3, # end
1917 layout => (new CFPlus::Layout), 1892 layout => (new dc::Layout),
1918 fontsize => 1, 1893 fontsize => 1,
1919 align => -1, 1894 align => -1,
1920 valign => -1, 1895 valign => -1,
1921 padding_x => 2, 1896 padding_x => 2,
1922 padding_y => 2, 1897 padding_y => 2,
1923 can_events => 0, 1898 can_events => 0,
1924 %arg 1899 %arg
1925 ); 1900 );
1926 1901
1927 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1928 my $layout = new CFPlus::Layout; 1903 my $layout = new dc::Layout;
1929 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1930 $self->{template} = $layout; 1905 $self->{template} = $layout;
1931 } 1906 }
1932 1907
1933 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
1951 1926
1952 delete $self->{ox}; 1927 delete $self->{ox};
1953 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1954} 1929}
1955 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1956sub set_text { 1937sub set_text {
1957 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1958 1939
1959 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1960 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
1983 1964
1984sub size_request { 1965sub size_request {
1985 my ($self) = @_; 1966 my ($self) = @_;
1986 1967
1987 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1988 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1989 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1990 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1991 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1992 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1993 1976
1994 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
2066 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
2067 2050
2068 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2069 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2070 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2071 }; 2056 };
2072 2057
2073 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
2074 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = dc::OpenGL::glGenList;
2075 2060# dc::OpenGL::glNewList $self->{list};
2076 $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;
2077} 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#}
2078 2077
2079############################################################################# 2078#############################################################################
2080 2079
2081package CFPlus::UI::EntryBase; 2080package dc::UI::EntryBase;
2082 2081
2083our @ISA = CFPlus::UI::Label::; 2082our @ISA = dc::UI::Label::;
2084 2083
2085use CFPlus::OpenGL; 2084use dc::OpenGL;
2086 2085
2087sub new { 2086sub new {
2088 my $class = shift; 2087 my $class = shift;
2089 2088
2090 $class->SUPER::new ( 2089 $class->SUPER::new (
2091 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
2092 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
2093 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
2094 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
2095 can_hover => 1, 2096 can_hover => 1,
2096 can_focus => 1, 2097 can_focus => 1,
2097 valign => 0, 2098 valign => 0,
2098 can_events => 1, 2099 can_events => 1,
2099 ellipsise => 0, 2100 ellipsise => 0,
2155 2156
2156 if ($uni == 8) { 2157 if ($uni == 8) {
2157 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2158 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2158 } elsif ($uni == 127) { 2159 } elsif ($uni == 127) {
2159 substr $text, $self->{cursor}, 1, ""; 2160 substr $text, $self->{cursor}, 1, "";
2160 } elsif ($sym == CFPlus::SDLK_LEFT) { 2161 } elsif ($sym == dc::SDLK_LEFT) {
2161 --$self->{cursor} if $self->{cursor}; 2162 --$self->{cursor} if $self->{cursor};
2162 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2163 } elsif ($sym == dc::SDLK_RIGHT) {
2163 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2164 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2164 } elsif ($sym == CFPlus::SDLK_HOME) { 2165 } elsif ($sym == dc::SDLK_HOME) {
2165 # what a hack 2166 # what a hack
2166 $self->{cursor} = 2167 $self->{cursor} =
2167 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2168 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2168 ? length $1 2169 ? length $1
2169 : 0; 2170 : 0;
2170 } elsif ($sym == CFPlus::SDLK_END) { 2171 } elsif ($sym == dc::SDLK_END) {
2171 # uh, again 2172 # uh, again
2172 $self->{cursor} = 2173 $self->{cursor} =
2173 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2174 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2174 ? $self->{cursor} + length $1 2175 ? $self->{cursor} + length $1
2175 : length $self->{text}; 2176 : length $self->{text};
2239 glColor_premultiply @{$self->{bg}}; 2240 glColor_premultiply @{$self->{bg}};
2240 } 2241 }
2241 2242
2242 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244 glBegin GL_QUADS;
2245 glVertex 0 , 0;
2246 glVertex 0 , $self->{h};
2247 glVertex $self->{w}, $self->{h}; 2245 glRect 0, 0, $self->{w}, $self->{h};
2248 glVertex $self->{w}, 0;
2249 glEnd;
2250 glDisable GL_BLEND; 2246 glDisable GL_BLEND;
2251 2247
2252 $self->SUPER::_draw; 2248 $self->SUPER::_draw;
2253 2249
2254 #TODO: force update every cursor change :( 2250 #TODO: force update every cursor change :(
2256 2252
2257 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2258 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2259 utf8::encode $text; 2255 utf8::encode $text;
2260 2256
2261 @$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);
2262 } 2258 }
2263 2259
2260 glColor_premultiply @{$self->{active_fg}};
2264 glBegin GL_LINES; 2261 glBegin GL_LINES;
2265 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};
2266 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};
2267 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;
2268 } 2279 }
2269} 2280}
2270 2281
2271############################################################################# 2282#############################################################################
2272 2283
2273package CFPlus::UI::Entry; 2284package dc::UI::Entry;
2274 2285
2275our @ISA = CFPlus::UI::EntryBase::; 2286our @ISA = dc::UI::EntryBase::;
2276 2287
2277use CFPlus::OpenGL; 2288use dc::OpenGL;
2278 2289
2279sub invoke_key_down { 2290sub invoke_key_down {
2280 my ($self, $ev) = @_; 2291 my ($self, $ev) = @_;
2281 2292
2282 my $sym = $ev->{sym}; 2293 my $sym = $ev->{sym};
2288 $self->{history_pointer} = -1; 2299 $self->{history_pointer} = -1;
2289 $self->{history_saveback} = ''; 2300 $self->{history_saveback} = '';
2290 $self->emit (activate => $txt); 2301 $self->emit (activate => $txt);
2291 $self->update; 2302 $self->update;
2292 2303
2293 } elsif ($sym == CFPlus::SDLK_UP) { 2304 } elsif ($sym == dc::SDLK_UP) {
2294 if ($self->{history_pointer} < 0) { 2305 if ($self->{history_pointer} < 0) {
2295 $self->{history_saveback} = $self->get_text; 2306 $self->{history_saveback} = $self->get_text;
2296 } 2307 }
2297 if (@{$self->{history} || []} > 0) { 2308 if (@{$self->{history} || []} > 0) {
2298 $self->{history_pointer}++; 2309 $self->{history_pointer}++;
2300 $self->{history_pointer} = @{$self->{history} || []} - 1; 2311 $self->{history_pointer} = @{$self->{history} || []} - 1;
2301 } 2312 }
2302 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2303 } 2314 }
2304 2315
2305 } elsif ($sym == CFPlus::SDLK_DOWN) { 2316 } elsif ($sym == dc::SDLK_DOWN) {
2306 $self->{history_pointer}--; 2317 $self->{history_pointer}--;
2307 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2318 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2308 2319
2309 if ($self->{history_pointer} >= 0) { 2320 if ($self->{history_pointer} >= 0) {
2310 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2321 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2319 1 2330 1
2320} 2331}
2321 2332
2322############################################################################# 2333#############################################################################
2323 2334
2324package CFPlus::UI::TextEdit; 2335package dc::UI::TextEdit;
2325 2336
2326our @ISA = CFPlus::UI::EntryBase::; 2337our @ISA = dc::UI::EntryBase::;
2327 2338
2328use CFPlus::OpenGL; 2339use dc::OpenGL;
2329 2340
2330sub move_cursor_ver { 2341sub move_cursor_ver {
2331 my ($self, $dy) = @_; 2342 my ($self, $dy) = @_;
2332 2343
2333 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2344 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2345sub invoke_key_down { 2356sub invoke_key_down {
2346 my ($self, $ev) = @_; 2357 my ($self, $ev) = @_;
2347 2358
2348 my $sym = $ev->{sym}; 2359 my $sym = $ev->{sym};
2349 2360
2350 if ($sym == CFPlus::SDLK_UP) { 2361 if ($sym == dc::SDLK_UP) {
2351 $self->move_cursor_ver (-1); 2362 $self->move_cursor_ver (-1);
2352 } elsif ($sym == CFPlus::SDLK_DOWN) { 2363 } elsif ($sym == dc::SDLK_DOWN) {
2353 $self->move_cursor_ver (+1); 2364 $self->move_cursor_ver (+1);
2354 } else { 2365 } else {
2355 return $self->SUPER::invoke_key_down ($ev) 2366 return $self->SUPER::invoke_key_down ($ev)
2356 } 2367 }
2357 2368
2358 1 2369 1
2359} 2370}
2360 2371
2361############################################################################# 2372#############################################################################
2362 2373
2363package CFPlus::UI::Button; 2374package dc::UI::ButtonBin;
2364 2375
2365our @ISA = CFPlus::UI::Label::; 2376our @ISA = dc::UI::Bin::;
2366 2377
2367use CFPlus::OpenGL; 2378use dc::OpenGL;
2368 2379
2369my @tex = 2380my @tex =
2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2381 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2371 qw(b1_button_active.png); 2382 qw(b1_button_inactive.png b1_button_active.png);
2372 2383
2373sub new { 2384sub new {
2374 my $class = shift; 2385 my $class = shift;
2375 2386
2376 $class->SUPER::new ( 2387 $class->SUPER::new (
2377 padding_x => 4,
2378 padding_y => 4,
2379 fg => [1, 1, 1],
2380 active_fg => [0, 0, 1],
2381 can_hover => 1, 2388 can_hover => 1,
2382 align => 0, 2389 align => 0,
2383 valign => 0, 2390 valign => 0,
2384 can_events => 1, 2391 can_events => 1,
2385 @_ 2392 @_
2397} 2404}
2398 2405
2399sub _draw { 2406sub _draw {
2400 my ($self) = @_; 2407 my ($self) = @_;
2401 2408
2402 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2403
2404 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
2405 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2406 glColor 0, 0, 0, 1; 2411 glColor 0, 0, 0, 1;
2407 2412
2413 my $tex = $tex[$GRAB == $self];
2408 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2414 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2409 2415
2410 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
2411 2417
2412 $self->SUPER::_draw; 2418 $self->SUPER::_draw;
2413} 2419}
2414 2420
2415############################################################################# 2421#############################################################################
2416 2422
2417package CFPlus::UI::CheckBox; 2423package dc::UI::Button;
2418 2424
2419our @ISA = CFPlus::UI::DrawBG::; 2425our @ISA = dc::UI::Label::;
2426
2427use dc::OpenGL;
2420 2428
2421my @tex = 2429my @tex =
2422 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 }
2423 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2484 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2424 2485
2425use CFPlus::OpenGL; 2486use dc::OpenGL;
2426 2487
2427sub new { 2488sub new {
2428 my $class = shift; 2489 my $class = shift;
2429 2490
2430 $class->SUPER::new ( 2491 $class->SUPER::new (
2470sub _draw { 2531sub _draw {
2471 my ($self) = @_; 2532 my ($self) = @_;
2472 2533
2473 $self->SUPER::_draw; 2534 $self->SUPER::_draw;
2474 2535
2475 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2476 2537
2477 my ($w, $h) = @$self{qw(w h)}; 2538 my ($w, $h) = @$self{qw(w h)};
2478 2539
2479 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;
2480 2541
2487 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2488} 2549}
2489 2550
2490############################################################################# 2551#############################################################################
2491 2552
2492package CFPlus::UI::Image; 2553package dc::UI::Image;
2493 2554
2494our @ISA = CFPlus::UI::Base::; 2555our @ISA = dc::UI::Base::;
2495 2556
2496use CFPlus::OpenGL; 2557use dc::OpenGL;
2497 2558
2498our %texture_cache; 2559our %texture_cache;
2499 2560
2500sub new { 2561sub new {
2501 my $class = shift; 2562 my $class = shift;
2502 2563
2503 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2504 can_events => 0, 2565 can_events => 0,
2566 scale => 1,
2505 @_, 2567 @_,
2506 ); 2568 );
2507 2569
2508 $self->{path} || $self->{tex} 2570 $self->{path} || $self->{tex}
2509 or Carp::croak "'path' or 'tex' attributes required"; 2571 or Carp::croak "'path' or 'tex' attributes required";
2510 2572
2511 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2573 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2512 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;
2513 2575
2514 CFPlus::weaken $texture_cache{$self->{path}}; 2576 dc::weaken $texture_cache{$self->{path}};
2515 2577
2516 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2578 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2517 2579
2518 $self 2580 $self
2519} 2581}
2520 2582
2521sub STORABLE_freeze { 2583sub STORABLE_freeze {
2522 my ($self, $cloning) = @_; 2584 my ($self, $cloning) = @_;
2523 2585
2524 $self->{path} 2586 $self->{path}
2525 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";
2526 2588
2527 $self->{path} 2589 $self->{path}
2528} 2590}
2529 2591
2530sub STORABLE_attach { 2592sub STORABLE_attach {
2534} 2596}
2535 2597
2536sub size_request { 2598sub size_request {
2537 my ($self) = @_; 2599 my ($self) = @_;
2538 2600
2539 ($self->{tex}{w}, $self->{tex}{h}) 2601 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2540} 2602}
2541 2603
2542sub _draw { 2604sub _draw {
2543 my ($self) = @_; 2605 my ($self) = @_;
2544 2606
2554 } 2616 }
2555 2617
2556 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2557 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2558 2620
2559 $tex->draw_quad (0, 0, $w, $h); 2621 $tex->draw_quad_alpha (0, 0, $w, $h);
2560 2622
2561 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2562} 2624}
2563 2625
2564############################################################################# 2626#############################################################################
2565 2627
2566package CFPlus::UI::ImageButton; 2628package dc::UI::ImageButton;
2567 2629
2568our @ISA = CFPlus::UI::Image::; 2630our @ISA = dc::UI::Image::;
2569 2631
2570use CFPlus::OpenGL; 2632use dc::OpenGL;
2571 2633
2572my %textures; 2634my %textures;
2573 2635
2574sub new { 2636sub new {
2575 my $class = shift; 2637 my $class = shift;
2585 can_events => 1, 2647 can_events => 1,
2586 @_ 2648 @_
2587 ); 2649 );
2588} 2650}
2589 2651
2652sub invoke_button_down {
2653 my ($self, $ev, $x, $y) = @_;
2654
2655 1
2656}
2657
2590sub invoke_button_up { 2658sub invoke_button_up {
2591 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2592 2660
2593 $self->emit ("activate") 2661 $self->emit ("activate")
2594 if $x >= 0 && $x < $self->{w} 2662 if $x >= 0 && $x < $self->{w}
2597 1 2665 1
2598} 2666}
2599 2667
2600############################################################################# 2668#############################################################################
2601 2669
2602package CFPlus::UI::VGauge; 2670package dc::UI::VGauge;
2603 2671
2604our @ISA = CFPlus::UI::Base::; 2672our @ISA = dc::UI::Base::;
2605 2673
2606use List::Util qw(min max); 2674use List::Util qw(min max);
2607 2675
2608use CFPlus::OpenGL; 2676use dc::OpenGL;
2609 2677
2610my %tex = ( 2678my %tex = (
2611 food => [ 2679 food => [
2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2613 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2681 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2614 ], 2682 ],
2615 grace => [ 2683 grace => [
2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2684 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2617 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/
2618 ], 2686 ],
2619 hp => [ 2687 hp => [
2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2688 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2621 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2689 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2622 ], 2690 ],
2623 mana => [ 2691 mana => [
2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2625 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/
2626 ], 2694 ],
2627); 2695);
2628 2696
2629# eg. VGauge->new (gauge => 'food'), default gauge: food 2697# eg. VGauge->new (gauge => 'food'), default gauge: food
2732 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2733} 2801}
2734 2802
2735############################################################################# 2803#############################################################################
2736 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
2737package CFPlus::UI::Gauge; 2943package dc::UI::Gauge;
2738 2944
2739our @ISA = CFPlus::UI::VBox::; 2945our @ISA = dc::UI::VBox::;
2740 2946
2741sub new { 2947sub new {
2742 my ($class, %arg) = @_; 2948 my ($class, %arg) = @_;
2743 2949
2744 my $self = $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
2746 can_hover => 1, 2952 can_hover => 1,
2747 can_events => 1, 2953 can_events => 1,
2748 %arg, 2954 %arg,
2749 ); 2955 );
2750 2956
2751 $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");
2752 $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);
2753 $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");
2754 2960
2755 $self 2961 $self
2756} 2962}
2757 2963
2758sub set_fontsize { 2964sub set_fontsize {
2779 $self->{value}->set_text ($val); 2985 $self->{value}->set_text ($val);
2780} 2986}
2781 2987
2782############################################################################# 2988#############################################################################
2783 2989
2784package CFPlus::UI::Slider; 2990package dc::UI::Slider;
2785 2991
2786use strict; 2992use strict;
2787 2993
2788use CFPlus::OpenGL; 2994use dc::OpenGL;
2789 2995
2790our @ISA = CFPlus::UI::DrawBG::; 2996our @ISA = dc::UI::DrawBG::;
2791 2997
2792my @tex = 2998my @tex =
2793 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 2999 map { new_from_file dc::Texture dc::find_rcfile $_ }
2794 qw(s1_slider.png s1_slider_bg.png); 3000 qw(s1_slider.png s1_slider_bg.png);
2795 3001
2796sub new { 3002sub new {
2797 my $class = shift; 3003 my $class = shift;
2798 3004
2866 3072
2867 $self->SUPER::invoke_button_down ($ev, $x, $y); 3073 $self->SUPER::invoke_button_down ($ev, $x, $y);
2868 3074
2869 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3075 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2870 3076
2871 $self->invoke_mouse_motion ($ev, $x, $y) 3077 $self->invoke_mouse_motion ($ev, $x, $y);
3078
3079 1
2872} 3080}
2873 3081
2874sub invoke_mouse_motion { 3082sub invoke_mouse_motion {
2875 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2876 3084
2892sub invoke_mouse_wheel { 3100sub invoke_mouse_wheel {
2893 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2894 3102
2895 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3103 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2896 3104
2897 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3105 my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;
2898 3106
2899 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2900 3108
2901 ! ! $delta 3109 1
2902} 3110}
2903 3111
2904sub update { 3112sub update {
2905 my ($self) = @_; 3113 my ($self) = @_;
2906 3114
2955 glDisable GL_TEXTURE_2D; 3163 glDisable GL_TEXTURE_2D;
2956} 3164}
2957 3165
2958############################################################################# 3166#############################################################################
2959 3167
2960package CFPlus::UI::ValSlider; 3168package dc::UI::ValSlider;
2961 3169
2962our @ISA = CFPlus::UI::HBox::; 3170our @ISA = dc::UI::HBox::;
2963 3171
2964sub new { 3172sub new {
2965 my ($class, %arg) = @_; 3173 my ($class, %arg) = @_;
2966 3174
2967 my $range = delete $arg{range}; 3175 my $range = delete $arg{range};
2968 3176
2969 my $self = $class->SUPER::new ( 3177 my $self = $class->SUPER::new (
2970 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3178 slider => (new dc::UI::Slider expand => 1, range => $range),
2971 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3179 entry => (new dc::UI::Label text => "", template => delete $arg{template}),
2972 to_value => sub { shift }, 3180 to_value => sub { shift },
2973 from_value => sub { shift }, 3181 from_value => sub { shift },
2974 %arg, 3182 %arg,
2975 ); 3183 );
2976 3184
2996sub set_range { shift->{slider}->set_range (@_) } 3204sub set_range { shift->{slider}->set_range (@_) }
2997sub set_value { shift->{slider}->set_value (@_) } 3205sub set_value { shift->{slider}->set_value (@_) }
2998 3206
2999############################################################################# 3207#############################################################################
3000 3208
3001package CFPlus::UI::TextScroller; 3209package dc::UI::TextScroller;
3002 3210
3003our @ISA = CFPlus::UI::HBox::; 3211our @ISA = dc::UI::HBox::;
3004 3212
3005use CFPlus::OpenGL; 3213use dc::OpenGL;
3006 3214
3007sub new { 3215sub new {
3008 my $class = shift; 3216 my $class = shift;
3009 3217
3010 my $self = $class->SUPER::new ( 3218 my $self = $class->SUPER::new (
3012 can_events => 1, 3220 can_events => 1,
3013 indent => 0, 3221 indent => 0,
3014 #font => default_font 3222 #font => default_font
3015 @_, 3223 @_,
3016 3224
3017 layout => (new CFPlus::Layout), 3225 layout => (new dc::Layout),
3018 par => [], 3226 par => [],
3019 max_par => 0, 3227 max_par => 0,
3020 height => 0, 3228 height => 0,
3021 children => [ 3229 children => [
3022 (new CFPlus::UI::Empty expand => 1), 3230 (new dc::UI::Empty expand => 1),
3023 (new CFPlus::UI::Slider vertical => 1), 3231 (new dc::UI::Slider vertical => 1),
3024 ], 3232 ],
3025 ); 3233 );
3026 3234
3027 $self->{children}[1]->connect (changed => sub { $self->update }); 3235 $self->{children}[1]->connect (changed => sub { $self->update });
3028 3236
3037} 3245}
3038 3246
3039sub size_request { 3247sub size_request {
3040 my ($self) = @_; 3248 my ($self) = @_;
3041 3249
3042 my ($empty, $slider) = @{ $self->{children} }; 3250 my ($empty, $slider) = $self->visible_children;
3043 3251
3044 local $self->{children} = [$empty, $slider]; 3252 local $self->{children} = [$empty, $slider];
3045 $self->SUPER::size_request 3253 $self->SUPER::size_request
3046} 3254}
3047 3255
3211 $ROOT->on_post_alloc ($self => sub { 3419 $ROOT->on_post_alloc ($self => sub {
3212 $self->force_uptodate; 3420 $self->force_uptodate;
3213 3421
3214 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3422 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3215 3423
3216 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3424 $self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {
3217 glClearColor 0, 0, 0, 0; 3425 glClearColor 0, 0, 0, 0;
3218 glClear GL_COLOR_BUFFER_BIT; 3426 glClear GL_COLOR_BUFFER_BIT;
3219 3427
3220 package CFPlus::UI::Base; 3428 package dc::UI::Base;
3221 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3429 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3222 (0, 0, $self->{w}, $self->{h}); 3430 (0, 0, $self->{w}, $self->{h});
3223 3431
3224 my $top = int $self->{children}[1]{range}[0]; 3432 my $top = int $self->{children}[1]{range}[0];
3225 3433
3236 3444
3237 if ($y0 < $y + $h && $y < $y1) { 3445 if ($y0 < $y + $h && $y < $y1) {
3238 my $layout = $self->get_layout ($para); 3446 my $layout = $self->get_layout ($para);
3239 3447
3240 $layout->render ($para->{indent}, $y - $y0); 3448 $layout->render ($para->{indent}, $y - $y0);
3449 $layout->draw;
3241 3450
3242 if (my @w = @{ $para->{widget} }) { 3451 if (my @w = @{ $para->{widget} }) {
3243 my @s = $layout->get_shapes; 3452 my @s = $layout->get_shapes;
3244 3453
3245 for (@w) { 3454 for (@w) {
3283 $self->{children}[1]->draw; 3492 $self->{children}[1]->draw;
3284} 3493}
3285 3494
3286############################################################################# 3495#############################################################################
3287 3496
3288package CFPlus::UI::Animator; 3497package dc::UI::Animator;
3289 3498
3290use CFPlus::OpenGL; 3499use dc::OpenGL;
3291 3500
3292our @ISA = CFPlus::UI::Bin::; 3501our @ISA = dc::UI::Bin::;
3293 3502
3294sub moveto { 3503sub moveto {
3295 my ($self, $x, $y) = @_; 3504 my ($self, $x, $y) = @_;
3296 3505
3297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3506 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3325 glPopMatrix; 3534 glPopMatrix;
3326} 3535}
3327 3536
3328############################################################################# 3537#############################################################################
3329 3538
3330package CFPlus::UI::Flopper; 3539package dc::UI::Flopper;
3331 3540
3332our @ISA = CFPlus::UI::Button::; 3541our @ISA = dc::UI::Button::;
3333 3542
3334sub new { 3543sub new {
3335 my $class = shift; 3544 my $class = shift;
3336 3545
3337 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
3349 $self->{other}->toggle_visibility; 3558 $self->{other}->toggle_visibility;
3350} 3559}
3351 3560
3352############################################################################# 3561#############################################################################
3353 3562
3354package CFPlus::UI::Tooltip; 3563package dc::UI::Tooltip;
3355 3564
3356our @ISA = CFPlus::UI::Bin::; 3565our @ISA = dc::UI::Bin::;
3357 3566
3358use CFPlus::OpenGL; 3567use dc::OpenGL;
3359 3568
3360sub new { 3569sub new {
3361 my $class = shift; 3570 my $class = shift;
3362 3571
3363 $class->SUPER::new ( 3572 $class->SUPER::new (
3367} 3576}
3368 3577
3369sub set_tooltip_from { 3578sub set_tooltip_from {
3370 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
3371 3580
3372 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3373 if $widget->{tooltip} =~ /^#(.*)$/;
3374
3375 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 =~ /^#(.*)$/;
3376 3586
3377 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
3378 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
3379 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3380 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
3381 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
3382 } 3592 }
3383 3593
3384 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
3385 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
3386 3596
3387 $self->add (new CFPlus::UI::Label 3597 $self->add (new dc::UI::Label
3388 markup => $tooltip, 3598 markup => $tip,
3389 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3390 fontsize => 0.8, 3600 fontsize => 0.8,
3391 style => 1, # FLAG_INVERSE 3601 style => 1, # FLAG_INVERSE
3392 ellipsise => 0, 3602 ellipsise => 0,
3393 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
3431} 3641}
3432 3642
3433sub _draw { 3643sub _draw {
3434 my ($self) = @_; 3644 my ($self) = @_;
3435 3645
3436 glTranslate 0.375, 0.375;
3437
3438 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
3439 3647
3440 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
3441 glBegin GL_QUADS; 3649 glRect 0, 0, $w, $h;
3442 glVertex 0 , 0;
3443 glVertex 0 , $h;
3444 glVertex $w, $h;
3445 glVertex $w, 0;
3446 glEnd;
3447 3650
3448 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
3449 glBegin GL_LINE_LOOP; 3652 glRect_lineloop .5, .5, $w + .5, $h + .5;
3450 glVertex 0 , 0;
3451 glVertex 0 , $h;
3452 glVertex $w, $h;
3453 glVertex $w, 0;
3454 glEnd;
3455 3653
3456 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
3457 3655
3458 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3459} 3657}
3460 3658
3461############################################################################# 3659#############################################################################
3462 3660
3463package CFPlus::UI::Face; 3661package dc::UI::Face;
3464 3662
3465our @ISA = CFPlus::UI::DrawBG::; 3663our @ISA = dc::UI::DrawBG::;
3466 3664
3467use CFPlus::OpenGL; 3665use dc::OpenGL;
3468 3666
3469sub new { 3667sub new {
3470 my $class = shift; 3668 my $class = shift;
3471 3669
3472 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
3476 can_events => 0, 3674 can_events => 0,
3477 @_, 3675 @_,
3478 ); 3676 );
3479 3677
3480 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self); 3679 dc::weaken (my $widget = $self);
3482 3680
3483 $self->{timer} = Event->timer ( 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3485 hard => 1,
3486 interval => $self->{animspeed},
3487 cb => sub {
3488 return unless $::CONN; 3683 return unless $::CONN;
3489 3684
3685 my $w = $widget
3686 or return;
3687
3490 ++$widget->{frame}; 3688 ++$w->{frame};
3491 $self->update_face; 3689 $w->update_face;
3690
3691 # somehow, $widget can go away
3492 $self->update; 3692 $w->update;
3493 }, 3693 $w->update_timer;
3494 ); 3694 };
3495 3695
3496 $self->update_face; 3696 $self->update_face;
3697 $self->update_timer;
3497 } 3698 }
3498 3699
3499 $self 3700 $self
3500} 3701}
3501 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
3502sub update_face { 3715sub update_face {
3503 my ($self) = @_; 3716 my ($self) = @_;
3504 3717
3505 return unless $::CONN;
3506
3507 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3508 if ($anim && @$anim) {
3509 delete $self->{wait_face};
3510 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3511 }
3512 }
3513}
3514
3515sub size_request {
3516 my ($self) = @_;
3517
3518 if ($::CONN) { 3718 if ($::CONN) {
3519 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3719 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3520 if (my $tex = $::CONN->{texture}[$faceid]) { 3720 if ($anim && @$anim) {
3521 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3721 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3522 } else { 3722 delete $self->{face_change_cb};
3523 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3723
3524 $self->realloc; 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 }
3525 }); 3728 }
3526 } 3729 }
3527 } 3730 }
3528 } 3731 }
3732}
3733
3734sub size_request {
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 }
3529 3750
3530 ($self->{size_w} || 8, $self->{size_h} || 8) 3751 ($self->{size_w} || 8, $self->{size_h} || 8)
3531} 3752}
3532 3753
3533sub update { 3754sub update {
3536 return unless $self->{visible}; 3757 return unless $self->{visible};
3537 3758
3538 $self->SUPER::update; 3759 $self->SUPER::update;
3539} 3760}
3540 3761
3762sub invoke_visibility_change {
3763 my ($self) = @_;
3764
3765 $self->update_timer;
3766
3767 0
3768}
3769
3541sub _draw { 3770sub _draw {
3542 my ($self) = @_; 3771 my ($self) = @_;
3543 3772
3544 return unless $::CONN;
3545
3546 $self->SUPER::_draw; 3773 $self->SUPER::_draw;
3547 3774
3548 my $faceid = $::CONN->{faceid}[$self->{face}] 3775 if (my $tex = $self->{tex}) {
3549 or return;
3550
3551 my $tex = $::CONN->{texture}[$faceid];
3552
3553 if ($tex) {
3554 glEnable GL_TEXTURE_2D; 3776 glEnable GL_TEXTURE_2D;
3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3556 glColor 0, 0, 0, 1; 3778 glColor 0, 0, 0, 1;
3557 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3779 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3558 glDisable GL_TEXTURE_2D; 3780 glDisable GL_TEXTURE_2D;
3560} 3782}
3561 3783
3562sub destroy { 3784sub destroy {
3563 my ($self) = @_; 3785 my ($self) = @_;
3564 3786
3565 $self->{timer}->cancel 3787 (delete $self->{timer})->cancel
3566 if $self->{timer}; 3788 if $self->{timer};
3567 3789
3568 $self->SUPER::destroy; 3790 $self->SUPER::destroy;
3569} 3791}
3570 3792
3571############################################################################# 3793#############################################################################
3572 3794
3573package CFPlus::UI::Buttonbar; 3795package dc::UI::Buttonbar;
3574 3796
3575our @ISA = CFPlus::UI::HBox::; 3797our @ISA = dc::UI::HBox::;
3576 3798
3577# TODO: should actually wrap buttons and other goodies. 3799# TODO: should actually wrap buttons and other goodies.
3578 3800
3579############################################################################# 3801#############################################################################
3580 3802
3581package CFPlus::UI::Menu; 3803package dc::UI::Menu;
3582 3804
3583our @ISA = CFPlus::UI::Toplevel::; 3805our @ISA = dc::UI::Toplevel::;
3584 3806
3585use CFPlus::OpenGL; 3807use dc::OpenGL;
3586 3808
3587sub new { 3809sub new {
3588 my $class = shift; 3810 my $class = shift;
3589 3811
3590 my $self = $class->SUPER::new ( 3812 my $self = $class->SUPER::new (
3591 items => [], 3813 items => [],
3592 z => 100, 3814 z => 100,
3593 @_, 3815 @_,
3594 ); 3816 );
3595 3817
3596 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3818 $self->add ($self->{vbox} = new dc::UI::VBox);
3597 3819
3598 for my $item (@{ $self->{items} }) { 3820 for my $item (@{ $self->{items} }) {
3599 my ($widget, $cb, $tooltip) = @$item; 3821 my ($widget, $cb, $tooltip) = @$item;
3600 3822
3601 # handle various types of items, only text for now 3823 # handle various types of items, only text for now
3602 if (!ref $widget) { 3824 if (!ref $widget) {
3603 if ($widget =~ /\t/) { 3825 if ($widget =~ /\t/) {
3604 my ($left, $right) = split /\t/, $widget, 2; 3826 my ($left, $right) = split /\t/, $widget, 2;
3605 3827
3606 $widget = new CFPlus::UI::HBox 3828 $widget = new dc::UI::HBox
3607 can_hover => 1, 3829 can_hover => 1,
3608 can_events => 1, 3830 can_events => 1,
3609 tooltip => $tooltip, 3831 tooltip => $tooltip,
3610 children => [ 3832 children => [
3611 (new CFPlus::UI::Label markup => $left, expand => 1), 3833 (new dc::UI::Label markup => $left, expand => 1),
3612 (new CFPlus::UI::Label markup => $right, align => +1), 3834 (new dc::UI::Label markup => $right, align => +1),
3613 ], 3835 ],
3614 ; 3836 ;
3615 3837
3616 } else { 3838 } else {
3617 $widget = new CFPlus::UI::Label 3839 $widget = new dc::UI::Label
3618 can_hover => 1, 3840 can_hover => 1,
3619 can_events => 1, 3841 can_events => 1,
3620 markup => $widget, 3842 markup => $widget,
3621 tooltip => $tooltip; 3843 tooltip => $tooltip;
3622 } 3844 }
3670 1 3892 1
3671} 3893}
3672 3894
3673############################################################################# 3895#############################################################################
3674 3896
3675package CFPlus::UI::Multiplexer; 3897package dc::UI::Multiplexer;
3676 3898
3677our @ISA = CFPlus::UI::Container::; 3899our @ISA = dc::UI::Container::;
3678 3900
3679sub new { 3901sub new {
3680 my $class = shift; 3902 my $class = shift;
3681 3903
3682 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
3743 $self->{current}->draw; 3965 $self->{current}->draw;
3744} 3966}
3745 3967
3746############################################################################# 3968#############################################################################
3747 3969
3748package CFPlus::UI::Notebook; 3970package dc::UI::Notebook;
3749 3971
3972use dc::OpenGL;
3973
3750our @ISA = CFPlus::UI::VBox::; 3974our @ISA = dc::UI::VBox::;
3751 3975
3752sub new { 3976sub new {
3753 my $class = shift; 3977 my $class = shift;
3754 3978
3755 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3756 buttonbar => (new CFPlus::UI::Buttonbar), 3980 buttonbar => (new dc::UI::Buttonbar),
3757 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3981 multiplexer => (new dc::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2],
3758 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3759 @_, 3984 @_,
3760 ); 3985 );
3761 3986
3762 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3763 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3988 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3764 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
3765 $self 4024 $self
3766} 4025}
3767 4026
3768sub 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 {
3769 my ($self, $title, $widget, $tooltip) = @_; 4045 my ($self, $title, $widget, $tooltip) = @_;
3770 4046
3771 CFPlus::weaken $self; 4047 $title = [$title, $tooltip] unless ref $title;
4048 $widget->{c_tab} = $title;
3772 4049
3773 $self->{buttonbar}->add (new CFPlus::UI::Button
3774 markup => $title,
3775 tooltip => $tooltip,
3776 on_activate => sub { $self->set_current_page ($widget) },
3777 );
3778
3779 $self->{multiplexer}->add ($widget); 4050 $self->add ($widget);
3780} 4051}
3781 4052
3782sub get_current_page { 4053sub get_current_page {
3783 my ($self) = @_; 4054 my ($self) = @_;
3784 4055
3790 4061
3791 $self->{multiplexer}->set_current_page ($page); 4062 $self->{multiplexer}->set_current_page ($page);
3792 $self->emit (page_changed => $self->{multiplexer}{current}); 4063 $self->emit (page_changed => $self->{multiplexer}{current});
3793} 4064}
3794 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
3795############################################################################# 4086#############################################################################
3796 4087
3797package CFPlus::UI::Selector; 4088package dc::UI::Selector;
3798 4089
3799use utf8; 4090use utf8;
3800 4091
3801our @ISA = CFPlus::UI::Button::; 4092our @ISA = dc::UI::Button::;
3802 4093
3803sub new { 4094sub new {
3804 my $class = shift; 4095 my $class = shift;
3805 4096
3806 my $self = $class->SUPER::new ( 4097 my $self = $class->SUPER::new (
3823 my ($value, $title, $tooltip) = @$_; 4114 my ($value, $title, $tooltip) = @$_;
3824 4115
3825 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4116 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3826 } 4117 }
3827 4118
3828 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4119 dc::UI::Menu->new (items => \@menu_items)->popup ($ev);
3829} 4120}
3830 4121
3831sub _set_value { 4122sub _set_value {
3832 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
3833 4124
3834 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
3835 or return; 4127 or return;
3836 4128
3837 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
3838 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
3839 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
3840} 4132}
3841 4133
3842sub set_value { 4134sub set_value {
3843 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3844 4136
3846 4138
3847 $self->_set_value ($value); 4139 $self->_set_value ($value);
3848 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
3849} 4141}
3850 4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
4148}
4149
3851############################################################################# 4150#############################################################################
3852 4151
3853package CFPlus::UI::Statusbox; 4152package dc::UI::Statusbox;
3854 4153
3855our @ISA = CFPlus::UI::VBox::; 4154our @ISA = dc::UI::VBox::;
3856 4155
3857sub new { 4156sub new {
3858 my $class = shift; 4157 my $class = shift;
3859 4158
3860 my $self = $class->SUPER::new ( 4159 my $self = $class->SUPER::new (
3861 fontsize => 0.8, 4160 fontsize => 0.8,
3862 @_, 4161 @_,
3863 ); 4162 );
3864 4163
3865 CFPlus::weaken (my $this = $self); 4164 dc::weaken (my $this = $self);
3866 4165
3867 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3868 4167
3869 $self 4168 $self
3870} 4169}
3871 4170
3872sub reorder { 4171sub reorder {
3873 my ($self) = @_; 4172 my ($self) = @_;
3874 my $NOW = Time::HiRes::time; 4173 my $NOW = Time::HiRes::time;
3875 4174
3876 # freeze display when hovering over any label 4175 # freeze display when hovering over any label
3877 return if $CFPlus::UI::TOOLTIP->{owner} 4176 return if $dc::UI::TOOLTIP->{owner}
3878 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4177 && grep $dc::UI::TOOLTIP->{owner} == $_->{label},
3879 values %{ $self->{item} }; 4178 values %{ $self->{item} };
3880 4179
3881 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
3882 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3883 } 4182 }
4183
4184 $self->{timer}->set (1, 1);
3884 4185
3885 my @widgets; 4186 my @widgets;
3886 4187
3887 my @items = sort { 4188 my @items = sort {
3888 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3889 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3890 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3891
3892 $self->{timer}->interval (1);
3893 4192
3894 my $count = 10 + 1; 4193 my $count = 10 + 1;
3895 for my $item (@items) { 4194 for my $item (@items) {
3896 last unless --$count; 4195 last unless --$count;
3897 4196
3904 for ($short) { 4203 for ($short) {
3905 s/^\s+//; 4204 s/^\s+//;
3906 s/\s+/ /g; 4205 s/\s+/ /g;
3907 } 4206 }
3908 4207
3909 new CFPlus::UI::Label 4208 new dc::UI::Label
3910 markup => $short, 4209 markup => $short,
3911 tooltip => $item->{tooltip}, 4210 tooltip => $item->{tooltip},
3912 tooltip_font => $::FONT_PROP, 4211 tooltip_font => $::FONT_PROP,
3913 tooltip_width => 0.67, 4212 tooltip_width => 0.67,
3914 fontsize => $item->{fontsize} || $self->{fontsize}, 4213 fontsize => $item->{fontsize} || $self->{fontsize},
3921 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3922 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3923 $label->update; 4222 $label->update;
3924 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3925 if $diff < 1; 4224 if $diff < 1;
3926 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3927 } else { 4226 } else {
3928 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3929 } 4228 }
3930 4229
3931 push @widgets, $label; 4230 push @widgets, $label;
3993 $self->SUPER::destroy; 4292 $self->SUPER::destroy;
3994} 4293}
3995 4294
3996############################################################################# 4295#############################################################################
3997 4296
3998package CFPlus::UI::Root; 4297package dc::UI::Root;
3999 4298
4000our @ISA = CFPlus::UI::Container::; 4299our @ISA = dc::UI::Container::;
4001 4300
4002use List::Util qw(min max); 4301use List::Util qw(min max);
4003 4302
4004use CFPlus::OpenGL; 4303use dc::OpenGL;
4005 4304
4006sub new { 4305sub new {
4007 my $class = shift; 4306 my $class = shift;
4008 4307
4009 my $self = $class->SUPER::new ( 4308 my $self = $class->SUPER::new (
4010 visible => 1, 4309 visible => 1,
4011 @_, 4310 @_,
4012 ); 4311 );
4013 4312
4014 CFPlus::weaken ($self->{root} = $self); 4313 dc::weaken ($self->{root} = $self);
4015 4314
4016 $self 4315 $self
4017} 4316}
4018 4317
4019sub size_request { 4318sub size_request {
4067} 4366}
4068 4367
4069sub update { 4368sub update {
4070 my ($self) = @_; 4369 my ($self) = @_;
4071 4370
4072 $::WANT_REFRESH++; 4371 $::WANT_REFRESH = 1;
4073} 4372}
4074 4373
4075sub add { 4374sub add {
4076 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
4077 4376
4114 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
4115 $_->() 4414 $_->()
4116 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
4117 } 4416 }
4118 4417
4119 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
4120 my %queue; 4419 my %queue;
4121 my @queue; 4420 my @queue;
4122 my $widget; 4421 my $widget;
4123 4422
4124 outer: 4423 outer:
4171 } 4470 }
4172 } 4471 }
4173 4472
4174 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
4175 } 4474 }
4176 }
4177 4475
4178 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
4179 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
4180 values %$size_alloc; 4478 values %$size_alloc;
4181 4479
4182 while () { 4480 while () {
4183 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
4184 4482
4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4186 4484
4187 $w = 0 if $w < 0;
4188 $h = 0 if $h < 0;
4189
4190 $w = max $widget->{min_w}, $w; 4485 $w = max $widget->{min_w}, $w;
4191 $h = max $widget->{min_h}, $h; 4486 $h = max $widget->{min_h}, $h;
4192 4487
4193# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4194# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4195 4490
4196 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4197 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4198 4493
4199 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
4200 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
4201 4496
4202 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}) {
4203 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
4204 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
4205 4500
4206 $widget->{w} = $w; 4501 $widget->{w} = $w;
4207 $widget->{h} = $h; 4502 $widget->{h} = $h;
4208 4503
4209 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
4210 } 4506 }
4211 } 4507 }
4212 } 4508 }
4213 4509
4214 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {
4215 $_->() 4511 $_->()
4216 for values %{delete $self->{post_alloc_hook}}; 4512 for values %{delete $self->{post_alloc_hook}};
4217 } 4513 }
4218
4219 4514
4220 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4515 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4221 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4516 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4222 glClear GL_COLOR_BUFFER_BIT; 4517 glClear GL_COLOR_BUFFER_BIT;
4223 4518
4226 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4227 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
4228 glLoadIdentity; 4523 glLoadIdentity;
4229 4524
4230 { 4525 {
4231 package CFPlus::UI::Base; 4526 package dc::UI::Base;
4232 4527
4233 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4234 (0, 0, $self->{w}, $self->{h}); 4529 (0, 0, $self->{w}, $self->{h});
4235 4530
4236 $self->_draw; 4531 $self->_draw;
4237 } 4532 }
4238} 4533}
4239 4534
4240############################################################################# 4535#############################################################################
4241 4536
4242package CFPlus::UI; 4537package dc::UI;
4243 4538
4244$ROOT = new CFPlus::UI::Root; 4539$ROOT = new dc::UI::Root;
4245$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4540$TOOLTIP = new dc::UI::Tooltip z => 900;
4246 4541
42471 45421
4248 4543

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines