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.374 by root, Mon Jul 16 12:36:48 2007 UTC vs.
Revision 1.457 by root, Fri Dec 28 15:05:20 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
908use List::Util qw(min max);
909
949our @ISA = CFPlus::UI::Window::; 910our @ISA = DC::UI::Window::;
950 911
951sub new { 912sub new {
952 my $class = shift; 913 my $class = shift;
953 914
954 $class->SUPER::new ( 915 $class->SUPER::new (
… …
961sub size_request { 922sub size_request {
962 my ($self) = @_; 923 my ($self) = @_;
963 924
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 925 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 926
966 $w = 10 if $self->{scroll_x}; 927 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 928 $h = 1 if $self->{scroll_y};
968 929
969 ($w, $h) 930 ($w, $h)
970} 931}
971 932
972sub invoke_size_allocate { 933sub invoke_size_allocate {
… …
984} 945}
985 946
986sub set_offset { 947sub set_offset {
987 my ($self, $x, $y) = @_; 948 my ($self, $x, $y) = @_;
988 949
950 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
951 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
952
953 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 954 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 955 $self->{view_y} = $y;
991 956
957 $self->emit (changed => $x, $y);
992 $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 }
993} 978}
994 979
995# 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
996sub coord2local { 981sub coord2local {
997 my ($self, $x, $y) = @_; 982 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 997 my ($self, $x, $y) = @_;
1013 998
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 999 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1000 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1001 ) {
1017 $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})
1018 } else { 1003 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1004 $self->DC::UI::Base::find_widget ($x, $y)
1020 } 1005 }
1021} 1006}
1022 1007
1023sub _render { 1008sub _render {
1024 my ($self) = @_; 1009 my ($self) = @_;
1025 1010
1026 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};
1027 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};
1028 1013
1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1014 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1030 1015
1031 $self->SUPER::_render; 1016 $self->SUPER::_render;
1032} 1017}
1033 1018
1034############################################################################# 1019#############################################################################
1035 1020
1036package CFPlus::UI::ScrolledWindow; 1021package DC::UI::ScrolledWindow;
1037 1022
1038our @ISA = CFPlus::UI::Table::; 1023our @ISA = DC::UI::Table::;
1039 1024
1040sub new { 1025sub new {
1041 my ($class, %arg) = @_; 1026 my ($class, %arg) = @_;
1042 1027
1043 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1044 1029
1045 my $self; 1030 my $self;
1046 1031
1047 my $hslider = new CFPlus::UI::Slider 1032 my $hslider = new DC::UI::Slider
1033 c_col => 0,
1034 c_row => 1,
1048 vertical => 0, 1035 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1036 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1037 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1038 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1040 },
1054 ; 1041 ;
1055 1042
1056 my $vslider = new CFPlus::UI::Slider 1043 my $vslider = new DC::UI::Slider
1044 c_col => 1,
1045 c_row => 0,
1057 vertical => 1, 1046 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1048 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1049 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1071 col_expand => [1, 0], 1060 col_expand => [1, 0],
1072 row_expand => [1, 0], 1061 row_expand => [1, 0],
1073 %arg, 1062 %arg,
1074 ); 1063 );
1075 1064
1076 $self->{vp} = new CFPlus::UI::ViewPort 1065 $self->{vp} = new DC::UI::ViewPort
1066 c_col => 0,
1067 c_row => 0,
1077 expand => 1, 1068 expand => 1,
1078 scroll_x => $self->{scroll_x}, 1069 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y}, 1070 scroll_y => $self->{scroll_y},
1071 on_changed => sub {
1072 my ($vp, $x, $y) = @_;
1073
1074 $vp->{parent}{hslider}->set_value ($x);
1075 $vp->{parent}{vslider}->set_value ($y);
1076
1077 0
1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1080 ; 1084 ;
1081 1085
1082 $self->SUPER::add (0, 0, $self->{vp}); 1086 $self->SUPER::add ($self->{vp});
1083 1087
1084 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
1085 1089
1086 $self 1090 $self
1087} 1091}
1088
1089#TODO# update range on size_allocate depending on child
1090 1092
1091sub add { 1093sub add {
1092 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1093 1095
1094 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1095} 1097}
1096 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1103sub update_slider {
1104 my ($self) = @_;
1105
1106 my $child = ($self->{vp} or return)->child;
1107
1108 if ($self->{scroll_x}) {
1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider_visible}) {
1114 $self->{hslider_visible} = $visible;
1115 $visible ? $self->SUPER::add ($self->{hslider})
1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1118 }
1119
1120 if ($self->{scroll_y}) {
1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider_visible}) {
1126 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->SUPER::remove ($self->{vslider});
1129 }
1130 }
1131}
1132
1133sub start_dragging {
1134 my ($self, $ev) = @_;
1135
1136 $self->grab_focus;
1137
1138 my $ox = $self->{vp}{view_x};
1139 my $oy = $self->{vp}{view_y};
1140
1141 $self->{motion} = sub {
1142 my ($ev, $x, $y) = @_;
1143
1144 $ox -= $ev->{xrel};
1145 $oy -= $ev->{yrel};
1146
1147 $self->{vp}->set_offset ($ox, $oy);
1148 };
1149}
1150
1097sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1099 1153
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $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};
1103 1156
1104 1 1157 1
1105} 1158}
1106 1159
1107sub update_slider { 1160sub invoke_button_down {
1108 my ($self) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1109 1162
1110 my $child = ($self->{vp} or return)->child; 1163 if ($ev->{button} == 2) {
1164 $self->start_dragging ($ev);
1165 return 1;
1166 }
1111 1167
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 } 1168 0
1169}
1120 1170
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1171sub invoke_button_up {
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1172 my ($self, $ev, $x, $y) = @_;
1123 1173
1124 my $visible = $h1 > $h2; 1174 if (delete $self->{motion}) {
1125 if ($visible != $self->{vslider}{visible}) { 1175 return 1;
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1176 }
1127 : $self->{vslider}->hide; 1177
1128 } 1178 0
1129} 1179}
1130 1180
1131sub update { 1181sub invoke_mouse_motion {
1132 my ($self) = @_; 1182 my ($self, $ev, $x, $y) = @_;
1133 1183
1134 $self->SUPER::update; 1184 if ($self->{motion}) {
1135 $self->update_slider; 1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1136} 1190}
1137 1191
1138sub invoke_size_allocate { 1192sub invoke_size_allocate {
1139 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1140 1194
… …
1142 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1143} 1197}
1144 1198
1145############################################################################# 1199#############################################################################
1146 1200
1147package CFPlus::UI::Frame; 1201package DC::UI::Frame;
1148 1202
1149our @ISA = CFPlus::UI::Bin::; 1203our @ISA = DC::UI::Bin::;
1150 1204
1151use CFPlus::OpenGL; 1205use DC::OpenGL;
1152 1206
1153sub new { 1207sub new {
1154 my $class = shift; 1208 my $class = shift;
1155 1209
1156 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1166 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1167 1221
1168 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1169 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1170 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1171
1172 glBegin GL_QUADS;
1173 glVertex 0 , 0;
1174 glVertex 0 , $h;
1175 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1176 glVertex $w, 0;
1177 glEnd;
1178
1179 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1180 } 1227 }
1181 1228
1182 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1183} 1230}
1184 1231
1185############################################################################# 1232#############################################################################
1186 1233
1187package CFPlus::UI::FancyFrame; 1234package DC::UI::FancyFrame;
1188 1235
1189our @ISA = CFPlus::UI::Bin::; 1236our @ISA = DC::UI::Bin::;
1190 1237
1191use CFPlus::OpenGL; 1238use DC::OpenGL;
1192 1239
1193sub new { 1240sub new {
1194 my ($class, %arg) = @_; 1241 my ($class, %arg) = @_;
1195 1242
1196 if ((exists $arg{label}) && !ref $arg{label}) { 1243 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label 1244 $arg{label} = new DC::UI::Label
1198 align => 1, 1245 align => 1,
1199 valign => 0, 1246 valign => 0,
1200 text => $arg{label}, 1247 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75; 1248 fontsize => ($arg{border} || 0.8) * 0.75;
1202 } 1249 }
… …
1214 1261
1215sub add { 1262sub add {
1216 my ($self, @widgets) = @_; 1263 my ($self, @widgets) = @_;
1217 1264
1218 $self->SUPER::add (@widgets); 1265 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1266 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1220} 1267}
1221 1268
1222sub border { 1269sub border {
1223 int $_[0]{border} * $::FONTSIZE 1270 int $_[0]{border} * $::FONTSIZE
1224} 1271}
… …
1282 } 1329 }
1283} 1330}
1284 1331
1285############################################################################# 1332#############################################################################
1286 1333
1287package CFPlus::UI::Toplevel; 1334package DC::UI::Toplevel;
1288 1335
1289our @ISA = CFPlus::UI::Bin::; 1336our @ISA = DC::UI::Bin::;
1290 1337
1291use CFPlus::OpenGL; 1338use DC::OpenGL;
1292 1339
1293my $bg = 1340my $bg =
1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1341 new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1295 mipmap => 1, wrap => 1; 1342 mipmap => 1, wrap => 1;
1296 1343
1297my @border = 1344my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1345 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1299 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);
1300 1351
1301sub new { 1352sub new {
1302 my ($class, %arg) = @_; 1353 my ($class, %arg) = @_;
1303 1354
1304 my $self = $class->SUPER::new ( 1355 my $self = $class->SUPER::new (
… …
1309 min_w => 64, 1360 min_w => 64,
1310 min_h => 32, 1361 min_h => 32,
1311 %arg, 1362 %arg,
1312 ); 1363 );
1313 1364
1314 $self->{title_widget} = new CFPlus::UI::Label 1365 $self->{title_widget} = new DC::UI::Label
1315 align => 0, 1366 align => 0,
1316 valign => 1, 1367 valign => 1,
1317 text => $self->{title}, 1368 text => $self->{title},
1318 fontsize => $self->{border}, 1369 fontsize => $self->{border},
1319 if exists $self->{title}; 1370 if exists $self->{title};
1320 1371
1321 if ($self->{has_close_button}) { 1372 if ($self->{has_close_button}) {
1322 $self->{close_button} = 1373 $self->{close_button} =
1323 new CFPlus::UI::ImageButton 1374 new DC::UI::ImageButton
1324 path => 'x1_close.png', 1375 path => 'x1_close.png',
1325 on_activate => sub { $self->emit ("delete") }; 1376 on_activate => sub { $self->emit ("delete") };
1326 1377
1327 $self->CFPlus::UI::Container::add ($self->{close_button}); 1378 $self->DC::UI::Container::add ($self->{close_button});
1328 } 1379 }
1329 1380
1330 $self 1381 $self
1331} 1382}
1332 1383
1333sub add { 1384sub add {
1334 my ($self, @widgets) = @_; 1385 my ($self, @widgets) = @_;
1335 1386
1336 $self->SUPER::add (@widgets); 1387 $self->SUPER::add (@widgets);
1337 $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};
1338 $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};
1339} 1390}
1340 1391
1341sub border { 1392sub border {
1342 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
1343} 1403}
1344 1404
1345sub size_request { 1405sub size_request {
1346 my ($self) = @_; 1406 my ($self) = @_;
1347 1407
… …
1473 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1474 1534
1475 my $border = $self->border; 1535 my $border = $self->border;
1476 1536
1477 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1478 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1479 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1480 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1481 $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);
1482 1556
1483 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1484 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1485 1559
1486 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1505 if $self->{close_button}; 1579 if $self->{close_button};
1506} 1580}
1507 1581
1508############################################################################# 1582#############################################################################
1509 1583
1510package CFPlus::UI::Table; 1584package DC::UI::Table;
1511 1585
1512our @ISA = CFPlus::UI::Base::; 1586our @ISA = DC::UI::Container::;
1513 1587
1514use List::Util qw(max sum); 1588use List::Util qw(max sum);
1515 1589
1516use CFPlus::OpenGL; 1590use DC::OpenGL;
1517 1591
1518sub new { 1592sub new {
1519 my $class = shift; 1593 my $class = shift;
1520 1594
1521 $class->SUPER::new ( 1595 $class->SUPER::new (
1522 children => [],
1523 col_expand => [], 1596 col_expand => [],
1524 row_expand => [], 1597 row_expand => [],
1525 @_, 1598 @_,
1526 ) 1599 )
1527} 1600}
1528 1601
1529sub children {
1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1531}
1532
1533# TODO: store row/col info in child widget and use standard add/del
1534sub 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 {
1535 my ($self) = shift; 1614 my $self = shift;
1615
1616 my @widgets;
1536 1617
1537 while (@_) { 1618 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1539 $child->set_parent ($self);
1540 $self->{children}[$y][$x] = $child;
1541 }
1542 1620
1543 $self->{force_realloc} = 1; 1621 $child->{c_row} = $row;
1544 $self->{force_size_alloc} = 1; 1622 $child->{c_col} = $col;
1545 $self->realloc;
1546}
1547 1623
1548sub remove { 1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1549 my ($self, $child) = @_; 1631 my ($self) = @_;
1550 1632
1551 for (@{ $self->{children} }) { 1633 my (@w, @h);
1552 for (@{ $_ || [] }) { 1634
1553 $_ = 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];
1554 } 1645 }
1555 } 1646 }
1556}
1557 1647
1558# TODO: move to container class maybe? send children a signal on removal? 1648 # second pass, rows
1559sub clear { 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1560 my ($self) = @_;
1561
1562 my @children = $self->children;
1563 delete $self->{children};
1564
1565 for (@children) {
1566 delete $_->{parent};
1567 $_->hide;
1568 }
1569
1570 $self->realloc;
1571}
1572
1573sub get_wh {
1574 my ($self) = @_;
1575
1576 my (@w, @h);
1577
1578 for my $y (0 .. $#{$self->{children}}) {
1579 my $row = $self->{children}[$y]
1580 or next;
1581
1582 for my $x (0 .. $#$row) {
1583 my $widget = $row->[$x]
1584 or next;
1585 my ($w, $h) = @$widget{qw(req_w req_h)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1586 1651
1587 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1588 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1589 } 1656 }
1590 } 1657 }
1591 1658
1592 (\@w, \@h) 1659 (\@w, \@h)
1593} 1660}
… …
1609 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1610 1677
1611 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1612 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1613 1680
1614 # TODO: nicer code 1681 # now linearly scale the rows/columns to the allocated size
1615 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1616 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1617 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1618 1685
1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1620 1687
1621 CFPlus::UI::harmonize $ws; 1688 DC::UI::harmonize $ws;
1622 1689
1623 my @row_expand = @{$self->{row_expand}}; 1690 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand; 1691 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1; 1692 my $row_expand = (sum @row_expand) || 1;
1626 1693
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628 1695
1629 CFPlus::UI::harmonize $hs; 1696 DC::UI::harmonize $hs;
1630 1697
1631 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1632 1700
1633 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1634 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)};
1635 or next;
1636 1703
1637 my $x = 0; 1704 $widget->configure (
1638 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1639 1707 );
1640 for my $c (0 .. $#$row) {
1641 my $col_w = $ws->[$c];
1642
1643 if (my $widget = $row->[$c]) {
1644 $widget->configure ($x, $y, $col_w, $row_h);
1645 }
1646
1647 $x += $col_w;
1648 }
1649
1650 $y += $row_h;
1651 } 1708 }
1652 1709
1653 1 1710 1
1654} 1711}
1655 1712
1656sub find_widget {
1657 my ($self, $x, $y) = @_;
1658
1659 $x -= $self->{x};
1660 $y -= $self->{y};
1661
1662 my $res;
1663
1664 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1665 $res = $_->find_widget ($x, $y)
1666 and return $res;
1667 }
1668
1669 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1670}
1671
1672sub _draw {
1673 my ($self) = @_;
1674
1675 for (grep $_, @{$self->{children}}) {
1676 $_->draw for grep $_, @$_;
1677 }
1678}
1679
1680############################################################################# 1713#############################################################################
1681 1714
1682package CFPlus::UI::Fixed; 1715package DC::UI::Fixed;
1683 1716
1684use List::Util qw(min max); 1717use List::Util qw(min max);
1685 1718
1686our @ISA = CFPlus::UI::Container::; 1719our @ISA = DC::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694 1720
1695sub _scale($$$) { 1721sub _scale($$$) {
1696 my ($mode, $val, $max) = @_; 1722 my ($rel, $val, $max) = @_;
1697 1723
1698 $mode eq "abs" ? $val 1724 $rel ? $val * $max : $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701} 1725}
1702 1726
1703sub size_request { 1727sub size_request {
1704 my ($self) = @_; 1728 my ($self) = @_;
1705 1729
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707 1731
1708 # determine overall size by querying abs widgets 1732 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) { 1733 for my $child ($self->visible_children) {
1710 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};
1711 1737
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1718 } 1740 }
1719 } 1741 }
1720 1742
1721 my $W = $x2 - $x1; 1743 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1; 1744 my $H = $y2 - $y1;
1723 1745
1724 # now layout remaining widgets 1746 # now layout remaining widgets
1725 for my $child ($self->visible_children) { 1747 for my $child ($self->visible_children) {
1726 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;
1727 1751
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736 } 1754 }
1737 } 1755 }
1738 1756
1739 my $W = $x2 - $x1; 1757 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1; 1758 my $H = $y2 - $y1;
… …
1744 1762
1745sub invoke_size_allocate { 1763sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_; 1764 my ($self, $W, $H) = @_;
1747 1765
1748 for my $child ($self->visible_children) { 1766 for my $child ($self->visible_children) {
1749 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;
1750 1769
1751 $x = _scale $pos, $x, $W; 1770 $x += $child->{c_halign} * $child->{req_w};
1752 $y = _scale $pos, $x, $H; 1771 $y += $child->{c_valign} * $child->{req_h};
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755 1772
1756 $child->configure ($x, $y, $w, $h); 1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1757 } 1774 }
1758 1775
1759 1 1776 1
1760} 1777}
1761 1778
1762############################################################################# 1779#############################################################################
1763 1780
1764package CFPlus::UI::Box; 1781package DC::UI::Box;
1765 1782
1766our @ISA = CFPlus::UI::Container::; 1783our @ISA = DC::UI::Container::;
1767 1784
1768sub size_request { 1785sub size_request {
1769 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1770 1789
1771 $self->{vertical} 1790 $self->{vertical}
1772 ? ( 1791 ? (
1773 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1774 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1775 ) 1794 )
1776 : ( 1795 : (
1777 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1778 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1779 ) 1798 )
1780} 1799}
1781 1800
1782sub invoke_size_allocate { 1801sub invoke_size_allocate {
1783 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
… …
1804 $req[$_] += $space * $children[$_]{expand} 1823 $req[$_] += $space * $children[$_]{expand}
1805 for 0 .. $#children; 1824 for 0 .. $#children;
1806 } 1825 }
1807 } 1826 }
1808 1827
1809 CFPlus::UI::harmonize \@req; 1828 DC::UI::harmonize \@req;
1810 1829
1811 my $pos = 0; 1830 my $pos = 0;
1812 for (0 .. $#children) { 1831 for (0 .. $#children) {
1813 my $alloc = $req[$_]; 1832 my $alloc = $req[$_];
1814 $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));
… …
1819 1 1838 1
1820} 1839}
1821 1840
1822############################################################################# 1841#############################################################################
1823 1842
1824package CFPlus::UI::HBox; 1843package DC::UI::HBox;
1825 1844
1826our @ISA = CFPlus::UI::Box::; 1845our @ISA = DC::UI::Box::;
1827 1846
1828sub new { 1847sub new {
1829 my $class = shift; 1848 my $class = shift;
1830 1849
1831 $class->SUPER::new ( 1850 $class->SUPER::new (
… …
1834 ) 1853 )
1835} 1854}
1836 1855
1837############################################################################# 1856#############################################################################
1838 1857
1839package CFPlus::UI::VBox; 1858package DC::UI::VBox;
1840 1859
1841our @ISA = CFPlus::UI::Box::; 1860our @ISA = DC::UI::Box::;
1842 1861
1843sub new { 1862sub new {
1844 my $class = shift; 1863 my $class = shift;
1845 1864
1846 $class->SUPER::new ( 1865 $class->SUPER::new (
… …
1849 ) 1868 )
1850} 1869}
1851 1870
1852############################################################################# 1871#############################################################################
1853 1872
1854package CFPlus::UI::Label; 1873package DC::UI::Label;
1855 1874
1856our @ISA = CFPlus::UI::DrawBG::; 1875our @ISA = DC::UI::DrawBG::;
1857 1876
1858use CFPlus::OpenGL; 1877use DC::OpenGL;
1859 1878
1860sub new { 1879sub new {
1861 my ($class, %arg) = @_; 1880 my ($class, %arg) = @_;
1862 1881
1863 my $self = $class->SUPER::new ( 1882 my $self = $class->SUPER::new (
… …
1868 #text => initial text 1887 #text => initial text
1869 #markup => initial narkup 1888 #markup => initial narkup
1870 #max_w => maximum pixel width 1889 #max_w => maximum pixel width
1871 #style => 0, # render flags 1890 #style => 0, # render flags
1872 ellipsise => 3, # end 1891 ellipsise => 3, # end
1873 layout => (new CFPlus::Layout), 1892 layout => (new DC::Layout),
1874 fontsize => 1, 1893 fontsize => 1,
1875 align => -1, 1894 align => -1,
1876 valign => -1, 1895 valign => -1,
1877 padding_x => 2, 1896 padding_x => 2,
1878 padding_y => 2, 1897 padding_y => 2,
1879 can_events => 0, 1898 can_events => 0,
1880 %arg 1899 %arg
1881 ); 1900 );
1882 1901
1883 if (exists $self->{template}) { 1902 if (exists $self->{template}) {
1884 my $layout = new CFPlus::Layout; 1903 my $layout = new DC::Layout;
1885 $layout->set_text (delete $self->{template}); 1904 $layout->set_text (delete $self->{template});
1886 $self->{template} = $layout; 1905 $self->{template} = $layout;
1887 } 1906 }
1888 1907
1889 if (exists $self->{markup}) { 1908 if (exists $self->{markup}) {
… …
1907 1926
1908 delete $self->{ox}; 1927 delete $self->{ox};
1909 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1910} 1929}
1911 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1912sub set_text { 1937sub set_text {
1913 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1914 1939
1915 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1916 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
… …
1939 1964
1940sub size_request { 1965sub size_request {
1941 my ($self) = @_; 1966 my ($self) = @_;
1942 1967
1943 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1944 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1945 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1946 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1947 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1948 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1949 1976
1950 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
2022 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
2023 2050
2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2026 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2027 }; 2056 };
2028 2057
2029 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
2030 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = DC::OpenGL::glGenList;
2031 2060# DC::OpenGL::glNewList $self->{list};
2032 $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;
2033} 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#}
2034 2077
2035############################################################################# 2078#############################################################################
2036 2079
2037package CFPlus::UI::EntryBase; 2080package DC::UI::EntryBase;
2038 2081
2039our @ISA = CFPlus::UI::Label::; 2082our @ISA = DC::UI::Label::;
2040 2083
2041use CFPlus::OpenGL; 2084use DC::OpenGL;
2042 2085
2043sub new { 2086sub new {
2044 my $class = shift; 2087 my $class = shift;
2045 2088
2046 $class->SUPER::new ( 2089 $class->SUPER::new (
2047 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
2048 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
2049 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
2050 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
2051 can_hover => 1, 2096 can_hover => 1,
2052 can_focus => 1, 2097 can_focus => 1,
2053 valign => 0, 2098 valign => 0,
2054 can_events => 1, 2099 can_events => 1,
2055 ellipsise => 0, 2100 ellipsise => 0,
2101 padding_x => 4,
2102 padding_y => 2,
2056 #text => ... 2103 #text => ...
2057 #hidden => "*", 2104 #hidden => "*",
2058 @_ 2105 @_
2059 ) 2106 )
2060} 2107}
… …
2111 2158
2112 if ($uni == 8) { 2159 if ($uni == 8) {
2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2114 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
2115 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
2116 } elsif ($sym == CFPlus::SDLK_LEFT) { 2163 } elsif ($sym == DC::SDLK_LEFT) {
2117 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
2118 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2165 } elsif ($sym == DC::SDLK_RIGHT) {
2119 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2120 } elsif ($sym == CFPlus::SDLK_HOME) { 2167 } elsif ($sym == DC::SDLK_HOME) {
2121 # what a hack 2168 # what a hack
2122 $self->{cursor} = 2169 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1 2171 ? length $1
2125 : 0; 2172 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) { 2173 } elsif ($sym == DC::SDLK_END) {
2127 # uh, again 2174 # uh, again
2128 $self->{cursor} = 2175 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1 2177 ? $self->{cursor} + length $1
2131 : length $self->{text}; 2178 : length $self->{text};
… …
2195 glColor_premultiply @{$self->{bg}}; 2242 glColor_premultiply @{$self->{bg}};
2196 } 2243 }
2197 2244
2198 glEnable GL_BLEND; 2245 glEnable GL_BLEND;
2199 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2200 glBegin GL_QUADS;
2201 glVertex 0 , 0;
2202 glVertex 0 , $self->{h};
2203 glVertex $self->{w}, $self->{h}; 2247 glRect 0, 0, $self->{w}, $self->{h};
2204 glVertex $self->{w}, 0;
2205 glEnd;
2206 glDisable GL_BLEND; 2248 glDisable GL_BLEND;
2207 2249
2208 $self->SUPER::_draw; 2250 $self->SUPER::_draw;
2209 2251
2210 #TODO: force update every cursor change :( 2252 #TODO: force update every cursor change :(
… …
2212 2254
2213 unless (exists $self->{cur_h}) { 2255 unless (exists $self->{cur_h}) {
2214 my $text = substr $self->{text}, 0, $self->{cursor}; 2256 my $text = substr $self->{text}, 0, $self->{cursor};
2215 utf8::encode $text; 2257 utf8::encode $text;
2216 2258
2217 @$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);
2218 } 2260 }
2219 2261
2262 glColor_premultiply @{$self->{active_fg}};
2220 glBegin GL_LINES; 2263 glBegin GL_LINES;
2221 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};
2222 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};
2223 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;
2224 } 2281 }
2225} 2282}
2226 2283
2227############################################################################# 2284#############################################################################
2228 2285
2229package CFPlus::UI::Entry; 2286package DC::UI::Entry;
2230 2287
2231our @ISA = CFPlus::UI::EntryBase::; 2288our @ISA = DC::UI::EntryBase::;
2232 2289
2233use CFPlus::OpenGL; 2290use DC::OpenGL;
2234 2291
2235sub invoke_key_down { 2292sub invoke_key_down {
2236 my ($self, $ev) = @_; 2293 my ($self, $ev) = @_;
2237 2294
2238 my $sym = $ev->{sym}; 2295 my $sym = $ev->{sym};
… …
2244 $self->{history_pointer} = -1; 2301 $self->{history_pointer} = -1;
2245 $self->{history_saveback} = ''; 2302 $self->{history_saveback} = '';
2246 $self->emit (activate => $txt); 2303 $self->emit (activate => $txt);
2247 $self->update; 2304 $self->update;
2248 2305
2249 } elsif ($sym == CFPlus::SDLK_UP) { 2306 } elsif ($sym == DC::SDLK_UP) {
2250 if ($self->{history_pointer} < 0) { 2307 if ($self->{history_pointer} < 0) {
2251 $self->{history_saveback} = $self->get_text; 2308 $self->{history_saveback} = $self->get_text;
2252 } 2309 }
2253 if (@{$self->{history} || []} > 0) { 2310 if (@{$self->{history} || []} > 0) {
2254 $self->{history_pointer}++; 2311 $self->{history_pointer}++;
… …
2256 $self->{history_pointer} = @{$self->{history} || []} - 1; 2313 $self->{history_pointer} = @{$self->{history} || []} - 1;
2257 } 2314 }
2258 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2315 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2259 } 2316 }
2260 2317
2261 } elsif ($sym == CFPlus::SDLK_DOWN) { 2318 } elsif ($sym == DC::SDLK_DOWN) {
2262 $self->{history_pointer}--; 2319 $self->{history_pointer}--;
2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2320 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2264 2321
2265 if ($self->{history_pointer} >= 0) { 2322 if ($self->{history_pointer} >= 0) {
2266 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2323 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
2275 1 2332 1
2276} 2333}
2277 2334
2278############################################################################# 2335#############################################################################
2279 2336
2280package CFPlus::UI::TextEdit; 2337package DC::UI::TextEdit;
2281 2338
2282our @ISA = CFPlus::UI::EntryBase::; 2339our @ISA = DC::UI::EntryBase::;
2283 2340
2284use 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}
2285 2352
2286sub move_cursor_ver { 2353sub move_cursor_ver {
2287 my ($self, $dy) = @_; 2354 my ($self, $dy) = @_;
2288 2355
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2356 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2357 warn "cursor $self->{cursor} => $x $line\n";#d#
2290 2358
2291 $y += $dy; 2359 $line += $dy;
2292 2360
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2361 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2362 warn "index $x $line => $index\n";#d#
2294 $self->{cursor} = $index; 2363 $self->{cursor} = $index;
2295 delete $self->{cur_h}; 2364 delete $self->{cur_h};
2296 $self->update; 2365 $self->update;
2297 return; 2366 return;
2298 } 2367 }
… …
2301sub invoke_key_down { 2370sub invoke_key_down {
2302 my ($self, $ev) = @_; 2371 my ($self, $ev) = @_;
2303 2372
2304 my $sym = $ev->{sym}; 2373 my $sym = $ev->{sym};
2305 2374
2306 if ($sym == CFPlus::SDLK_UP) { 2375 if ($sym == DC::SDLK_UP) {
2307 $self->move_cursor_ver (-1); 2376 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) { 2377 } elsif ($sym == DC::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1); 2378 $self->move_cursor_ver (+1);
2310 } else { 2379 } else {
2311 return $self->SUPER::invoke_key_down ($ev) 2380 return $self->SUPER::invoke_key_down ($ev)
2312 } 2381 }
2313 2382
2314 1 2383 1
2315} 2384}
2316 2385
2317############################################################################# 2386#############################################################################
2318 2387
2319package CFPlus::UI::Button; 2388package DC::UI::ButtonBin;
2320 2389
2321our @ISA = CFPlus::UI::Label::; 2390our @ISA = DC::UI::Bin::;
2322 2391
2323use CFPlus::OpenGL; 2392use DC::OpenGL;
2324 2393
2325my @tex = 2394my @tex =
2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2395 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2327 qw(b1_button_active.png); 2396 qw(b1_button_inactive.png b1_button_active.png);
2328 2397
2329sub new { 2398sub new {
2330 my $class = shift; 2399 my $class = shift;
2331 2400
2332 $class->SUPER::new ( 2401 $class->SUPER::new (
2333 padding_x => 4,
2334 padding_y => 4,
2335 fg => [1, 1, 1],
2336 active_fg => [0, 0, 1],
2337 can_hover => 1, 2402 can_hover => 1,
2338 align => 0, 2403 align => 0,
2339 valign => 0, 2404 valign => 0,
2340 can_events => 1, 2405 can_events => 1,
2341 @_ 2406 @_
… …
2353} 2418}
2354 2419
2355sub _draw { 2420sub _draw {
2356 my ($self) = @_; 2421 my ($self) = @_;
2357 2422
2358 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2359
2360 glEnable GL_TEXTURE_2D; 2423 glEnable GL_TEXTURE_2D;
2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2362 glColor 0, 0, 0, 1; 2425 glColor 0, 0, 0, 1;
2363 2426
2427 my $tex = $tex[$GRAB == $self];
2364 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2428 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 2429
2366 glDisable GL_TEXTURE_2D; 2430 glDisable GL_TEXTURE_2D;
2367 2431
2368 $self->SUPER::_draw; 2432 $self->SUPER::_draw;
2369} 2433}
2370 2434
2371############################################################################# 2435#############################################################################
2372 2436
2373package CFPlus::UI::CheckBox; 2437package DC::UI::Button;
2374 2438
2375our @ISA = CFPlus::UI::DrawBG::; 2439our @ISA = DC::UI::Label::;
2440
2441use DC::OpenGL;
2376 2442
2377my @tex = 2443my @tex =
2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2444 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2445 qw(b1_button_inactive.png b1_button_active.png);
2446
2447sub new {
2448 my $class = shift;
2449
2450 $class->SUPER::new (
2451 padding_x => 8,
2452 padding_y => 4,
2453 fg => [1.0, 1.0, 1.0],
2454 active_fg => [0.8, 0.8, 0.8],
2455 can_hover => 1,
2456 align => 0,
2457 valign => 0,
2458 can_events => 1,
2459 @_
2460 )
2461}
2462
2463sub invoke_button_up {
2464 my ($self, $ev, $x, $y) = @_;
2465
2466 $self->emit ("activate")
2467 if $x >= 0 && $x < $self->{w}
2468 && $y >= 0 && $y < $self->{h};
2469
2470 1
2471}
2472
2473sub _draw {
2474 my ($self) = @_;
2475
2476 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2477
2478 glEnable GL_TEXTURE_2D;
2479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2480 glColor 0, 0, 0, 1;
2481
2482 my $tex = $tex[$GRAB == $self];
2483 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2484
2485 glDisable GL_TEXTURE_2D;
2486
2487 $self->SUPER::_draw;
2488}
2489
2490#############################################################################
2491
2492package DC::UI::CheckBox;
2493
2494our @ISA = DC::UI::DrawBG::;
2495
2496my @tex =
2497 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2379 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2498 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2380 2499
2381use CFPlus::OpenGL; 2500use DC::OpenGL;
2382 2501
2383sub new { 2502sub new {
2384 my $class = shift; 2503 my $class = shift;
2385 2504
2386 $class->SUPER::new ( 2505 $class->SUPER::new (
… …
2426sub _draw { 2545sub _draw {
2427 my ($self) = @_; 2546 my ($self) = @_;
2428 2547
2429 $self->SUPER::_draw; 2548 $self->SUPER::_draw;
2430 2549
2431 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2550 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2432 2551
2433 my ($w, $h) = @$self{qw(w h)}; 2552 my ($w, $h) = @$self{qw(w h)};
2434 2553
2435 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2554 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2436 2555
… …
2443 glDisable GL_TEXTURE_2D; 2562 glDisable GL_TEXTURE_2D;
2444} 2563}
2445 2564
2446############################################################################# 2565#############################################################################
2447 2566
2448package CFPlus::UI::Image; 2567package DC::UI::Image;
2449 2568
2450our @ISA = CFPlus::UI::Base::; 2569our @ISA = DC::UI::Base::;
2451 2570
2452use CFPlus::OpenGL; 2571use DC::OpenGL;
2453 2572
2454our %texture_cache; 2573our %texture_cache;
2455 2574
2456sub new { 2575sub new {
2457 my $class = shift; 2576 my $class = shift;
2458 2577
2459 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2460 can_events => 0, 2579 can_events => 0,
2580 scale => 1,
2461 @_, 2581 @_,
2462 ); 2582 );
2463 2583
2464 $self->{path} || $self->{tex} 2584 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required"; 2585 or Carp::croak "'path' or 'tex' attributes required";
2466 2586
2467 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2587 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2588 new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2469 2589
2470 CFPlus::weaken $texture_cache{$self->{path}}; 2590 DC::weaken $texture_cache{$self->{path}};
2471 2591
2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2592 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2473 2593
2474 $self 2594 $self
2475} 2595}
2476 2596
2477sub STORABLE_freeze { 2597sub STORABLE_freeze {
2478 my ($self, $cloning) = @_; 2598 my ($self, $cloning) = @_;
2479 2599
2480 $self->{path} 2600 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2601 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2482 2602
2483 $self->{path} 2603 $self->{path}
2484} 2604}
2485 2605
2486sub STORABLE_attach { 2606sub STORABLE_attach {
… …
2490} 2610}
2491 2611
2492sub size_request { 2612sub size_request {
2493 my ($self) = @_; 2613 my ($self) = @_;
2494 2614
2495 ($self->{tex}{w}, $self->{tex}{h}) 2615 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2496} 2616}
2497 2617
2498sub _draw { 2618sub _draw {
2499 my ($self) = @_; 2619 my ($self) = @_;
2500 2620
… …
2510 } 2630 }
2511 2631
2512 glEnable GL_TEXTURE_2D; 2632 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2633 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 2634
2515 $tex->draw_quad (0, 0, $w, $h); 2635 $tex->draw_quad_alpha (0, 0, $w, $h);
2516 2636
2517 glDisable GL_TEXTURE_2D; 2637 glDisable GL_TEXTURE_2D;
2518} 2638}
2519 2639
2520############################################################################# 2640#############################################################################
2521 2641
2522package CFPlus::UI::ImageButton; 2642package DC::UI::ImageButton;
2523 2643
2524our @ISA = CFPlus::UI::Image::; 2644our @ISA = DC::UI::Image::;
2525 2645
2526use CFPlus::OpenGL; 2646use DC::OpenGL;
2527 2647
2528my %textures; 2648my %textures;
2529 2649
2530sub new { 2650sub new {
2531 my $class = shift; 2651 my $class = shift;
… …
2541 can_events => 1, 2661 can_events => 1,
2542 @_ 2662 @_
2543 ); 2663 );
2544} 2664}
2545 2665
2666sub invoke_button_down {
2667 my ($self, $ev, $x, $y) = @_;
2668
2669 1
2670}
2671
2546sub invoke_button_up { 2672sub invoke_button_up {
2547 my ($self, $ev, $x, $y) = @_; 2673 my ($self, $ev, $x, $y) = @_;
2548 2674
2549 $self->emit ("activate") 2675 $self->emit ("activate")
2550 if $x >= 0 && $x < $self->{w} 2676 if $x >= 0 && $x < $self->{w}
… …
2553 1 2679 1
2554} 2680}
2555 2681
2556############################################################################# 2682#############################################################################
2557 2683
2558package CFPlus::UI::VGauge; 2684package DC::UI::VGauge;
2559 2685
2560our @ISA = CFPlus::UI::Base::; 2686our @ISA = DC::UI::Base::;
2561 2687
2562use List::Util qw(min max); 2688use List::Util qw(min max);
2563 2689
2564use CFPlus::OpenGL; 2690use DC::OpenGL;
2565 2691
2566my %tex = ( 2692my %tex = (
2567 food => [ 2693 food => [
2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2694 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2695 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2570 ], 2696 ],
2571 grace => [ 2697 grace => [
2572 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2698 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2699 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2574 ], 2700 ],
2575 hp => [ 2701 hp => [
2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2702 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2703 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2578 ], 2704 ],
2579 mana => [ 2705 mana => [
2580 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2706 map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2707 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2582 ], 2708 ],
2583); 2709);
2584 2710
2585# eg. VGauge->new (gauge => 'food'), default gauge: food 2711# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2688 glDisable GL_TEXTURE_2D; 2814 glDisable GL_TEXTURE_2D;
2689} 2815}
2690 2816
2691############################################################################# 2817#############################################################################
2692 2818
2819package DC::UI::Progress;
2820
2821our @ISA = DC::UI::Label::;
2822
2823use DC::OpenGL;
2824
2825sub new {
2826 my ($class, %arg) = @_;
2827
2828 my $self = $class->SUPER::new (
2829 fg => [1, 1, 1],
2830 bg => [0, 0, 1, 0.2],
2831 bar => [0.7, 0.5, 0.1, 0.8],
2832 outline => [0.4, 0.3, 0],
2833 fontsize => 0.9,
2834 valign => 0,
2835 align => 0,
2836 can_events => 1,
2837 ellipsise => 1,
2838 label => "%d%%",
2839 %arg,
2840 );
2841
2842 $self->set_value ($arg{value} || -1);
2843
2844 $self
2845}
2846
2847sub set_label {
2848 my ($self, $label) = @_;
2849
2850 return if $self->{label} eq $label;
2851 $self->{label} = $label;
2852
2853 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2854}
2855
2856sub set_value {
2857 my ($self, $value) = @_;
2858
2859 if ($self->{value} ne $value) {
2860 $self->{value} = $value;
2861
2862 if ($value < 0) {
2863 $self->set_text ("-");
2864 } else {
2865 $self->set_text (sprintf $self->{label}, $value * 100);
2866 }
2867
2868 $self->update;
2869 }
2870}
2871
2872sub _draw {
2873 my ($self) = @_;
2874
2875 glEnable GL_BLEND;
2876 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2877
2878 if ($self->{value} >= 0) {
2879 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2880
2881 glColor_premultiply @{$self->{bar}};
2882 glRect 2, 2, $s, $self->{h} - 2;
2883 glColor_premultiply @{$self->{bg}};
2884 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2885 }
2886
2887 glColor_premultiply @{$self->{outline}};
2888 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2889
2890 glDisable GL_BLEND;
2891
2892 {
2893 local $self->{bg}; # do not draw background
2894 $self->SUPER::_draw;
2895 }
2896}
2897
2898#############################################################################
2899
2900package DC::UI::ExperienceProgress;
2901
2902our @ISA = DC::UI::Progress::;
2903
2904sub new {
2905 my ($class, %arg) = @_;
2906
2907 my $self = $class->SUPER::new (
2908 tooltip => sub {
2909 my ($self) = @_;
2910
2911 sprintf "level %d\n%s points\n%s next level\n%s to go",
2912 $self->{lvl},
2913 ::formsep ($self->{exp}),
2914 ::formsep ($self->{nxt}),
2915 ::formsep ($self->{nxt} - $self->{exp}),
2916 },
2917 %arg
2918 );
2919
2920 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2921 if $::CONN;
2922
2923 $self
2924}
2925
2926sub DESTROY {
2927 my ($self) = @_;
2928
2929 delete $::CONN->{on_exp_update}{$self+0}
2930 if $::CONN;
2931
2932 $self->SUPER::DESTROY;
2933}
2934
2935sub set_value {
2936 my ($self, $lvl, $exp) = @_;
2937
2938 $self->{lvl} = $lvl;
2939 $self->{exp} = $exp;
2940
2941 my $v = -1;
2942
2943 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2944 my $l0 = $table->[$lvl - 1];
2945 my $l1 = $table->[$lvl];
2946
2947 $self->{nxt} = $l1;
2948
2949 $v = ($exp - $l0) / ($l1 - $l0);
2950 }
2951
2952 $self->SUPER::set_value ($v);
2953}
2954
2955#############################################################################
2956
2693package CFPlus::UI::Gauge; 2957package DC::UI::Gauge;
2694 2958
2695our @ISA = CFPlus::UI::VBox::; 2959our @ISA = DC::UI::VBox::;
2696 2960
2697sub new { 2961sub new {
2698 my ($class, %arg) = @_; 2962 my ($class, %arg) = @_;
2699 2963
2700 my $self = $class->SUPER::new ( 2964 my $self = $class->SUPER::new (
… …
2702 can_hover => 1, 2966 can_hover => 1,
2703 can_events => 1, 2967 can_events => 1,
2704 %arg, 2968 %arg,
2705 ); 2969 );
2706 2970
2707 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 2971 $self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999");
2708 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2972 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 2973 $self->add ($self->{max} = new DC::UI::Label valign => -1, align => 0, template => "999");
2710 2974
2711 $self 2975 $self
2712} 2976}
2713 2977
2714sub set_fontsize { 2978sub set_fontsize {
… …
2735 $self->{value}->set_text ($val); 2999 $self->{value}->set_text ($val);
2736} 3000}
2737 3001
2738############################################################################# 3002#############################################################################
2739 3003
2740package CFPlus::UI::Slider; 3004package DC::UI::Slider;
2741 3005
2742use strict; 3006use strict;
2743 3007
2744use CFPlus::OpenGL; 3008use DC::OpenGL;
2745 3009
2746our @ISA = CFPlus::UI::DrawBG::; 3010our @ISA = DC::UI::DrawBG::;
2747 3011
2748my @tex = 3012my @tex =
2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3013 map { new_from_file DC::Texture DC::find_rcfile $_ }
2750 qw(s1_slider.png s1_slider_bg.png); 3014 qw(s1_slider.png s1_slider_bg.png);
2751 3015
2752sub new { 3016sub new {
2753 my $class = shift; 3017 my $class = shift;
2754 3018
… …
2822 3086
2823 $self->SUPER::invoke_button_down ($ev, $x, $y); 3087 $self->SUPER::invoke_button_down ($ev, $x, $y);
2824 3088
2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3089 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2826 3090
2827 $self->invoke_mouse_motion ($ev, $x, $y) 3091 $self->invoke_mouse_motion ($ev, $x, $y);
3092
3093 1
2828} 3094}
2829 3095
2830sub invoke_mouse_motion { 3096sub invoke_mouse_motion {
2831 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2832 3098
… …
2848sub invoke_mouse_wheel { 3114sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_; 3115 my ($self, $ev) = @_;
2850 3116
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3117 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852 3118
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3119 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2854 3120
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3121 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856 3122
2857 ! ! $delta 3123 1
2858} 3124}
2859 3125
2860sub update { 3126sub update {
2861 my ($self) = @_; 3127 my ($self) = @_;
2862 3128
… …
2911 glDisable GL_TEXTURE_2D; 3177 glDisable GL_TEXTURE_2D;
2912} 3178}
2913 3179
2914############################################################################# 3180#############################################################################
2915 3181
2916package CFPlus::UI::ValSlider; 3182package DC::UI::ValSlider;
2917 3183
2918our @ISA = CFPlus::UI::HBox::; 3184our @ISA = DC::UI::HBox::;
2919 3185
2920sub new { 3186sub new {
2921 my ($class, %arg) = @_; 3187 my ($class, %arg) = @_;
2922 3188
2923 my $range = delete $arg{range}; 3189 my $range = delete $arg{range};
2924 3190
2925 my $self = $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3192 slider => (new DC::UI::Slider expand => 1, range => $range),
2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3193 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2928 to_value => sub { shift }, 3194 to_value => sub { shift },
2929 from_value => sub { shift }, 3195 from_value => sub { shift },
2930 %arg, 3196 %arg,
2931 ); 3197 );
2932 3198
… …
2952sub set_range { shift->{slider}->set_range (@_) } 3218sub set_range { shift->{slider}->set_range (@_) }
2953sub set_value { shift->{slider}->set_value (@_) } 3219sub set_value { shift->{slider}->set_value (@_) }
2954 3220
2955############################################################################# 3221#############################################################################
2956 3222
2957package CFPlus::UI::TextScroller; 3223package DC::UI::TextScroller;
2958 3224
2959our @ISA = CFPlus::UI::HBox::; 3225our @ISA = DC::UI::HBox::;
2960 3226
2961use CFPlus::OpenGL; 3227use DC::OpenGL;
2962 3228
2963sub new { 3229sub new {
2964 my $class = shift; 3230 my $class = shift;
2965 3231
2966 my $self = $class->SUPER::new ( 3232 my $self = $class->SUPER::new (
… …
2968 can_events => 1, 3234 can_events => 1,
2969 indent => 0, 3235 indent => 0,
2970 #font => default_font 3236 #font => default_font
2971 @_, 3237 @_,
2972 3238
2973 layout => (new CFPlus::Layout), 3239 layout => (new DC::Layout),
2974 par => [], 3240 par => [],
2975 max_par => 0, 3241 max_par => 0,
2976 height => 0, 3242 height => 0,
2977 children => [ 3243 children => [
2978 (new CFPlus::UI::Empty expand => 1), 3244 (new DC::UI::Empty expand => 1),
2979 (new CFPlus::UI::Slider vertical => 1), 3245 (new DC::UI::Slider vertical => 1),
2980 ], 3246 ],
2981 ); 3247 );
2982 3248
2983 $self->{children}[1]->connect (changed => sub { $self->update }); 3249 $self->{children}[1]->connect (changed => sub { $self->update });
2984 3250
… …
2993} 3259}
2994 3260
2995sub size_request { 3261sub size_request {
2996 my ($self) = @_; 3262 my ($self) = @_;
2997 3263
2998 my ($empty, $slider) = @{ $self->{children} }; 3264 my ($empty, $slider) = $self->visible_children;
2999 3265
3000 local $self->{children} = [$empty, $slider]; 3266 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request 3267 $self->SUPER::size_request
3002} 3268}
3003 3269
… …
3167 $ROOT->on_post_alloc ($self => sub { 3433 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate; 3434 $self->force_uptodate;
3169 3435
3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3436 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3171 3437
3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3438 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3173 glClearColor 0, 0, 0, 0; 3439 glClearColor 0, 0, 0, 0;
3174 glClear GL_COLOR_BUFFER_BIT; 3440 glClear GL_COLOR_BUFFER_BIT;
3175 3441
3176 package CFPlus::UI::Base; 3442 package DC::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3443 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h}); 3444 (0, 0, $self->{w}, $self->{h});
3179 3445
3180 my $top = int $self->{children}[1]{range}[0]; 3446 my $top = int $self->{children}[1]{range}[0];
3181 3447
… …
3192 3458
3193 if ($y0 < $y + $h && $y < $y1) { 3459 if ($y0 < $y + $h && $y < $y1) {
3194 my $layout = $self->get_layout ($para); 3460 my $layout = $self->get_layout ($para);
3195 3461
3196 $layout->render ($para->{indent}, $y - $y0); 3462 $layout->render ($para->{indent}, $y - $y0);
3463 $layout->draw;
3197 3464
3198 if (my @w = @{ $para->{widget} }) { 3465 if (my @w = @{ $para->{widget} }) {
3199 my @s = $layout->get_shapes; 3466 my @s = $layout->get_shapes;
3200 3467
3201 for (@w) { 3468 for (@w) {
… …
3239 $self->{children}[1]->draw; 3506 $self->{children}[1]->draw;
3240} 3507}
3241 3508
3242############################################################################# 3509#############################################################################
3243 3510
3244package CFPlus::UI::Animator; 3511package DC::UI::Animator;
3245 3512
3246use CFPlus::OpenGL; 3513use DC::OpenGL;
3247 3514
3248our @ISA = CFPlus::UI::Bin::; 3515our @ISA = DC::UI::Bin::;
3249 3516
3250sub moveto { 3517sub moveto {
3251 my ($self, $x, $y) = @_; 3518 my ($self, $x, $y) = @_;
3252 3519
3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3520 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
3281 glPopMatrix; 3548 glPopMatrix;
3282} 3549}
3283 3550
3284############################################################################# 3551#############################################################################
3285 3552
3286package CFPlus::UI::Flopper; 3553package DC::UI::Flopper;
3287 3554
3288our @ISA = CFPlus::UI::Button::; 3555our @ISA = DC::UI::Button::;
3289 3556
3290sub new { 3557sub new {
3291 my $class = shift; 3558 my $class = shift;
3292 3559
3293 my $self = $class->SUPER::new ( 3560 my $self = $class->SUPER::new (
… …
3305 $self->{other}->toggle_visibility; 3572 $self->{other}->toggle_visibility;
3306} 3573}
3307 3574
3308############################################################################# 3575#############################################################################
3309 3576
3310package CFPlus::UI::Tooltip; 3577package DC::UI::Tooltip;
3311 3578
3312our @ISA = CFPlus::UI::Bin::; 3579our @ISA = DC::UI::Bin::;
3313 3580
3314use CFPlus::OpenGL; 3581use DC::OpenGL;
3315 3582
3316sub new { 3583sub new {
3317 my $class = shift; 3584 my $class = shift;
3318 3585
3319 $class->SUPER::new ( 3586 $class->SUPER::new (
… …
3323} 3590}
3324 3591
3325sub set_tooltip_from { 3592sub set_tooltip_from {
3326 my ($self, $widget) = @_; 3593 my ($self, $widget) = @_;
3327 3594
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
3330
3331 my $tooltip = $widget->{tooltip}; 3595 my $tip = $widget->{tooltip};
3596 $tip = $tip->($widget) if "CODE" eq ref $tip;
3597
3598 $tip = DC::Pod::section_label tooltip => $1
3599 if $tip =~ /^#(.*)$/;
3332 3600
3333 if ($ENV{CFPLUS_DEBUG} & 2) { 3601 if ($ENV{CFPLUS_DEBUG} & 2) {
3334 $tooltip .= "\n\n" . (ref $widget) . "\n" 3602 $tip .= "\n\n" . (ref $widget) . "\n"
3335 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3603 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3336 . "req $widget->{req_w} $widget->{req_h}\n" 3604 . "req $widget->{req_w} $widget->{req_h}\n"
3337 . "visible $widget->{visible}"; 3605 . "visible $widget->{visible}";
3338 } 3606 }
3339 3607
3340 $tooltip =~ s/^\n+//; 3608 $tip =~ s/^\n+//;
3341 $tooltip =~ s/\n+$//; 3609 $tip =~ s/\n+$//;
3342 3610
3343 $self->add (new CFPlus::UI::Label 3611 $self->add (new DC::UI::Label
3344 markup => $tooltip, 3612 markup => $tip,
3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3613 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3346 fontsize => 0.8, 3614 fontsize => 0.8,
3347 style => 1, # FLAG_INVERSE 3615 style => 1, # FLAG_INVERSE
3348 ellipsise => 0, 3616 ellipsise => 0,
3349 font => ($widget->{tooltip_font} || $::FONT_PROP), 3617 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3387} 3655}
3388 3656
3389sub _draw { 3657sub _draw {
3390 my ($self) = @_; 3658 my ($self) = @_;
3391 3659
3392 glTranslate 0.375, 0.375;
3393
3394 my ($w, $h) = @$self{qw(w h)}; 3660 my ($w, $h) = @$self{qw(w h)};
3395 3661
3396 glColor 1, 0.8, 0.4; 3662 glColor 1, 0.8, 0.4;
3397 glBegin GL_QUADS; 3663 glRect 0, 0, $w, $h;
3398 glVertex 0 , 0;
3399 glVertex 0 , $h;
3400 glVertex $w, $h;
3401 glVertex $w, 0;
3402 glEnd;
3403 3664
3404 glColor 0, 0, 0; 3665 glColor 0, 0, 0;
3405 glBegin GL_LINE_LOOP; 3666 glRect_lineloop .5, .5, $w + .5, $h + .5;
3406 glVertex 0 , 0;
3407 glVertex 0 , $h;
3408 glVertex $w, $h;
3409 glVertex $w, 0;
3410 glEnd;
3411 3667
3412 glTranslate 2 - 0.375, 2 - 0.375; 3668 glTranslate 2, 2;
3413 3669
3414 $self->SUPER::_draw; 3670 $self->SUPER::_draw;
3415} 3671}
3416 3672
3417############################################################################# 3673#############################################################################
3418 3674
3419package CFPlus::UI::Face; 3675package DC::UI::Face;
3420 3676
3421our @ISA = CFPlus::UI::DrawBG::; 3677our @ISA = DC::UI::DrawBG::;
3422 3678
3423use CFPlus::OpenGL; 3679use DC::OpenGL;
3424 3680
3425sub new { 3681sub new {
3426 my $class = shift; 3682 my $class = shift;
3427 3683
3428 my $self = $class->SUPER::new ( 3684 my $self = $class->SUPER::new (
… …
3432 can_events => 0, 3688 can_events => 0,
3433 @_, 3689 @_,
3434 ); 3690 );
3435 3691
3436 if ($self->{anim} && $self->{animspeed}) { 3692 if ($self->{anim} && $self->{animspeed}) {
3437 CFPlus::weaken (my $widget = $self); 3693 DC::weaken (my $widget = $self);
3438 3694
3439 $self->{timer} = Event->timer ( 3695 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3696 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3441 hard => 1,
3442 interval => $self->{animspeed},
3443 cb => sub {
3444 return unless $::CONN; 3697 return unless $::CONN;
3445 3698
3699 my $w = $widget
3700 or return;
3701
3446 ++$widget->{frame}; 3702 ++$w->{frame};
3447 $self->update_face; 3703 $w->update_face;
3704
3705 # somehow, $widget can go away
3448 $self->update; 3706 $w->update;
3449 }, 3707 $w->update_timer;
3450 ); 3708 };
3451 3709
3452 $self->update_face; 3710 $self->update_face;
3711 $self->update_timer;
3453 } 3712 }
3454 3713
3455 $self 3714 $self
3456} 3715}
3457 3716
3717sub update_timer {
3718 my ($self) = @_;
3719
3720 return unless $self->{timer};
3721
3722 if ($self->{visible}) {
3723 $self->{timer}->start;
3724 } else {
3725 $self->{timer}->stop;
3726 }
3727}
3728
3458sub update_face { 3729sub update_face {
3459 my ($self) = @_; 3730 my ($self) = @_;
3460 3731
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
3471sub size_request {
3472 my ($self) = @_;
3473
3474 if ($::CONN) { 3732 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3733 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) { 3734 if ($anim && @$anim) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3735 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3478 } else { 3736 delete $self->{face_change_cb};
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3737
3480 $self->realloc; 3738 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3739 unless ($tex->{name} || $tex->{loading}) {
3740 $tex->upload (sub { $self->reconfigure });
3741 }
3481 }); 3742 }
3482 } 3743 }
3483 } 3744 }
3484 } 3745 }
3746}
3747
3748sub size_request {
3749 my ($self) = @_;
3750
3751 if ($::CONN) {
3752 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3753 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3754 if ($tex->{name}) {
3755 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3756 } elsif (!$tex->{loading}) {
3757 $tex->upload (sub { $self->reconfigure });
3758 }
3759 }
3760
3761 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3762 }
3763 }
3485 3764
3486 ($self->{size_w} || 8, $self->{size_h} || 8) 3765 ($self->{size_w} || 8, $self->{size_h} || 8)
3487} 3766}
3488 3767
3489sub update { 3768sub update {
… …
3492 return unless $self->{visible}; 3771 return unless $self->{visible};
3493 3772
3494 $self->SUPER::update; 3773 $self->SUPER::update;
3495} 3774}
3496 3775
3776sub invoke_visibility_change {
3777 my ($self) = @_;
3778
3779 $self->update_timer;
3780
3781 0
3782}
3783
3497sub _draw { 3784sub _draw {
3498 my ($self) = @_; 3785 my ($self) = @_;
3499 3786
3500 return unless $::CONN;
3501
3502 $self->SUPER::_draw; 3787 $self->SUPER::_draw;
3503 3788
3504 my $faceid = $::CONN->{faceid}[$self->{face}] 3789 if (my $tex = $self->{tex}) {
3505 or return;
3506
3507 my $tex = $::CONN->{texture}[$faceid];
3508
3509 if ($tex) {
3510 glEnable GL_TEXTURE_2D; 3790 glEnable GL_TEXTURE_2D;
3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3791 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3512 glColor 0, 0, 0, 1; 3792 glColor 0, 0, 0, 1;
3513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3793 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3514 glDisable GL_TEXTURE_2D; 3794 glDisable GL_TEXTURE_2D;
… …
3516} 3796}
3517 3797
3518sub destroy { 3798sub destroy {
3519 my ($self) = @_; 3799 my ($self) = @_;
3520 3800
3521 $self->{timer}->cancel 3801 (delete $self->{timer})->cancel
3522 if $self->{timer}; 3802 if $self->{timer};
3523 3803
3524 $self->SUPER::destroy; 3804 $self->SUPER::destroy;
3525} 3805}
3526 3806
3527############################################################################# 3807#############################################################################
3528 3808
3529package CFPlus::UI::Buttonbar; 3809package DC::UI::Buttonbar;
3530 3810
3531our @ISA = CFPlus::UI::HBox::; 3811our @ISA = DC::UI::HBox::;
3532 3812
3533# TODO: should actually wrap buttons and other goodies. 3813# TODO: should actually wrap buttons and other goodies.
3534 3814
3535############################################################################# 3815#############################################################################
3536 3816
3537package CFPlus::UI::Menu; 3817package DC::UI::Menu;
3538 3818
3539our @ISA = CFPlus::UI::Toplevel::; 3819our @ISA = DC::UI::Toplevel::;
3540 3820
3541use CFPlus::OpenGL; 3821use DC::OpenGL;
3542 3822
3543sub new { 3823sub new {
3544 my $class = shift; 3824 my $class = shift;
3545 3825
3546 my $self = $class->SUPER::new ( 3826 my $self = $class->SUPER::new (
3547 items => [], 3827 items => [],
3548 z => 100, 3828 z => 100,
3549 @_, 3829 @_,
3550 ); 3830 );
3551 3831
3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3832 $self->add ($self->{vbox} = new DC::UI::VBox);
3553 3833
3554 for my $item (@{ $self->{items} }) { 3834 for my $item (@{ $self->{items} }) {
3555 my ($widget, $cb, $tooltip) = @$item; 3835 my ($widget, $cb, $tooltip) = @$item;
3556 3836
3557 # handle various types of items, only text for now 3837 # handle various types of items, only text for now
3558 if (!ref $widget) { 3838 if (!ref $widget) {
3559 if ($widget =~ /\t/) { 3839 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2; 3840 my ($left, $right) = split /\t/, $widget, 2;
3561 3841
3562 $widget = new CFPlus::UI::HBox 3842 $widget = new DC::UI::HBox
3563 can_hover => 1, 3843 can_hover => 1,
3564 can_events => 1, 3844 can_events => 1,
3565 tooltip => $tooltip, 3845 tooltip => $tooltip,
3566 children => [ 3846 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1), 3847 (new DC::UI::Label markup => $left, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1), 3848 (new DC::UI::Label markup => $right, align => +1),
3569 ], 3849 ],
3570 ; 3850 ;
3571 3851
3572 } else { 3852 } else {
3573 $widget = new CFPlus::UI::Label 3853 $widget = new DC::UI::Label
3574 can_hover => 1, 3854 can_hover => 1,
3575 can_events => 1, 3855 can_events => 1,
3576 markup => $widget, 3856 markup => $widget,
3577 tooltip => $tooltip; 3857 tooltip => $tooltip;
3578 } 3858 }
… …
3626 1 3906 1
3627} 3907}
3628 3908
3629############################################################################# 3909#############################################################################
3630 3910
3631package CFPlus::UI::Multiplexer; 3911package DC::UI::Multiplexer;
3632 3912
3633our @ISA = CFPlus::UI::Container::; 3913our @ISA = DC::UI::Container::;
3634 3914
3635sub new { 3915sub new {
3636 my $class = shift; 3916 my $class = shift;
3637 3917
3638 my $self = $class->SUPER::new ( 3918 my $self = $class->SUPER::new (
… …
3699 $self->{current}->draw; 3979 $self->{current}->draw;
3700} 3980}
3701 3981
3702############################################################################# 3982#############################################################################
3703 3983
3704package CFPlus::UI::Notebook; 3984package DC::UI::Notebook;
3705 3985
3986use DC::OpenGL;
3987
3706our @ISA = CFPlus::UI::VBox::; 3988our @ISA = DC::UI::VBox::;
3707 3989
3708sub new { 3990sub new {
3709 my $class = shift; 3991 my $class = shift;
3710 3992
3711 my $self = $class->SUPER::new ( 3993 my $self = $class->SUPER::new (
3712 buttonbar => (new CFPlus::UI::Buttonbar), 3994 buttonbar => (new DC::UI::Buttonbar),
3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3995 multiplexer => (new DC::UI::Multiplexer expand => 1),
3996 active_outline => [.7, .7, 0.2],
3714 # filter => # will be put between multiplexer and $self 3997 # filter => # will be put between multiplexer and $self
3715 @_, 3998 @_,
3716 ); 3999 );
3717 4000
3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4001 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3719 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4002 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3720 4003
4004 {
4005 Scalar::Util::weaken (my $wself = $self);
4006
4007 $self->{multiplexer}->connect (c_add => sub {
4008 my ($mplex, $widgets) = @_;
4009
4010 for my $child (@$widgets) {
4011 Scalar::Util::weaken $child;
4012 $child->{c_tab_} ||= do {
4013 my $tab =
4014 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4015 ? $child->{c_tab}
4016 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4017
4018 $tab->connect (activate => sub {
4019 $wself->set_current_page ($child);
4020 });
4021
4022 $tab
4023 };
4024
4025 $self->{buttonbar}->add ($child->{c_tab_});
4026 }
4027 });
4028
4029 $self->{multiplexer}->connect (c_remove => sub {
4030 my ($mplex, $widgets) = @_;
4031
4032 for my $child (@$widgets) {
4033 $wself->{buttonbar}->remove ($child->{c_tab_});
4034 }
4035 });
4036 }
4037
3721 $self 4038 $self
3722} 4039}
3723 4040
3724sub add { 4041sub add {
4042 my ($self, @widgets) = @_;
4043
4044 $self->{multiplexer}->add (@widgets)
4045}
4046
4047sub remove {
4048 my ($self, @widgets) = @_;
4049
4050 $self->{multiplexer}->remove (@widgets)
4051}
4052
4053sub pages {
4054 my ($self) = @_;
4055 $self->{multiplexer}->children
4056}
4057
4058sub add_tab {
3725 my ($self, $title, $widget, $tooltip) = @_; 4059 my ($self, $title, $widget, $tooltip) = @_;
3726 4060
3727 CFPlus::weaken $self; 4061 $title = [$title, $tooltip] unless ref $title;
4062 $widget->{c_tab} = $title;
3728 4063
3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3730 markup => $title,
3731 tooltip => $tooltip,
3732 on_activate => sub { $self->set_current_page ($widget) },
3733 );
3734
3735 $self->{multiplexer}->add ($widget); 4064 $self->add ($widget);
3736} 4065}
3737 4066
3738sub get_current_page { 4067sub get_current_page {
3739 my ($self) = @_; 4068 my ($self) = @_;
3740 4069
… …
3746 4075
3747 $self->{multiplexer}->set_current_page ($page); 4076 $self->{multiplexer}->set_current_page ($page);
3748 $self->emit (page_changed => $self->{multiplexer}{current}); 4077 $self->emit (page_changed => $self->{multiplexer}{current});
3749} 4078}
3750 4079
4080sub _draw {
4081 my ($self) = @_;
4082
4083 $self->SUPER::_draw ();
4084
4085 if (my $cur = $self->{multiplexer}{current}) {
4086 if ($cur = $cur->{c_tab_}) {
4087 glTranslate $self->{buttonbar}{x} + $cur->{x},
4088 $self->{buttonbar}{y} + $cur->{y};
4089 glLineWidth 3;
4090 #glEnable GL_BLEND;
4091 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4092 glColor @{$self->{active_outline}};
4093 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4094 glLineWidth 1;
4095 #glDisable GL_BLEND;
4096 }
4097 }
4098}
4099
3751############################################################################# 4100#############################################################################
3752 4101
3753package CFPlus::UI::Selector; 4102package DC::UI::Selector;
3754 4103
3755use utf8; 4104use utf8;
3756 4105
3757our @ISA = CFPlus::UI::Button::; 4106our @ISA = DC::UI::Button::;
3758 4107
3759sub new { 4108sub new {
3760 my $class = shift; 4109 my $class = shift;
3761 4110
3762 my $self = $class->SUPER::new ( 4111 my $self = $class->SUPER::new (
… …
3779 my ($value, $title, $tooltip) = @$_; 4128 my ($value, $title, $tooltip) = @$_;
3780 4129
3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4130 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3782 } 4131 }
3783 4132
3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4133 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3785} 4134}
3786 4135
3787sub _set_value { 4136sub _set_value {
3788 my ($self, $value) = @_; 4137 my ($self, $value) = @_;
3789 4138
3790 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4139 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4140 $item ||= $self->{options}[0]
3791 or return; 4141 or return;
3792 4142
3793 $self->{value} = $item->[0]; 4143 $self->{value} = $item->[0];
3794 $self->set_markup ("$item->[1] ⇓"); 4144 $self->set_markup ("$item->[1] ⇓");
3795 $self->set_tooltip ($item->[2]); 4145# $self->set_tooltip ($item->[2]);
3796} 4146}
3797 4147
3798sub set_value { 4148sub set_value {
3799 my ($self, $value) = @_; 4149 my ($self, $value) = @_;
3800 4150
… …
3802 4152
3803 $self->_set_value ($value); 4153 $self->_set_value ($value);
3804 $self->emit (changed => $value); 4154 $self->emit (changed => $value);
3805} 4155}
3806 4156
4157sub set_options {
4158 my ($self, $options) = @_;
4159
4160 $self->{options} = $options;
4161 $self->_set_value ($self->{value});
4162}
4163
3807############################################################################# 4164#############################################################################
3808 4165
3809package CFPlus::UI::Statusbox; 4166package DC::UI::Statusbox;
3810 4167
3811our @ISA = CFPlus::UI::VBox::; 4168our @ISA = DC::UI::VBox::;
3812 4169
3813sub new { 4170sub new {
3814 my $class = shift; 4171 my $class = shift;
3815 4172
3816 my $self = $class->SUPER::new ( 4173 my $self = $class->SUPER::new (
3817 fontsize => 0.8, 4174 fontsize => 0.8,
3818 @_, 4175 @_,
3819 ); 4176 );
3820 4177
3821 CFPlus::weaken (my $this = $self); 4178 DC::weaken (my $this = $self);
3822 4179
3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4180 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3824 4181
3825 $self 4182 $self
3826} 4183}
3827 4184
3828sub reorder { 4185sub reorder {
3829 my ($self) = @_; 4186 my ($self) = @_;
3830 my $NOW = Time::HiRes::time; 4187 my $NOW = Time::HiRes::time;
3831 4188
3832 # freeze display when hovering over any label 4189 # freeze display when hovering over any label
3833 return if $CFPlus::UI::TOOLTIP->{owner} 4190 return if $DC::UI::TOOLTIP->{owner}
3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4191 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3835 values %{ $self->{item} }; 4192 values %{ $self->{item} };
3836 4193
3837 while (my ($k, $v) = each %{ $self->{item} }) { 4194 while (my ($k, $v) = each %{ $self->{item} }) {
3838 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4195 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3839 } 4196 }
4197
4198 $self->{timer}->set (1, 1);
3840 4199
3841 my @widgets; 4200 my @widgets;
3842 4201
3843 my @items = sort { 4202 my @items = sort {
3844 $a->{pri} <=> $b->{pri} 4203 $a->{pri} <=> $b->{pri}
3845 or $b->{id} <=> $a->{id} 4204 or $b->{id} <=> $a->{id}
3846 } values %{ $self->{item} }; 4205 } values %{ $self->{item} };
3847
3848 $self->{timer}->interval (1);
3849 4206
3850 my $count = 10 + 1; 4207 my $count = 10 + 1;
3851 for my $item (@items) { 4208 for my $item (@items) {
3852 last unless --$count; 4209 last unless --$count;
3853 4210
… …
3860 for ($short) { 4217 for ($short) {
3861 s/^\s+//; 4218 s/^\s+//;
3862 s/\s+/ /g; 4219 s/\s+/ /g;
3863 } 4220 }
3864 4221
3865 new CFPlus::UI::Label 4222 new DC::UI::Label
3866 markup => $short, 4223 markup => $short,
3867 tooltip => $item->{tooltip}, 4224 tooltip => $item->{tooltip},
3868 tooltip_font => $::FONT_PROP, 4225 tooltip_font => $::FONT_PROP,
3869 tooltip_width => 0.67, 4226 tooltip_width => 0.67,
3870 fontsize => $item->{fontsize} || $self->{fontsize}, 4227 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3877 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4234 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3878 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4235 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3879 $label->update; 4236 $label->update;
3880 $label->set_max_size (undef, $label->{req_h} * $diff) 4237 $label->set_max_size (undef, $label->{req_h} * $diff)
3881 if $diff < 1; 4238 if $diff < 1;
3882 $self->{timer}->interval (1/30); 4239 $self->{timer}->set (1/30, 1/30);
3883 } else { 4240 } else {
3884 $label->{fg}[3] = $item->{fg}[3] || 1; 4241 $label->{fg}[3] = $item->{fg}[3] || 1;
3885 } 4242 }
3886 4243
3887 push @widgets, $label; 4244 push @widgets, $label;
… …
3949 $self->SUPER::destroy; 4306 $self->SUPER::destroy;
3950} 4307}
3951 4308
3952############################################################################# 4309#############################################################################
3953 4310
3954package CFPlus::UI::Root; 4311package DC::UI::Root;
3955 4312
3956our @ISA = CFPlus::UI::Container::; 4313our @ISA = DC::UI::Container::;
3957 4314
3958use List::Util qw(min max); 4315use List::Util qw(min max);
3959 4316
3960use CFPlus::OpenGL; 4317use DC::OpenGL;
3961 4318
3962sub new { 4319sub new {
3963 my $class = shift; 4320 my $class = shift;
3964 4321
3965 my $self = $class->SUPER::new ( 4322 my $self = $class->SUPER::new (
3966 visible => 1, 4323 visible => 1,
3967 @_, 4324 @_,
3968 ); 4325 );
3969 4326
3970 CFPlus::weaken ($self->{root} = $self); 4327 DC::weaken ($self->{root} = $self);
3971 4328
3972 $self 4329 $self
3973} 4330}
3974 4331
3975sub size_request { 4332sub size_request {
… …
4023} 4380}
4024 4381
4025sub update { 4382sub update {
4026 my ($self) = @_; 4383 my ($self) = @_;
4027 4384
4028 $::WANT_REFRESH++; 4385 $::WANT_REFRESH = 1;
4029} 4386}
4030 4387
4031sub add { 4388sub add {
4032 my ($self, @children) = @_; 4389 my ($self, @children) = @_;
4033 4390
… …
4070 while ($self->{refresh_hook}) { 4427 while ($self->{refresh_hook}) {
4071 $_->() 4428 $_->()
4072 for values %{delete $self->{refresh_hook}}; 4429 for values %{delete $self->{refresh_hook}};
4073 } 4430 }
4074 4431
4075 if ($self->{realloc}) { 4432 while ($self->{realloc}) {
4076 my %queue; 4433 my %queue;
4077 my @queue; 4434 my @queue;
4078 my $widget; 4435 my $widget;
4079 4436
4080 outer: 4437 outer:
… …
4127 } 4484 }
4128 } 4485 }
4129 4486
4130 delete $self->{realloc}{$widget+0}; 4487 delete $self->{realloc}{$widget+0};
4131 } 4488 }
4132 }
4133 4489
4134 while (my $size_alloc = delete $self->{size_alloc}) { 4490 while (my $size_alloc = delete $self->{size_alloc}) {
4135 my @queue = sort { $b->{visible} <=> $a->{visible} } 4491 my @queue = sort { $a->{visible} <=> $b->{visible} }
4136 values %$size_alloc; 4492 values %$size_alloc;
4137 4493
4138 while () { 4494 while () {
4139 my $widget = pop @queue || last; 4495 my $widget = pop @queue || last;
4140 4496
4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4497 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4142 4498
4143 $w = 0 if $w < 0;
4144 $h = 0 if $h < 0;
4145
4146 $w = max $widget->{min_w}, $w; 4499 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h; 4500 $h = max $widget->{min_h}, $h;
4148 4501
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4502# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4503# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151 4504
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4505 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4506 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154 4507
4155 $w = int $w + 0.5; 4508 $w = int $w + 0.5;
4156 $h = int $h + 0.5; 4509 $h = int $h + 0.5;
4157 4510
4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4511 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4159 $widget->{old_w} = $widget->{w}; 4512 $widget->{old_w} = $widget->{w};
4160 $widget->{old_h} = $widget->{h}; 4513 $widget->{old_h} = $widget->{h};
4161 4514
4162 $widget->{w} = $w; 4515 $widget->{w} = $w;
4163 $widget->{h} = $h; 4516 $widget->{h} = $h;
4164 4517
4165 $widget->emit (size_allocate => $w, $h); 4518 $widget->emit (size_allocate => $w, $h);
4519 }
4166 } 4520 }
4167 } 4521 }
4168 } 4522 }
4169 4523
4170 while ($self->{post_alloc_hook}) { 4524 while ($self->{post_alloc_hook}) {
4171 $_->() 4525 $_->()
4172 for values %{delete $self->{post_alloc_hook}}; 4526 for values %{delete $self->{post_alloc_hook}};
4173 } 4527 }
4174
4175 4528
4176 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4529 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4177 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4530 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4178 glClear GL_COLOR_BUFFER_BIT; 4531 glClear GL_COLOR_BUFFER_BIT;
4179 4532
… …
4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4535 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4183 glMatrixMode GL_MODELVIEW; 4536 glMatrixMode GL_MODELVIEW;
4184 glLoadIdentity; 4537 glLoadIdentity;
4185 4538
4186 { 4539 {
4187 package CFPlus::UI::Base; 4540 package DC::UI::Base;
4188 4541
4189 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4542 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4190 (0, 0, $self->{w}, $self->{h}); 4543 (0, 0, $self->{w}, $self->{h});
4191 4544
4192 $self->_draw; 4545 $self->_draw;
4193 } 4546 }
4194} 4547}
4195 4548
4196############################################################################# 4549#############################################################################
4197 4550
4198package CFPlus::UI; 4551package DC::UI;
4199 4552
4200$ROOT = new CFPlus::UI::Root; 4553$ROOT = new DC::UI::Root;
4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4554$TOOLTIP = new DC::UI::Tooltip z => 900;
4202 4555
42031 45561
4204 4557

Diff Legend

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