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.376 by root, Mon Jul 16 20:20:23 2007 UTC vs.
Revision 1.458 by root, Fri Dec 28 15:05:33 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
994 $self->emit (changed => $self->{view_x}, $self->{view_y}); 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);
995 $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 }
996} 978}
997 979
998# 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
999sub coord2local { 981sub coord2local {
1000 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
… …
1015 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
1016 998
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) { 1001 ) {
1020 $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})
1021 } else { 1003 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y) 1004 $self->DC::UI::Base::find_widget ($x, $y)
1023 } 1005 }
1024} 1006}
1025 1007
1026sub _render { 1008sub _render {
1027 my ($self) = @_; 1009 my ($self) = @_;
1028 1010
1029 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};
1030 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};
1031 1013
1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1033 1015
1034 $self->SUPER::_render; 1016 $self->SUPER::_render;
1035} 1017}
1036 1018
1037############################################################################# 1019#############################################################################
1038 1020
1039package CFPlus::UI::ScrolledWindow; 1021package DC::UI::ScrolledWindow;
1040 1022
1041our @ISA = CFPlus::UI::Table::; 1023our @ISA = DC::UI::Table::;
1042 1024
1043sub new { 1025sub new {
1044 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1045 1027
1046 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1047 1029
1048 my $self; 1030 my $self;
1049 1031
1050 my $hslider = new CFPlus::UI::Slider 1032 my $hslider = new DC::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1051 vertical => 0, 1035 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1036 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1037 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1038 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1040 },
1057 ; 1041 ;
1058 1042
1059 my $vslider = new CFPlus::UI::Slider 1043 my $vslider = new DC::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
1060 vertical => 1, 1046 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1048 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1049 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1074 col_expand => [1, 0], 1060 col_expand => [1, 0],
1075 row_expand => [1, 0], 1061 row_expand => [1, 0],
1076 %arg, 1062 %arg,
1077 ); 1063 );
1078 1064
1079 $self->{vp} = new CFPlus::UI::ViewPort 1065 $self->{vp} = new DC::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1080 expand => 1, 1068 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1069 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1070 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1071 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1072 my ($vp, $x, $y) = @_;
1073
1085 $vp->{parent}{hslider}->set_value ($x); 1074 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y); 1075 $vp->{parent}{vslider}->set_value ($y);
1087 1076
1077 0
1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1088 0 1082 0
1089 }, 1083 },
1090 ; 1084 ;
1091 1085
1092 $self->SUPER::add (0, 0, $self->{vp}); 1086 $self->SUPER::add ($self->{vp});
1093 1087
1094 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
1095 1089
1096 $self 1090 $self
1097} 1091}
1098
1099#TODO# update range on size_allocate depending on child
1100 1092
1101sub add { 1093sub add {
1102 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1103 1095
1104 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1105} 1097}
1106 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1107sub update_slider { 1103sub update_slider {
1108 my ($self) = @_; 1104 my ($self) = @_;
1109 1105
1110 my $child = ($self->{vp} or return)->child; 1106 my $child = ($self->{vp} or return)->child;
1111 1107
1108 if ($self->{scroll_x}) {
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1113 $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]);
1114 1111
1115 my $visible = $w1 > $w2; 1112 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) { 1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1115 $visible ? $self->SUPER::add ($self->{hslider})
1118 : $self->{hslider}->hide; 1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1119 } 1118 }
1120 1119
1120 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $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]);
1123 1123
1124 my $visible = $h1 > $h2; 1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) { 1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1127 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $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);
1128 } 1148 };
1129}
1130
1131sub update {
1132 my ($self) = @_;
1133
1134 $self->SUPER::update;
1135 $self->update_slider;
1136} 1149}
1137 1150
1138sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1140 1153
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $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};
1144 1156
1145 1 1157 1
1146} 1158}
1147 1159
1148sub invoke_button_down { 1160sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1150 1162
1151 if ($ev->{button} == 2) { 1163 if ($ev->{button} == 2) {
1152 $self->grab_focus; 1164 $self->start_dragging ($ev);
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1; 1165 return 1;
1165 } 1166 }
1166 1167
1167 0 1168 0
1168} 1169}
… …
1195 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1196} 1197}
1197 1198
1198############################################################################# 1199#############################################################################
1199 1200
1200package CFPlus::UI::Frame; 1201package DC::UI::Frame;
1201 1202
1202our @ISA = CFPlus::UI::Bin::; 1203our @ISA = DC::UI::Bin::;
1203 1204
1204use CFPlus::OpenGL; 1205use DC::OpenGL;
1205 1206
1206sub new { 1207sub new {
1207 my $class = shift; 1208 my $class = shift;
1208 1209
1209 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1219 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1220 1221
1221 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1224
1225 glBegin GL_QUADS;
1226 glVertex 0 , 0;
1227 glVertex 0 , $h;
1228 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1229 glVertex $w, 0;
1230 glEnd;
1231
1232 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1233 } 1227 }
1234 1228
1235 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1236} 1230}
1237 1231
1238############################################################################# 1232#############################################################################
1239 1233
1240package CFPlus::UI::FancyFrame; 1234package DC::UI::FancyFrame;
1241 1235
1242our @ISA = CFPlus::UI::Bin::; 1236our @ISA = DC::UI::Bin::;
1243 1237
1244use CFPlus::OpenGL; 1238use DC::OpenGL;
1245 1239
1246sub new { 1240sub new {
1247 my ($class, %arg) = @_; 1241 my ($class, %arg) = @_;
1248 1242
1249 if ((exists $arg{label}) && !ref $arg{label}) { 1243 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label 1244 $arg{label} = new DC::UI::Label
1251 align => 1, 1245 align => 1,
1252 valign => 0, 1246 valign => 0,
1253 text => $arg{label}, 1247 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75; 1248 fontsize => ($arg{border} || 0.8) * 0.75;
1255 } 1249 }
… …
1267 1261
1268sub add { 1262sub add {
1269 my ($self, @widgets) = @_; 1263 my ($self, @widgets) = @_;
1270 1264
1271 $self->SUPER::add (@widgets); 1265 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1266 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1273} 1267}
1274 1268
1275sub border { 1269sub border {
1276 int $_[0]{border} * $::FONTSIZE 1270 int $_[0]{border} * $::FONTSIZE
1277} 1271}
… …
1335 } 1329 }
1336} 1330}
1337 1331
1338############################################################################# 1332#############################################################################
1339 1333
1340package CFPlus::UI::Toplevel; 1334package DC::UI::Toplevel;
1341 1335
1342our @ISA = CFPlus::UI::Bin::; 1336our @ISA = DC::UI::Bin::;
1343 1337
1344use CFPlus::OpenGL; 1338use DC::OpenGL;
1345 1339
1346my $bg = 1340my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1341 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1348 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1349 1343
1350my @border = 1344my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1352 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);
1353 1351
1354sub new { 1352sub new {
1355 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1356 1354
1357 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
… …
1362 min_w => 64, 1360 min_w => 64,
1363 min_h => 32, 1361 min_h => 32,
1364 %arg, 1362 %arg,
1365 ); 1363 );
1366 1364
1367 $self->{title_widget} = new CFPlus::UI::Label 1365 $self->{title_widget} = new DC::UI::Label
1368 align => 0, 1366 align => 0,
1369 valign => 1, 1367 valign => 1,
1370 text => $self->{title}, 1368 text => $self->{title},
1371 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1372 if exists $self->{title}; 1370 if exists $self->{title};
1373 1371
1374 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1375 $self->{close_button} = 1373 $self->{close_button} =
1376 new CFPlus::UI::ImageButton 1374 new DC::UI::ImageButton
1377 path => 'x1_close.png', 1375 path => 'x1_close.png',
1378 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1379 1377
1380 $self->CFPlus::UI::Container::add ($self->{close_button}); 1378 $self->DC::UI::Container::add ($self->{close_button});
1381 } 1379 }
1382 1380
1383 $self 1381 $self
1384} 1382}
1385 1383
1386sub add { 1384sub add {
1387 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1388 1386
1389 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1390 $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};
1391 $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};
1392} 1390}
1393 1391
1394sub border { 1392sub border {
1395 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
1396} 1403}
1397 1404
1398sub size_request { 1405sub size_request {
1399 my ($self) = @_; 1406 my ($self) = @_;
1400 1407
… …
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1527 1534
1528 my $border = $self->border; 1535 my $border = $self->border;
1529 1536
1530 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1531 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1532 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1533 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1534 $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);
1535 1556
1536 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1537 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1538 1559
1539 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1558 if $self->{close_button}; 1579 if $self->{close_button};
1559} 1580}
1560 1581
1561############################################################################# 1582#############################################################################
1562 1583
1563package CFPlus::UI::Table; 1584package DC::UI::Table;
1564 1585
1565our @ISA = CFPlus::UI::Base::; 1586our @ISA = DC::UI::Container::;
1566 1587
1567use List::Util qw(max sum); 1588use List::Util qw(max sum);
1568 1589
1569use CFPlus::OpenGL; 1590use DC::OpenGL;
1570 1591
1571sub new { 1592sub new {
1572 my $class = shift; 1593 my $class = shift;
1573 1594
1574 $class->SUPER::new ( 1595 $class->SUPER::new (
1575 children => [],
1576 col_expand => [], 1596 col_expand => [],
1577 row_expand => [], 1597 row_expand => [],
1578 @_, 1598 @_,
1579 ) 1599 )
1580} 1600}
1581 1601
1582sub children {
1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1584}
1585
1586# TODO: store row/col info in child widget and use standard add/del
1587sub 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 {
1588 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1589 1617
1590 while (@_) { 1618 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1592 $child->set_parent ($self);
1593 $self->{children}[$y][$x] = $child;
1594 }
1595 1620
1596 $self->{force_realloc} = 1; 1621 $child->{c_row} = $row;
1597 $self->{force_size_alloc} = 1; 1622 $child->{c_col} = $col;
1598 $self->realloc;
1599}
1600 1623
1601sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1602 my ($self, $child) = @_; 1631 my ($self) = @_;
1603 1632
1604 for (@{ $self->{children} }) { 1633 my (@w, @h);
1605 for (@{ $_ || [] }) { 1634
1606 $_ = 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 / $_ : $cs) for @w[$c .. $c + $cs - 1];
1607 } 1645 }
1608 } 1646 }
1609}
1610 1647
1611# TODO: move to container class maybe? send children a signal on removal? 1648 # second pass, rows
1612sub clear { 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1613 my ($self) = @_;
1614
1615 my @children = $self->children;
1616 delete $self->{children};
1617
1618 for (@children) {
1619 delete $_->{parent};
1620 $_->hide;
1621 }
1622
1623 $self->realloc;
1624}
1625
1626sub get_wh {
1627 my ($self) = @_;
1628
1629 my (@w, @h);
1630
1631 for my $y (0 .. $#{$self->{children}}) {
1632 my $row = $self->{children}[$y]
1633 or next;
1634
1635 for my $x (0 .. $#$row) {
1636 my $widget = $row->[$x]
1637 or next;
1638 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1639 1651
1640 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1641 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1642 } 1656 }
1643 } 1657 }
1644 1658
1645 (\@w, \@h) 1659 (\@w, \@h)
1646} 1660}
… …
1662 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1663 1677
1664 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1665 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1666 1680
1667 # TODO: nicer code 1681 # now linearly scale the rows/columns to the allocated size
1668 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1669 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1670 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1671 1685
1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1673 1687
1674 CFPlus::UI::harmonize $ws; 1688 DC::UI::harmonize $ws;
1675 1689
1676 my @row_expand = @{$self->{row_expand}}; 1690 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand; 1691 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1; 1692 my $row_expand = (sum @row_expand) || 1;
1679 1693
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681 1695
1682 CFPlus::UI::harmonize $hs; 1696 DC::UI::harmonize $hs;
1683 1697
1684 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1685 1700
1686 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1687 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)};
1688 or next;
1689 1703
1690 my $x = 0; 1704 $widget->configure (
1691 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1692 1707 );
1693 for my $c (0 .. $#$row) {
1694 my $col_w = $ws->[$c];
1695
1696 if (my $widget = $row->[$c]) {
1697 $widget->configure ($x, $y, $col_w, $row_h);
1698 }
1699
1700 $x += $col_w;
1701 }
1702
1703 $y += $row_h;
1704 } 1708 }
1705 1709
1706 1 1710 1
1707} 1711}
1708 1712
1709sub find_widget {
1710 my ($self, $x, $y) = @_;
1711
1712 $x -= $self->{x};
1713 $y -= $self->{y};
1714
1715 my $res;
1716
1717 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1718 $res = $_->find_widget ($x, $y)
1719 and return $res;
1720 }
1721
1722 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1723}
1724
1725sub _draw {
1726 my ($self) = @_;
1727
1728 for (grep $_, @{$self->{children}}) {
1729 $_->draw for grep $_, @$_;
1730 }
1731}
1732
1733############################################################################# 1713#############################################################################
1734 1714
1735package CFPlus::UI::Fixed; 1715package DC::UI::Fixed;
1736 1716
1737use List::Util qw(min max); 1717use List::Util qw(min max);
1738 1718
1739our @ISA = CFPlus::UI::Container::; 1719our @ISA = DC::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747 1720
1748sub _scale($$$) { 1721sub _scale($$$) {
1749 my ($mode, $val, $max) = @_; 1722 my ($rel, $val, $max) = @_;
1750 1723
1751 $mode eq "abs" ? $val 1724 $rel ? $val * $max : $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754} 1725}
1755 1726
1756sub size_request { 1727sub size_request {
1757 my ($self) = @_; 1728 my ($self) = @_;
1758 1729
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760 1731
1761 # determine overall size by querying abs widgets 1732 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) { 1733 for my $child ($self->visible_children) {
1763 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};
1764 1737
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1771 } 1740 }
1772 } 1741 }
1773 1742
1774 my $W = $x2 - $x1; 1743 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1; 1744 my $H = $y2 - $y1;
1776 1745
1777 # now layout remaining widgets 1746 # now layout remaining widgets
1778 for my $child ($self->visible_children) { 1747 for my $child ($self->visible_children) {
1779 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;
1780 1751
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1789 } 1754 }
1790 } 1755 }
1791 1756
1792 my $W = $x2 - $x1; 1757 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1; 1758 my $H = $y2 - $y1;
… …
1797 1762
1798sub invoke_size_allocate { 1763sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_; 1764 my ($self, $W, $H) = @_;
1800 1765
1801 for my $child ($self->visible_children) { 1766 for my $child ($self->visible_children) {
1802 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;
1803 1769
1804 $x = _scale $pos, $x, $W; 1770 $x += $child->{c_halign} * $child->{req_w};
1805 $y = _scale $pos, $x, $H; 1771 $y += $child->{c_valign} * $child->{req_h};
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808 1772
1809 $child->configure ($x, $y, $w, $h); 1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1810 } 1774 }
1811 1775
1812 1 1776 1
1813} 1777}
1814 1778
1815############################################################################# 1779#############################################################################
1816 1780
1817package CFPlus::UI::Box; 1781package DC::UI::Box;
1818 1782
1819our @ISA = CFPlus::UI::Container::; 1783our @ISA = DC::UI::Container::;
1820 1784
1821sub size_request { 1785sub size_request {
1822 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1823 1789
1824 $self->{vertical} 1790 $self->{vertical}
1825 ? ( 1791 ? (
1826 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1827 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1828 ) 1794 )
1829 : ( 1795 : (
1830 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1831 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1832 ) 1798 )
1833} 1799}
1834 1800
1835sub invoke_size_allocate { 1801sub invoke_size_allocate {
1836 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
… …
1857 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1858 for 0 .. $#children; 1824 for 0 .. $#children;
1859 } 1825 }
1860 } 1826 }
1861 1827
1862 CFPlus::UI::harmonize \@req; 1828 DC::UI::harmonize \@req;
1863 1829
1864 my $pos = 0; 1830 my $pos = 0;
1865 for (0 .. $#children) { 1831 for (0 .. $#children) {
1866 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1867 $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));
… …
1872 1 1838 1
1873} 1839}
1874 1840
1875############################################################################# 1841#############################################################################
1876 1842
1877package CFPlus::UI::HBox; 1843package DC::UI::HBox;
1878 1844
1879our @ISA = CFPlus::UI::Box::; 1845our @ISA = DC::UI::Box::;
1880 1846
1881sub new { 1847sub new {
1882 my $class = shift; 1848 my $class = shift;
1883 1849
1884 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1887 ) 1853 )
1888} 1854}
1889 1855
1890############################################################################# 1856#############################################################################
1891 1857
1892package CFPlus::UI::VBox; 1858package DC::UI::VBox;
1893 1859
1894our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1895 1861
1896sub new { 1862sub new {
1897 my $class = shift; 1863 my $class = shift;
1898 1864
1899 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1902 ) 1868 )
1903} 1869}
1904 1870
1905############################################################################# 1871#############################################################################
1906 1872
1907package CFPlus::UI::Label; 1873package DC::UI::Label;
1908 1874
1909our @ISA = CFPlus::UI::DrawBG::; 1875our @ISA = DC::UI::DrawBG::;
1910 1876
1911use CFPlus::OpenGL; 1877use DC::OpenGL;
1912 1878
1913sub new { 1879sub new {
1914 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1915 1881
1916 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1921 #text => initial text 1887 #text => initial text
1922 #markup => initial narkup 1888 #markup => initial narkup
1923 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1924 #style => 0, # render flags 1890 #style => 0, # render flags
1925 ellipsise => 3, # end 1891 ellipsise => 3, # end
1926 layout => (new CFPlus::Layout), 1892 layout => (new DC::Layout),
1927 fontsize => 1, 1893 fontsize => 1,
1928 align => -1, 1894 align => -1,
1929 valign => -1, 1895 valign => -1,
1930 padding_x => 2, 1896 padding_x => 2,
1931 padding_y => 2, 1897 padding_y => 2,
1932 can_events => 0, 1898 can_events => 0,
1933 %arg 1899 %arg
1934 ); 1900 );
1935 1901
1936 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1937 my $layout = new CFPlus::Layout; 1903 my $layout = new DC::Layout;
1938 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1939 $self->{template} = $layout; 1905 $self->{template} = $layout;
1940 } 1906 }
1941 1907
1942 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
1960 1926
1961 delete $self->{ox}; 1927 delete $self->{ox};
1962 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1963} 1929}
1964 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1965sub set_text { 1937sub set_text {
1966 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1967 1939
1968 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1969 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
… …
1992 1964
1993sub size_request { 1965sub size_request {
1994 my ($self) = @_; 1966 my ($self) = @_;
1995 1967
1996 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1997 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1998 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1999 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2002 1976
2003 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
2075 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
2076 2050
2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2079 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2080 }; 2056 };
2081 2057
2082 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
2083 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = DC::OpenGL::glGenList;
2084 2060# DC::OpenGL::glNewList $self->{list};
2085 $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;
2086} 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#}
2087 2077
2088############################################################################# 2078#############################################################################
2089 2079
2090package CFPlus::UI::EntryBase; 2080package DC::UI::EntryBase;
2091 2081
2092our @ISA = CFPlus::UI::Label::; 2082our @ISA = DC::UI::Label::;
2093 2083
2094use CFPlus::OpenGL; 2084use DC::OpenGL;
2095 2085
2096sub new { 2086sub new {
2097 my $class = shift; 2087 my $class = shift;
2098 2088
2099 $class->SUPER::new ( 2089 $class->SUPER::new (
2100 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
2101 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
2102 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
2103 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
2104 can_hover => 1, 2096 can_hover => 1,
2105 can_focus => 1, 2097 can_focus => 1,
2106 valign => 0, 2098 valign => 0,
2107 can_events => 1, 2099 can_events => 1,
2108 ellipsise => 0, 2100 ellipsise => 0,
2101 padding_x => 4,
2102 padding_y => 2,
2109 #text => ... 2103 #text => ...
2110 #hidden => "*", 2104 #hidden => "*",
2111 @_ 2105 @_
2112 ) 2106 )
2113} 2107}
… …
2164 2158
2165 if ($uni == 8) { 2159 if ($uni == 8) {
2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2167 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
2168 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
2169 } elsif ($sym == CFPlus::SDLK_LEFT) { 2163 } elsif ($sym == DC::SDLK_LEFT) {
2170 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
2171 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2165 } elsif ($sym == DC::SDLK_RIGHT) {
2172 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2173 } elsif ($sym == CFPlus::SDLK_HOME) { 2167 } elsif ($sym == DC::SDLK_HOME) {
2174 # what a hack 2168 # what a hack
2175 $self->{cursor} = 2169 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1 2171 ? length $1
2178 : 0; 2172 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) { 2173 } elsif ($sym == DC::SDLK_END) {
2180 # uh, again 2174 # uh, again
2181 $self->{cursor} = 2175 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1 2177 ? $self->{cursor} + length $1
2184 : length $self->{text}; 2178 : length $self->{text};
… …
2248 glColor_premultiply @{$self->{bg}}; 2242 glColor_premultiply @{$self->{bg}};
2249 } 2243 }
2250 2244
2251 glEnable GL_BLEND; 2245 glEnable GL_BLEND;
2252 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glBegin GL_QUADS;
2254 glVertex 0 , 0;
2255 glVertex 0 , $self->{h};
2256 glVertex $self->{w}, $self->{h}; 2247 glRect 0, 0, $self->{w}, $self->{h};
2257 glVertex $self->{w}, 0;
2258 glEnd;
2259 glDisable GL_BLEND; 2248 glDisable GL_BLEND;
2260 2249
2261 $self->SUPER::_draw; 2250 $self->SUPER::_draw;
2262 2251
2263 #TODO: force update every cursor change :( 2252 #TODO: force update every cursor change :(
… …
2265 2254
2266 unless (exists $self->{cur_h}) { 2255 unless (exists $self->{cur_h}) {
2267 my $text = substr $self->{text}, 0, $self->{cursor}; 2256 my $text = substr $self->{text}, 0, $self->{cursor};
2268 utf8::encode $text; 2257 utf8::encode $text;
2269 2258
2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2259 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2271 } 2260 }
2272 2261
2262 glColor_premultiply @{$self->{active_fg}};
2273 glBegin GL_LINES; 2263 glBegin GL_LINES;
2274 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2264 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2265 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2276 glEnd; 2266 glEnd;
2267
2268 glLineWidth 3;
2269 glColor @{$self->{active_outline}};
2270 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2271 glLineWidth 1;
2272
2273 } else {
2274 glColor @{$self->{outline}};
2275 glBegin GL_LINE_STRIP;
2276 glVertex .5, $self->{h} * .5;
2277 glVertex .5, $self->{h} - 2.5;
2278 glVertex $self->{w} - .5, $self->{h} - 2.5;
2279 glVertex $self->{w} - .5, $self->{h} * .5;
2280 glEnd;
2277 } 2281 }
2278} 2282}
2279 2283
2280############################################################################# 2284#############################################################################
2281 2285
2282package CFPlus::UI::Entry; 2286package DC::UI::Entry;
2283 2287
2284our @ISA = CFPlus::UI::EntryBase::; 2288our @ISA = DC::UI::EntryBase::;
2285 2289
2286use CFPlus::OpenGL; 2290use DC::OpenGL;
2287 2291
2288sub invoke_key_down { 2292sub invoke_key_down {
2289 my ($self, $ev) = @_; 2293 my ($self, $ev) = @_;
2290 2294
2291 my $sym = $ev->{sym}; 2295 my $sym = $ev->{sym};
… …
2297 $self->{history_pointer} = -1; 2301 $self->{history_pointer} = -1;
2298 $self->{history_saveback} = ''; 2302 $self->{history_saveback} = '';
2299 $self->emit (activate => $txt); 2303 $self->emit (activate => $txt);
2300 $self->update; 2304 $self->update;
2301 2305
2302 } elsif ($sym == CFPlus::SDLK_UP) { 2306 } elsif ($sym == DC::SDLK_UP) {
2303 if ($self->{history_pointer} < 0) { 2307 if ($self->{history_pointer} < 0) {
2304 $self->{history_saveback} = $self->get_text; 2308 $self->{history_saveback} = $self->get_text;
2305 } 2309 }
2306 if (@{$self->{history} || []} > 0) { 2310 if (@{$self->{history} || []} > 0) {
2307 $self->{history_pointer}++; 2311 $self->{history_pointer}++;
… …
2309 $self->{history_pointer} = @{$self->{history} || []} - 1; 2313 $self->{history_pointer} = @{$self->{history} || []} - 1;
2310 } 2314 }
2311 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2315 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2312 } 2316 }
2313 2317
2314 } elsif ($sym == CFPlus::SDLK_DOWN) { 2318 } elsif ($sym == DC::SDLK_DOWN) {
2315 $self->{history_pointer}--; 2319 $self->{history_pointer}--;
2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2320 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2317 2321
2318 if ($self->{history_pointer} >= 0) { 2322 if ($self->{history_pointer} >= 0) {
2319 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2323 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2328 1 2332 1
2329} 2333}
2330 2334
2331############################################################################# 2335#############################################################################
2332 2336
2333package CFPlus::UI::TextEdit; 2337package DC::UI::TextEdit;
2334 2338
2335our @ISA = CFPlus::UI::EntryBase::; 2339our @ISA = DC::UI::EntryBase::;
2336 2340
2337use CFPlus::OpenGL; 2341use DC::OpenGL;
2342
2343sub new {
2344 my $class = shift;
2345
2346 $class->SUPER::new (
2347 padding_y => 4,
2348
2349 @_
2350 )
2351}
2338 2352
2339sub move_cursor_ver { 2353sub move_cursor_ver {
2340 my ($self, $dy) = @_; 2354 my ($self, $dy) = @_;
2341 2355
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2356 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343 2357
2344 $y += $dy; 2358 $line += $dy;
2345 2359
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2360 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2347 $self->{cursor} = $index; 2361 $self->{cursor} = $index;
2348 delete $self->{cur_h}; 2362 delete $self->{cur_h};
2349 $self->update; 2363 $self->update;
2350 return; 2364 return;
2351 } 2365 }
… …
2354sub invoke_key_down { 2368sub invoke_key_down {
2355 my ($self, $ev) = @_; 2369 my ($self, $ev) = @_;
2356 2370
2357 my $sym = $ev->{sym}; 2371 my $sym = $ev->{sym};
2358 2372
2359 if ($sym == CFPlus::SDLK_UP) { 2373 if ($sym == DC::SDLK_UP) {
2360 $self->move_cursor_ver (-1); 2374 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) { 2375 } elsif ($sym == DC::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1); 2376 $self->move_cursor_ver (+1);
2363 } else { 2377 } else {
2364 return $self->SUPER::invoke_key_down ($ev) 2378 return $self->SUPER::invoke_key_down ($ev)
2365 } 2379 }
2366 2380
2367 1 2381 1
2368} 2382}
2369 2383
2370############################################################################# 2384#############################################################################
2371 2385
2372package CFPlus::UI::Button; 2386package DC::UI::ButtonBin;
2373 2387
2374our @ISA = CFPlus::UI::Label::; 2388our @ISA = DC::UI::Bin::;
2375 2389
2376use CFPlus::OpenGL; 2390use DC::OpenGL;
2377 2391
2378my @tex = 2392my @tex =
2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2393 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2380 qw(b1_button_active.png); 2394 qw(b1_button_inactive.png b1_button_active.png);
2381 2395
2382sub new { 2396sub new {
2383 my $class = shift; 2397 my $class = shift;
2384 2398
2385 $class->SUPER::new ( 2399 $class->SUPER::new (
2386 padding_x => 4,
2387 padding_y => 4,
2388 fg => [1, 1, 1],
2389 active_fg => [0, 0, 1],
2390 can_hover => 1, 2400 can_hover => 1,
2391 align => 0, 2401 align => 0,
2392 valign => 0, 2402 valign => 0,
2393 can_events => 1, 2403 can_events => 1,
2394 @_ 2404 @_
… …
2406} 2416}
2407 2417
2408sub _draw { 2418sub _draw {
2409 my ($self) = @_; 2419 my ($self) = @_;
2410 2420
2411 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2412
2413 glEnable GL_TEXTURE_2D; 2421 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2422 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1; 2423 glColor 0, 0, 0, 1;
2416 2424
2425 my $tex = $tex[$GRAB == $self];
2417 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2426 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 2427
2419 glDisable GL_TEXTURE_2D; 2428 glDisable GL_TEXTURE_2D;
2420 2429
2421 $self->SUPER::_draw; 2430 $self->SUPER::_draw;
2422} 2431}
2423 2432
2424############################################################################# 2433#############################################################################
2425 2434
2426package CFPlus::UI::CheckBox; 2435package DC::UI::Button;
2427 2436
2428our @ISA = CFPlus::UI::DrawBG::; 2437our @ISA = DC::UI::Label::;
2438
2439use DC::OpenGL;
2429 2440
2430my @tex = 2441my @tex =
2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2442 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2443 qw(b1_button_inactive.png b1_button_active.png);
2444
2445sub new {
2446 my $class = shift;
2447
2448 $class->SUPER::new (
2449 padding_x => 8,
2450 padding_y => 4,
2451 fg => [1.0, 1.0, 1.0],
2452 active_fg => [0.8, 0.8, 0.8],
2453 can_hover => 1,
2454 align => 0,
2455 valign => 0,
2456 can_events => 1,
2457 @_
2458 )
2459}
2460
2461sub invoke_button_up {
2462 my ($self, $ev, $x, $y) = @_;
2463
2464 $self->emit ("activate")
2465 if $x >= 0 && $x < $self->{w}
2466 && $y >= 0 && $y < $self->{h};
2467
2468 1
2469}
2470
2471sub _draw {
2472 my ($self) = @_;
2473
2474 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2475
2476 glEnable GL_TEXTURE_2D;
2477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2478 glColor 0, 0, 0, 1;
2479
2480 my $tex = $tex[$GRAB == $self];
2481 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2482
2483 glDisable GL_TEXTURE_2D;
2484
2485 $self->SUPER::_draw;
2486}
2487
2488#############################################################################
2489
2490package DC::UI::CheckBox;
2491
2492our @ISA = DC::UI::DrawBG::;
2493
2494my @tex =
2495 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2432 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2496 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2433 2497
2434use CFPlus::OpenGL; 2498use DC::OpenGL;
2435 2499
2436sub new { 2500sub new {
2437 my $class = shift; 2501 my $class = shift;
2438 2502
2439 $class->SUPER::new ( 2503 $class->SUPER::new (
… …
2479sub _draw { 2543sub _draw {
2480 my ($self) = @_; 2544 my ($self) = @_;
2481 2545
2482 $self->SUPER::_draw; 2546 $self->SUPER::_draw;
2483 2547
2484 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2548 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2485 2549
2486 my ($w, $h) = @$self{qw(w h)}; 2550 my ($w, $h) = @$self{qw(w h)};
2487 2551
2488 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2552 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2489 2553
… …
2496 glDisable GL_TEXTURE_2D; 2560 glDisable GL_TEXTURE_2D;
2497} 2561}
2498 2562
2499############################################################################# 2563#############################################################################
2500 2564
2501package CFPlus::UI::Image; 2565package DC::UI::Image;
2502 2566
2503our @ISA = CFPlus::UI::Base::; 2567our @ISA = DC::UI::Base::;
2504 2568
2505use CFPlus::OpenGL; 2569use DC::OpenGL;
2506 2570
2507our %texture_cache; 2571our %texture_cache;
2508 2572
2509sub new { 2573sub new {
2510 my $class = shift; 2574 my $class = shift;
2511 2575
2512 my $self = $class->SUPER::new ( 2576 my $self = $class->SUPER::new (
2513 can_events => 0, 2577 can_events => 0,
2578 scale => 1,
2514 @_, 2579 @_,
2515 ); 2580 );
2516 2581
2517 $self->{path} || $self->{tex} 2582 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required"; 2583 or Carp::croak "'path' or 'tex' attributes required";
2519 2584
2520 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2585 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2586 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2522 2587
2523 CFPlus::weaken $texture_cache{$self->{path}}; 2588 DC::weaken $texture_cache{$self->{path}};
2524 2589
2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2590 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2526 2591
2527 $self 2592 $self
2528} 2593}
2529 2594
2530sub STORABLE_freeze { 2595sub STORABLE_freeze {
2531 my ($self, $cloning) = @_; 2596 my ($self, $cloning) = @_;
2532 2597
2533 $self->{path} 2598 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2599 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2535 2600
2536 $self->{path} 2601 $self->{path}
2537} 2602}
2538 2603
2539sub STORABLE_attach { 2604sub STORABLE_attach {
… …
2543} 2608}
2544 2609
2545sub size_request { 2610sub size_request {
2546 my ($self) = @_; 2611 my ($self) = @_;
2547 2612
2548 ($self->{tex}{w}, $self->{tex}{h}) 2613 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2549} 2614}
2550 2615
2551sub _draw { 2616sub _draw {
2552 my ($self) = @_; 2617 my ($self) = @_;
2553 2618
… …
2563 } 2628 }
2564 2629
2565 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2567 2632
2568 $tex->draw_quad (0, 0, $w, $h); 2633 $tex->draw_quad_alpha (0, 0, $w, $h);
2569 2634
2570 glDisable GL_TEXTURE_2D; 2635 glDisable GL_TEXTURE_2D;
2571} 2636}
2572 2637
2573############################################################################# 2638#############################################################################
2574 2639
2575package CFPlus::UI::ImageButton; 2640package DC::UI::ImageButton;
2576 2641
2577our @ISA = CFPlus::UI::Image::; 2642our @ISA = DC::UI::Image::;
2578 2643
2579use CFPlus::OpenGL; 2644use DC::OpenGL;
2580 2645
2581my %textures; 2646my %textures;
2582 2647
2583sub new { 2648sub new {
2584 my $class = shift; 2649 my $class = shift;
… …
2594 can_events => 1, 2659 can_events => 1,
2595 @_ 2660 @_
2596 ); 2661 );
2597} 2662}
2598 2663
2664sub invoke_button_down {
2665 my ($self, $ev, $x, $y) = @_;
2666
2667 1
2668}
2669
2599sub invoke_button_up { 2670sub invoke_button_up {
2600 my ($self, $ev, $x, $y) = @_; 2671 my ($self, $ev, $x, $y) = @_;
2601 2672
2602 $self->emit ("activate") 2673 $self->emit ("activate")
2603 if $x >= 0 && $x < $self->{w} 2674 if $x >= 0 && $x < $self->{w}
… …
2606 1 2677 1
2607} 2678}
2608 2679
2609############################################################################# 2680#############################################################################
2610 2681
2611package CFPlus::UI::VGauge; 2682package DC::UI::VGauge;
2612 2683
2613our @ISA = CFPlus::UI::Base::; 2684our @ISA = DC::UI::Base::;
2614 2685
2615use List::Util qw(min max); 2686use List::Util qw(min max);
2616 2687
2617use CFPlus::OpenGL; 2688use DC::OpenGL;
2618 2689
2619my %tex = ( 2690my %tex = (
2620 food => [ 2691 food => [
2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2692 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2693 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2623 ], 2694 ],
2624 grace => [ 2695 grace => [
2625 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2696 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2697 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2627 ], 2698 ],
2628 hp => [ 2699 hp => [
2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2700 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2701 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2631 ], 2702 ],
2632 mana => [ 2703 mana => [
2633 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2704 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2705 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2635 ], 2706 ],
2636); 2707);
2637 2708
2638# eg. VGauge->new (gauge => 'food'), default gauge: food 2709# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2741 glDisable GL_TEXTURE_2D; 2812 glDisable GL_TEXTURE_2D;
2742} 2813}
2743 2814
2744############################################################################# 2815#############################################################################
2745 2816
2817package DC::UI::Progress;
2818
2819our @ISA = DC::UI::Label::;
2820
2821use DC::OpenGL;
2822
2823sub new {
2824 my ($class, %arg) = @_;
2825
2826 my $self = $class->SUPER::new (
2827 fg => [1, 1, 1],
2828 bg => [0, 0, 1, 0.2],
2829 bar => [0.7, 0.5, 0.1, 0.8],
2830 outline => [0.4, 0.3, 0],
2831 fontsize => 0.9,
2832 valign => 0,
2833 align => 0,
2834 can_events => 1,
2835 ellipsise => 1,
2836 label => "%d%%",
2837 %arg,
2838 );
2839
2840 $self->set_value ($arg{value} || -1);
2841
2842 $self
2843}
2844
2845sub set_label {
2846 my ($self, $label) = @_;
2847
2848 return if $self->{label} eq $label;
2849 $self->{label} = $label;
2850
2851 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2852}
2853
2854sub set_value {
2855 my ($self, $value) = @_;
2856
2857 if ($self->{value} ne $value) {
2858 $self->{value} = $value;
2859
2860 if ($value < 0) {
2861 $self->set_text ("-");
2862 } else {
2863 $self->set_text (sprintf $self->{label}, $value * 100);
2864 }
2865
2866 $self->update;
2867 }
2868}
2869
2870sub _draw {
2871 my ($self) = @_;
2872
2873 glEnable GL_BLEND;
2874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2875
2876 if ($self->{value} >= 0) {
2877 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2878
2879 glColor_premultiply @{$self->{bar}};
2880 glRect 2, 2, $s, $self->{h} - 2;
2881 glColor_premultiply @{$self->{bg}};
2882 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2883 }
2884
2885 glColor_premultiply @{$self->{outline}};
2886 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2887
2888 glDisable GL_BLEND;
2889
2890 {
2891 local $self->{bg}; # do not draw background
2892 $self->SUPER::_draw;
2893 }
2894}
2895
2896#############################################################################
2897
2898package DC::UI::ExperienceProgress;
2899
2900our @ISA = DC::UI::Progress::;
2901
2902sub new {
2903 my ($class, %arg) = @_;
2904
2905 my $self = $class->SUPER::new (
2906 tooltip => sub {
2907 my ($self) = @_;
2908
2909 sprintf "level %d\n%s points\n%s next level\n%s to go",
2910 $self->{lvl},
2911 ::formsep ($self->{exp}),
2912 ::formsep ($self->{nxt}),
2913 ::formsep ($self->{nxt} - $self->{exp}),
2914 },
2915 %arg
2916 );
2917
2918 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2919 if $::CONN;
2920
2921 $self
2922}
2923
2924sub DESTROY {
2925 my ($self) = @_;
2926
2927 delete $::CONN->{on_exp_update}{$self+0}
2928 if $::CONN;
2929
2930 $self->SUPER::DESTROY;
2931}
2932
2933sub set_value {
2934 my ($self, $lvl, $exp) = @_;
2935
2936 $self->{lvl} = $lvl;
2937 $self->{exp} = $exp;
2938
2939 my $v = -1;
2940
2941 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2942 my $l0 = $table->[$lvl - 1];
2943 my $l1 = $table->[$lvl];
2944
2945 $self->{nxt} = $l1;
2946
2947 $v = ($exp - $l0) / ($l1 - $l0);
2948 }
2949
2950 $self->SUPER::set_value ($v);
2951}
2952
2953#############################################################################
2954
2746package CFPlus::UI::Gauge; 2955package DC::UI::Gauge;
2747 2956
2748our @ISA = CFPlus::UI::VBox::; 2957our @ISA = DC::UI::VBox::;
2749 2958
2750sub new { 2959sub new {
2751 my ($class, %arg) = @_; 2960 my ($class, %arg) = @_;
2752 2961
2753 my $self = $class->SUPER::new ( 2962 my $self = $class->SUPER::new (
… …
2755 can_hover => 1, 2964 can_hover => 1,
2756 can_events => 1, 2965 can_events => 1,
2757 %arg, 2966 %arg,
2758 ); 2967 );
2759 2968
2760 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2969 $self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999");
2761 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2970 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2971 $self->add ($self->{max} = new DC::UI::Label valign => -1, align => 0, template => "999");
2763 2972
2764 $self 2973 $self
2765} 2974}
2766 2975
2767sub set_fontsize { 2976sub set_fontsize {
… …
2788 $self->{value}->set_text ($val); 2997 $self->{value}->set_text ($val);
2789} 2998}
2790 2999
2791############################################################################# 3000#############################################################################
2792 3001
2793package CFPlus::UI::Slider; 3002package DC::UI::Slider;
2794 3003
2795use strict; 3004use strict;
2796 3005
2797use CFPlus::OpenGL; 3006use DC::OpenGL;
2798 3007
2799our @ISA = CFPlus::UI::DrawBG::; 3008our @ISA = DC::UI::DrawBG::;
2800 3009
2801my @tex = 3010my @tex =
2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3011 map { new_from_file DC::Texture DC::find_rcfile $_ }
2803 qw(s1_slider.png s1_slider_bg.png); 3012 qw(s1_slider.png s1_slider_bg.png);
2804 3013
2805sub new { 3014sub new {
2806 my $class = shift; 3015 my $class = shift;
2807 3016
… …
2875 3084
2876 $self->SUPER::invoke_button_down ($ev, $x, $y); 3085 $self->SUPER::invoke_button_down ($ev, $x, $y);
2877 3086
2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3087 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2879 3088
2880 $self->invoke_mouse_motion ($ev, $x, $y) 3089 $self->invoke_mouse_motion ($ev, $x, $y);
3090
3091 1
2881} 3092}
2882 3093
2883sub invoke_mouse_motion { 3094sub invoke_mouse_motion {
2884 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2885 3096
… …
2901sub invoke_mouse_wheel { 3112sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_; 3113 my ($self, $ev) = @_;
2903 3114
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3115 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905 3116
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3117 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2907 3118
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3119 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909 3120
2910 ! ! $delta 3121 1
2911} 3122}
2912 3123
2913sub update { 3124sub update {
2914 my ($self) = @_; 3125 my ($self) = @_;
2915 3126
… …
2964 glDisable GL_TEXTURE_2D; 3175 glDisable GL_TEXTURE_2D;
2965} 3176}
2966 3177
2967############################################################################# 3178#############################################################################
2968 3179
2969package CFPlus::UI::ValSlider; 3180package DC::UI::ValSlider;
2970 3181
2971our @ISA = CFPlus::UI::HBox::; 3182our @ISA = DC::UI::HBox::;
2972 3183
2973sub new { 3184sub new {
2974 my ($class, %arg) = @_; 3185 my ($class, %arg) = @_;
2975 3186
2976 my $range = delete $arg{range}; 3187 my $range = delete $arg{range};
2977 3188
2978 my $self = $class->SUPER::new ( 3189 my $self = $class->SUPER::new (
2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3190 slider => (new DC::UI::Slider expand => 1, range => $range),
2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3191 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2981 to_value => sub { shift }, 3192 to_value => sub { shift },
2982 from_value => sub { shift }, 3193 from_value => sub { shift },
2983 %arg, 3194 %arg,
2984 ); 3195 );
2985 3196
… …
3005sub set_range { shift->{slider}->set_range (@_) } 3216sub set_range { shift->{slider}->set_range (@_) }
3006sub set_value { shift->{slider}->set_value (@_) } 3217sub set_value { shift->{slider}->set_value (@_) }
3007 3218
3008############################################################################# 3219#############################################################################
3009 3220
3010package CFPlus::UI::TextScroller; 3221package DC::UI::TextScroller;
3011 3222
3012our @ISA = CFPlus::UI::HBox::; 3223our @ISA = DC::UI::HBox::;
3013 3224
3014use CFPlus::OpenGL; 3225use DC::OpenGL;
3015 3226
3016sub new { 3227sub new {
3017 my $class = shift; 3228 my $class = shift;
3018 3229
3019 my $self = $class->SUPER::new ( 3230 my $self = $class->SUPER::new (
… …
3021 can_events => 1, 3232 can_events => 1,
3022 indent => 0, 3233 indent => 0,
3023 #font => default_font 3234 #font => default_font
3024 @_, 3235 @_,
3025 3236
3026 layout => (new CFPlus::Layout), 3237 layout => (new DC::Layout),
3027 par => [], 3238 par => [],
3028 max_par => 0, 3239 max_par => 0,
3029 height => 0, 3240 height => 0,
3030 children => [ 3241 children => [
3031 (new CFPlus::UI::Empty expand => 1), 3242 (new DC::UI::Empty expand => 1),
3032 (new CFPlus::UI::Slider vertical => 1), 3243 (new DC::UI::Slider vertical => 1),
3033 ], 3244 ],
3034 ); 3245 );
3035 3246
3036 $self->{children}[1]->connect (changed => sub { $self->update }); 3247 $self->{children}[1]->connect (changed => sub { $self->update });
3037 3248
… …
3046} 3257}
3047 3258
3048sub size_request { 3259sub size_request {
3049 my ($self) = @_; 3260 my ($self) = @_;
3050 3261
3051 my ($empty, $slider) = @{ $self->{children} }; 3262 my ($empty, $slider) = $self->visible_children;
3052 3263
3053 local $self->{children} = [$empty, $slider]; 3264 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::size_request 3265 $self->SUPER::size_request
3055} 3266}
3056 3267
… …
3220 $ROOT->on_post_alloc ($self => sub { 3431 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate; 3432 $self->force_uptodate;
3222 3433
3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3434 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3224 3435
3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3436 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3226 glClearColor 0, 0, 0, 0; 3437 glClearColor 0, 0, 0, 0;
3227 glClear GL_COLOR_BUFFER_BIT; 3438 glClear GL_COLOR_BUFFER_BIT;
3228 3439
3229 package CFPlus::UI::Base; 3440 package DC::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3441 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h}); 3442 (0, 0, $self->{w}, $self->{h});
3232 3443
3233 my $top = int $self->{children}[1]{range}[0]; 3444 my $top = int $self->{children}[1]{range}[0];
3234 3445
… …
3245 3456
3246 if ($y0 < $y + $h && $y < $y1) { 3457 if ($y0 < $y + $h && $y < $y1) {
3247 my $layout = $self->get_layout ($para); 3458 my $layout = $self->get_layout ($para);
3248 3459
3249 $layout->render ($para->{indent}, $y - $y0); 3460 $layout->render ($para->{indent}, $y - $y0);
3461 $layout->draw;
3250 3462
3251 if (my @w = @{ $para->{widget} }) { 3463 if (my @w = @{ $para->{widget} }) {
3252 my @s = $layout->get_shapes; 3464 my @s = $layout->get_shapes;
3253 3465
3254 for (@w) { 3466 for (@w) {
… …
3292 $self->{children}[1]->draw; 3504 $self->{children}[1]->draw;
3293} 3505}
3294 3506
3295############################################################################# 3507#############################################################################
3296 3508
3297package CFPlus::UI::Animator; 3509package DC::UI::Animator;
3298 3510
3299use CFPlus::OpenGL; 3511use DC::OpenGL;
3300 3512
3301our @ISA = CFPlus::UI::Bin::; 3513our @ISA = DC::UI::Bin::;
3302 3514
3303sub moveto { 3515sub moveto {
3304 my ($self, $x, $y) = @_; 3516 my ($self, $x, $y) = @_;
3305 3517
3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3518 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3334 glPopMatrix; 3546 glPopMatrix;
3335} 3547}
3336 3548
3337############################################################################# 3549#############################################################################
3338 3550
3339package CFPlus::UI::Flopper; 3551package DC::UI::Flopper;
3340 3552
3341our @ISA = CFPlus::UI::Button::; 3553our @ISA = DC::UI::Button::;
3342 3554
3343sub new { 3555sub new {
3344 my $class = shift; 3556 my $class = shift;
3345 3557
3346 my $self = $class->SUPER::new ( 3558 my $self = $class->SUPER::new (
… …
3358 $self->{other}->toggle_visibility; 3570 $self->{other}->toggle_visibility;
3359} 3571}
3360 3572
3361############################################################################# 3573#############################################################################
3362 3574
3363package CFPlus::UI::Tooltip; 3575package DC::UI::Tooltip;
3364 3576
3365our @ISA = CFPlus::UI::Bin::; 3577our @ISA = DC::UI::Bin::;
3366 3578
3367use CFPlus::OpenGL; 3579use DC::OpenGL;
3368 3580
3369sub new { 3581sub new {
3370 my $class = shift; 3582 my $class = shift;
3371 3583
3372 $class->SUPER::new ( 3584 $class->SUPER::new (
… …
3376} 3588}
3377 3589
3378sub set_tooltip_from { 3590sub set_tooltip_from {
3379 my ($self, $widget) = @_; 3591 my ($self, $widget) = @_;
3380 3592
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
3383
3384 my $tooltip = $widget->{tooltip}; 3593 my $tip = $widget->{tooltip};
3594 $tip = $tip->($widget) if "CODE" eq ref $tip;
3595
3596 $tip = DC::Pod::section_label tooltip => $1
3597 if $tip =~ /^#(.*)$/;
3385 3598
3386 if ($ENV{CFPLUS_DEBUG} & 2) { 3599 if ($ENV{CFPLUS_DEBUG} & 2) {
3387 $tooltip .= "\n\n" . (ref $widget) . "\n" 3600 $tip .= "\n\n" . (ref $widget) . "\n"
3388 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3601 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3389 . "req $widget->{req_w} $widget->{req_h}\n" 3602 . "req $widget->{req_w} $widget->{req_h}\n"
3390 . "visible $widget->{visible}"; 3603 . "visible $widget->{visible}";
3391 } 3604 }
3392 3605
3393 $tooltip =~ s/^\n+//; 3606 $tip =~ s/^\n+//;
3394 $tooltip =~ s/\n+$//; 3607 $tip =~ s/\n+$//;
3395 3608
3396 $self->add (new CFPlus::UI::Label 3609 $self->add (new DC::UI::Label
3397 markup => $tooltip, 3610 markup => $tip,
3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3399 fontsize => 0.8, 3612 fontsize => 0.8,
3400 style => 1, # FLAG_INVERSE 3613 style => 1, # FLAG_INVERSE
3401 ellipsise => 0, 3614 ellipsise => 0,
3402 font => ($widget->{tooltip_font} || $::FONT_PROP), 3615 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3440} 3653}
3441 3654
3442sub _draw { 3655sub _draw {
3443 my ($self) = @_; 3656 my ($self) = @_;
3444 3657
3445 glTranslate 0.375, 0.375;
3446
3447 my ($w, $h) = @$self{qw(w h)}; 3658 my ($w, $h) = @$self{qw(w h)};
3448 3659
3449 glColor 1, 0.8, 0.4; 3660 glColor 1, 0.8, 0.4;
3450 glBegin GL_QUADS; 3661 glRect 0, 0, $w, $h;
3451 glVertex 0 , 0;
3452 glVertex 0 , $h;
3453 glVertex $w, $h;
3454 glVertex $w, 0;
3455 glEnd;
3456 3662
3457 glColor 0, 0, 0; 3663 glColor 0, 0, 0;
3458 glBegin GL_LINE_LOOP; 3664 glRect_lineloop .5, .5, $w + .5, $h + .5;
3459 glVertex 0 , 0;
3460 glVertex 0 , $h;
3461 glVertex $w, $h;
3462 glVertex $w, 0;
3463 glEnd;
3464 3665
3465 glTranslate 2 - 0.375, 2 - 0.375; 3666 glTranslate 2, 2;
3466 3667
3467 $self->SUPER::_draw; 3668 $self->SUPER::_draw;
3468} 3669}
3469 3670
3470############################################################################# 3671#############################################################################
3471 3672
3472package CFPlus::UI::Face; 3673package DC::UI::Face;
3473 3674
3474our @ISA = CFPlus::UI::DrawBG::; 3675our @ISA = DC::UI::DrawBG::;
3475 3676
3476use CFPlus::OpenGL; 3677use DC::OpenGL;
3477 3678
3478sub new { 3679sub new {
3479 my $class = shift; 3680 my $class = shift;
3480 3681
3481 my $self = $class->SUPER::new ( 3682 my $self = $class->SUPER::new (
… …
3485 can_events => 0, 3686 can_events => 0,
3486 @_, 3687 @_,
3487 ); 3688 );
3488 3689
3489 if ($self->{anim} && $self->{animspeed}) { 3690 if ($self->{anim} && $self->{animspeed}) {
3490 CFPlus::weaken (my $widget = $self); 3691 DC::weaken (my $widget = $self);
3491 3692
3492 $self->{timer} = Event->timer ( 3693 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3694 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3494 hard => 1,
3495 interval => $self->{animspeed},
3496 cb => sub {
3497 return unless $::CONN; 3695 return unless $::CONN;
3498 3696
3697 my $w = $widget
3698 or return;
3699
3499 ++$widget->{frame}; 3700 ++$w->{frame};
3500 $self->update_face; 3701 $w->update_face;
3702
3703 # somehow, $widget can go away
3501 $self->update; 3704 $w->update;
3502 }, 3705 $w->update_timer;
3503 ); 3706 };
3504 3707
3505 $self->update_face; 3708 $self->update_face;
3709 $self->update_timer;
3506 } 3710 }
3507 3711
3508 $self 3712 $self
3509} 3713}
3510 3714
3715sub update_timer {
3716 my ($self) = @_;
3717
3718 return unless $self->{timer};
3719
3720 if ($self->{visible}) {
3721 $self->{timer}->start;
3722 } else {
3723 $self->{timer}->stop;
3724 }
3725}
3726
3511sub update_face { 3727sub update_face {
3512 my ($self) = @_; 3728 my ($self) = @_;
3513 3729
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
3524sub size_request {
3525 my ($self) = @_;
3526
3527 if ($::CONN) { 3730 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3731 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) { 3732 if ($anim && @$anim) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3733 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3531 } else { 3734 delete $self->{face_change_cb};
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3735
3533 $self->realloc; 3736 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3737 unless ($tex->{name} || $tex->{loading}) {
3738 $tex->upload (sub { $self->reconfigure });
3739 }
3534 }); 3740 }
3535 } 3741 }
3536 } 3742 }
3537 } 3743 }
3744}
3745
3746sub size_request {
3747 my ($self) = @_;
3748
3749 if ($::CONN) {
3750 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3751 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3752 if ($tex->{name}) {
3753 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3754 } elsif (!$tex->{loading}) {
3755 $tex->upload (sub { $self->reconfigure });
3756 }
3757 }
3758
3759 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3760 }
3761 }
3538 3762
3539 ($self->{size_w} || 8, $self->{size_h} || 8) 3763 ($self->{size_w} || 8, $self->{size_h} || 8)
3540} 3764}
3541 3765
3542sub update { 3766sub update {
… …
3545 return unless $self->{visible}; 3769 return unless $self->{visible};
3546 3770
3547 $self->SUPER::update; 3771 $self->SUPER::update;
3548} 3772}
3549 3773
3774sub invoke_visibility_change {
3775 my ($self) = @_;
3776
3777 $self->update_timer;
3778
3779 0
3780}
3781
3550sub _draw { 3782sub _draw {
3551 my ($self) = @_; 3783 my ($self) = @_;
3552 3784
3553 return unless $::CONN;
3554
3555 $self->SUPER::_draw; 3785 $self->SUPER::_draw;
3556 3786
3557 my $faceid = $::CONN->{faceid}[$self->{face}] 3787 if (my $tex = $self->{tex}) {
3558 or return;
3559
3560 my $tex = $::CONN->{texture}[$faceid];
3561
3562 if ($tex) {
3563 glEnable GL_TEXTURE_2D; 3788 glEnable GL_TEXTURE_2D;
3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3565 glColor 0, 0, 0, 1; 3790 glColor 0, 0, 0, 1;
3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3567 glDisable GL_TEXTURE_2D; 3792 glDisable GL_TEXTURE_2D;
… …
3569} 3794}
3570 3795
3571sub destroy { 3796sub destroy {
3572 my ($self) = @_; 3797 my ($self) = @_;
3573 3798
3574 $self->{timer}->cancel 3799 (delete $self->{timer})->cancel
3575 if $self->{timer}; 3800 if $self->{timer};
3576 3801
3577 $self->SUPER::destroy; 3802 $self->SUPER::destroy;
3578} 3803}
3579 3804
3580############################################################################# 3805#############################################################################
3581 3806
3582package CFPlus::UI::Buttonbar; 3807package DC::UI::Buttonbar;
3583 3808
3584our @ISA = CFPlus::UI::HBox::; 3809our @ISA = DC::UI::HBox::;
3585 3810
3586# TODO: should actually wrap buttons and other goodies. 3811# TODO: should actually wrap buttons and other goodies.
3587 3812
3588############################################################################# 3813#############################################################################
3589 3814
3590package CFPlus::UI::Menu; 3815package DC::UI::Menu;
3591 3816
3592our @ISA = CFPlus::UI::Toplevel::; 3817our @ISA = DC::UI::Toplevel::;
3593 3818
3594use CFPlus::OpenGL; 3819use DC::OpenGL;
3595 3820
3596sub new { 3821sub new {
3597 my $class = shift; 3822 my $class = shift;
3598 3823
3599 my $self = $class->SUPER::new ( 3824 my $self = $class->SUPER::new (
3600 items => [], 3825 items => [],
3601 z => 100, 3826 z => 100,
3602 @_, 3827 @_,
3603 ); 3828 );
3604 3829
3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3830 $self->add ($self->{vbox} = new DC::UI::VBox);
3606 3831
3607 for my $item (@{ $self->{items} }) { 3832 for my $item (@{ $self->{items} }) {
3608 my ($widget, $cb, $tooltip) = @$item; 3833 my ($widget, $cb, $tooltip) = @$item;
3609 3834
3610 # handle various types of items, only text for now 3835 # handle various types of items, only text for now
3611 if (!ref $widget) { 3836 if (!ref $widget) {
3612 if ($widget =~ /\t/) { 3837 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2; 3838 my ($left, $right) = split /\t/, $widget, 2;
3614 3839
3615 $widget = new CFPlus::UI::HBox 3840 $widget = new DC::UI::HBox
3616 can_hover => 1, 3841 can_hover => 1,
3617 can_events => 1, 3842 can_events => 1,
3618 tooltip => $tooltip, 3843 tooltip => $tooltip,
3619 children => [ 3844 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1), 3845 (new DC::UI::Label markup => $left, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1), 3846 (new DC::UI::Label markup => $right, align => +1),
3622 ], 3847 ],
3623 ; 3848 ;
3624 3849
3625 } else { 3850 } else {
3626 $widget = new CFPlus::UI::Label 3851 $widget = new DC::UI::Label
3627 can_hover => 1, 3852 can_hover => 1,
3628 can_events => 1, 3853 can_events => 1,
3629 markup => $widget, 3854 markup => $widget,
3630 tooltip => $tooltip; 3855 tooltip => $tooltip;
3631 } 3856 }
… …
3679 1 3904 1
3680} 3905}
3681 3906
3682############################################################################# 3907#############################################################################
3683 3908
3684package CFPlus::UI::Multiplexer; 3909package DC::UI::Multiplexer;
3685 3910
3686our @ISA = CFPlus::UI::Container::; 3911our @ISA = DC::UI::Container::;
3687 3912
3688sub new { 3913sub new {
3689 my $class = shift; 3914 my $class = shift;
3690 3915
3691 my $self = $class->SUPER::new ( 3916 my $self = $class->SUPER::new (
… …
3752 $self->{current}->draw; 3977 $self->{current}->draw;
3753} 3978}
3754 3979
3755############################################################################# 3980#############################################################################
3756 3981
3757package CFPlus::UI::Notebook; 3982package DC::UI::Notebook;
3758 3983
3984use DC::OpenGL;
3985
3759our @ISA = CFPlus::UI::VBox::; 3986our @ISA = DC::UI::VBox::;
3760 3987
3761sub new { 3988sub new {
3762 my $class = shift; 3989 my $class = shift;
3763 3990
3764 my $self = $class->SUPER::new ( 3991 my $self = $class->SUPER::new (
3765 buttonbar => (new CFPlus::UI::Buttonbar), 3992 buttonbar => (new DC::UI::Buttonbar),
3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3993 multiplexer => (new DC::UI::Multiplexer expand => 1),
3994 active_outline => [.7, .7, 0.2],
3767 # filter => # will be put between multiplexer and $self 3995 # filter => # will be put between multiplexer and $self
3768 @_, 3996 @_,
3769 ); 3997 );
3770 3998
3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3999 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3772 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4000 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3773 4001
4002 {
4003 Scalar::Util::weaken (my $wself = $self);
4004
4005 $self->{multiplexer}->connect (c_add => sub {
4006 my ($mplex, $widgets) = @_;
4007
4008 for my $child (@$widgets) {
4009 Scalar::Util::weaken $child;
4010 $child->{c_tab_} ||= do {
4011 my $tab =
4012 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4013 ? $child->{c_tab}
4014 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4015
4016 $tab->connect (activate => sub {
4017 $wself->set_current_page ($child);
4018 });
4019
4020 $tab
4021 };
4022
4023 $self->{buttonbar}->add ($child->{c_tab_});
4024 }
4025 });
4026
4027 $self->{multiplexer}->connect (c_remove => sub {
4028 my ($mplex, $widgets) = @_;
4029
4030 for my $child (@$widgets) {
4031 $wself->{buttonbar}->remove ($child->{c_tab_});
4032 }
4033 });
4034 }
4035
3774 $self 4036 $self
3775} 4037}
3776 4038
3777sub add { 4039sub add {
4040 my ($self, @widgets) = @_;
4041
4042 $self->{multiplexer}->add (@widgets)
4043}
4044
4045sub remove {
4046 my ($self, @widgets) = @_;
4047
4048 $self->{multiplexer}->remove (@widgets)
4049}
4050
4051sub pages {
4052 my ($self) = @_;
4053 $self->{multiplexer}->children
4054}
4055
4056sub add_tab {
3778 my ($self, $title, $widget, $tooltip) = @_; 4057 my ($self, $title, $widget, $tooltip) = @_;
3779 4058
3780 CFPlus::weaken $self; 4059 $title = [$title, $tooltip] unless ref $title;
4060 $widget->{c_tab} = $title;
3781 4061
3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3783 markup => $title,
3784 tooltip => $tooltip,
3785 on_activate => sub { $self->set_current_page ($widget) },
3786 );
3787
3788 $self->{multiplexer}->add ($widget); 4062 $self->add ($widget);
3789} 4063}
3790 4064
3791sub get_current_page { 4065sub get_current_page {
3792 my ($self) = @_; 4066 my ($self) = @_;
3793 4067
… …
3799 4073
3800 $self->{multiplexer}->set_current_page ($page); 4074 $self->{multiplexer}->set_current_page ($page);
3801 $self->emit (page_changed => $self->{multiplexer}{current}); 4075 $self->emit (page_changed => $self->{multiplexer}{current});
3802} 4076}
3803 4077
4078sub _draw {
4079 my ($self) = @_;
4080
4081 $self->SUPER::_draw ();
4082
4083 if (my $cur = $self->{multiplexer}{current}) {
4084 if ($cur = $cur->{c_tab_}) {
4085 glTranslate $self->{buttonbar}{x} + $cur->{x},
4086 $self->{buttonbar}{y} + $cur->{y};
4087 glLineWidth 3;
4088 #glEnable GL_BLEND;
4089 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4090 glColor @{$self->{active_outline}};
4091 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4092 glLineWidth 1;
4093 #glDisable GL_BLEND;
4094 }
4095 }
4096}
4097
3804############################################################################# 4098#############################################################################
3805 4099
3806package CFPlus::UI::Selector; 4100package DC::UI::Selector;
3807 4101
3808use utf8; 4102use utf8;
3809 4103
3810our @ISA = CFPlus::UI::Button::; 4104our @ISA = DC::UI::Button::;
3811 4105
3812sub new { 4106sub new {
3813 my $class = shift; 4107 my $class = shift;
3814 4108
3815 my $self = $class->SUPER::new ( 4109 my $self = $class->SUPER::new (
… …
3832 my ($value, $title, $tooltip) = @$_; 4126 my ($value, $title, $tooltip) = @$_;
3833 4127
3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4128 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3835 } 4129 }
3836 4130
3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4131 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3838} 4132}
3839 4133
3840sub _set_value { 4134sub _set_value {
3841 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3842 4136
3843 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4137 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4138 $item ||= $self->{options}[0]
3844 or return; 4139 or return;
3845 4140
3846 $self->{value} = $item->[0]; 4141 $self->{value} = $item->[0];
3847 $self->set_markup ("$item->[1] ⇓"); 4142 $self->set_markup ("$item->[1] ⇓");
3848 $self->set_tooltip ($item->[2]); 4143# $self->set_tooltip ($item->[2]);
3849} 4144}
3850 4145
3851sub set_value { 4146sub set_value {
3852 my ($self, $value) = @_; 4147 my ($self, $value) = @_;
3853 4148
… …
3855 4150
3856 $self->_set_value ($value); 4151 $self->_set_value ($value);
3857 $self->emit (changed => $value); 4152 $self->emit (changed => $value);
3858} 4153}
3859 4154
4155sub set_options {
4156 my ($self, $options) = @_;
4157
4158 $self->{options} = $options;
4159 $self->_set_value ($self->{value});
4160}
4161
3860############################################################################# 4162#############################################################################
3861 4163
3862package CFPlus::UI::Statusbox; 4164package DC::UI::Statusbox;
3863 4165
3864our @ISA = CFPlus::UI::VBox::; 4166our @ISA = DC::UI::VBox::;
3865 4167
3866sub new { 4168sub new {
3867 my $class = shift; 4169 my $class = shift;
3868 4170
3869 my $self = $class->SUPER::new ( 4171 my $self = $class->SUPER::new (
3870 fontsize => 0.8, 4172 fontsize => 0.8,
3871 @_, 4173 @_,
3872 ); 4174 );
3873 4175
3874 CFPlus::weaken (my $this = $self); 4176 DC::weaken (my $this = $self);
3875 4177
3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4178 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3877 4179
3878 $self 4180 $self
3879} 4181}
3880 4182
3881sub reorder { 4183sub reorder {
3882 my ($self) = @_; 4184 my ($self) = @_;
3883 my $NOW = Time::HiRes::time; 4185 my $NOW = Time::HiRes::time;
3884 4186
3885 # freeze display when hovering over any label 4187 # freeze display when hovering over any label
3886 return if $CFPlus::UI::TOOLTIP->{owner} 4188 return if $DC::UI::TOOLTIP->{owner}
3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4189 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3888 values %{ $self->{item} }; 4190 values %{ $self->{item} };
3889 4191
3890 while (my ($k, $v) = each %{ $self->{item} }) { 4192 while (my ($k, $v) = each %{ $self->{item} }) {
3891 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3892 } 4194 }
4195
4196 $self->{timer}->set (1, 1);
3893 4197
3894 my @widgets; 4198 my @widgets;
3895 4199
3896 my @items = sort { 4200 my @items = sort {
3897 $a->{pri} <=> $b->{pri} 4201 $a->{pri} <=> $b->{pri}
3898 or $b->{id} <=> $a->{id} 4202 or $b->{id} <=> $a->{id}
3899 } values %{ $self->{item} }; 4203 } values %{ $self->{item} };
3900
3901 $self->{timer}->interval (1);
3902 4204
3903 my $count = 10 + 1; 4205 my $count = 10 + 1;
3904 for my $item (@items) { 4206 for my $item (@items) {
3905 last unless --$count; 4207 last unless --$count;
3906 4208
… …
3913 for ($short) { 4215 for ($short) {
3914 s/^\s+//; 4216 s/^\s+//;
3915 s/\s+/ /g; 4217 s/\s+/ /g;
3916 } 4218 }
3917 4219
3918 new CFPlus::UI::Label 4220 new DC::UI::Label
3919 markup => $short, 4221 markup => $short,
3920 tooltip => $item->{tooltip}, 4222 tooltip => $item->{tooltip},
3921 tooltip_font => $::FONT_PROP, 4223 tooltip_font => $::FONT_PROP,
3922 tooltip_width => 0.67, 4224 tooltip_width => 0.67,
3923 fontsize => $item->{fontsize} || $self->{fontsize}, 4225 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3930 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3931 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3932 $label->update; 4234 $label->update;
3933 $label->set_max_size (undef, $label->{req_h} * $diff) 4235 $label->set_max_size (undef, $label->{req_h} * $diff)
3934 if $diff < 1; 4236 if $diff < 1;
3935 $self->{timer}->interval (1/30); 4237 $self->{timer}->set (1/30, 1/30);
3936 } else { 4238 } else {
3937 $label->{fg}[3] = $item->{fg}[3] || 1; 4239 $label->{fg}[3] = $item->{fg}[3] || 1;
3938 } 4240 }
3939 4241
3940 push @widgets, $label; 4242 push @widgets, $label;
… …
4002 $self->SUPER::destroy; 4304 $self->SUPER::destroy;
4003} 4305}
4004 4306
4005############################################################################# 4307#############################################################################
4006 4308
4007package CFPlus::UI::Root; 4309package DC::UI::Root;
4008 4310
4009our @ISA = CFPlus::UI::Container::; 4311our @ISA = DC::UI::Container::;
4010 4312
4011use List::Util qw(min max); 4313use List::Util qw(min max);
4012 4314
4013use CFPlus::OpenGL; 4315use DC::OpenGL;
4014 4316
4015sub new { 4317sub new {
4016 my $class = shift; 4318 my $class = shift;
4017 4319
4018 my $self = $class->SUPER::new ( 4320 my $self = $class->SUPER::new (
4019 visible => 1, 4321 visible => 1,
4020 @_, 4322 @_,
4021 ); 4323 );
4022 4324
4023 CFPlus::weaken ($self->{root} = $self); 4325 DC::weaken ($self->{root} = $self);
4024 4326
4025 $self 4327 $self
4026} 4328}
4027 4329
4028sub size_request { 4330sub size_request {
… …
4076} 4378}
4077 4379
4078sub update { 4380sub update {
4079 my ($self) = @_; 4381 my ($self) = @_;
4080 4382
4081 $::WANT_REFRESH++; 4383 $::WANT_REFRESH = 1;
4082} 4384}
4083 4385
4084sub add { 4386sub add {
4085 my ($self, @children) = @_; 4387 my ($self, @children) = @_;
4086 4388
… …
4123 while ($self->{refresh_hook}) { 4425 while ($self->{refresh_hook}) {
4124 $_->() 4426 $_->()
4125 for values %{delete $self->{refresh_hook}}; 4427 for values %{delete $self->{refresh_hook}};
4126 } 4428 }
4127 4429
4128 if ($self->{realloc}) { 4430 while ($self->{realloc}) {
4129 my %queue; 4431 my %queue;
4130 my @queue; 4432 my @queue;
4131 my $widget; 4433 my $widget;
4132 4434
4133 outer: 4435 outer:
… …
4180 } 4482 }
4181 } 4483 }
4182 4484
4183 delete $self->{realloc}{$widget+0}; 4485 delete $self->{realloc}{$widget+0};
4184 } 4486 }
4185 }
4186 4487
4187 while (my $size_alloc = delete $self->{size_alloc}) { 4488 while (my $size_alloc = delete $self->{size_alloc}) {
4188 my @queue = sort { $b->{visible} <=> $a->{visible} } 4489 my @queue = sort { $a->{visible} <=> $b->{visible} }
4189 values %$size_alloc; 4490 values %$size_alloc;
4190 4491
4191 while () { 4492 while () {
4192 my $widget = pop @queue || last; 4493 my $widget = pop @queue || last;
4193 4494
4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4495 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4195 4496
4196 $w = 0 if $w < 0;
4197 $h = 0 if $h < 0;
4198
4199 $w = max $widget->{min_w}, $w; 4497 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h; 4498 $h = max $widget->{min_h}, $h;
4201 4499
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4500# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4501# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204 4502
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4503 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4504 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207 4505
4208 $w = int $w + 0.5; 4506 $w = int $w + 0.5;
4209 $h = int $h + 0.5; 4507 $h = int $h + 0.5;
4210 4508
4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4509 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4212 $widget->{old_w} = $widget->{w}; 4510 $widget->{old_w} = $widget->{w};
4213 $widget->{old_h} = $widget->{h}; 4511 $widget->{old_h} = $widget->{h};
4214 4512
4215 $widget->{w} = $w; 4513 $widget->{w} = $w;
4216 $widget->{h} = $h; 4514 $widget->{h} = $h;
4217 4515
4218 $widget->emit (size_allocate => $w, $h); 4516 $widget->emit (size_allocate => $w, $h);
4517 }
4219 } 4518 }
4220 } 4519 }
4221 } 4520 }
4222 4521
4223 while ($self->{post_alloc_hook}) { 4522 while ($self->{post_alloc_hook}) {
4224 $_->() 4523 $_->()
4225 for values %{delete $self->{post_alloc_hook}}; 4524 for values %{delete $self->{post_alloc_hook}};
4226 } 4525 }
4227
4228 4526
4229 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4527 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4230 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4528 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4231 glClear GL_COLOR_BUFFER_BIT; 4529 glClear GL_COLOR_BUFFER_BIT;
4232 4530
… …
4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4533 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4236 glMatrixMode GL_MODELVIEW; 4534 glMatrixMode GL_MODELVIEW;
4237 glLoadIdentity; 4535 glLoadIdentity;
4238 4536
4239 { 4537 {
4240 package CFPlus::UI::Base; 4538 package DC::UI::Base;
4241 4539
4242 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4540 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4243 (0, 0, $self->{w}, $self->{h}); 4541 (0, 0, $self->{w}, $self->{h});
4244 4542
4245 $self->_draw; 4543 $self->_draw;
4246 } 4544 }
4247} 4545}
4248 4546
4249############################################################################# 4547#############################################################################
4250 4548
4251package CFPlus::UI; 4549package DC::UI;
4252 4550
4253$ROOT = new CFPlus::UI::Root; 4551$ROOT = new DC::UI::Root;
4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4552$TOOLTIP = new DC::UI::Tooltip z => 900;
4255 4553
42561 45541
4257 4555

Diff Legend

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