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.344 by root, Sun Aug 13 16:29:36 2006 UTC vs.
Revision 1.444 by root, Sat Dec 8 18:38:13 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event;
9 7
10use CFPlus; 8use CFPlus;
11use CFPlus::Pod; 9use CFPlus::Pod;
12use CFPlus::Texture; 10use CFPlus::Texture;
13 11
… …
18our $TOOLTIP; 16our $TOOLTIP;
19our $BUTTON_STATE; 17our $BUTTON_STATE;
20 18
21our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
22 20
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
22 $_[0]->stop;
23
24 if (!$GRAB) { 24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 29 $TOOLTIP->hide;
29 30
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 33
32 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
33 35
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show; 37 $TOOLTIP->show;
40 } 38 }
41 39
42 return; 40 return;
43 } 41 }
44 } 42 }
45 } 43 }
46 44
47 $TOOLTIP->hide; 45 $TOOLTIP->hide;
46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
49}); 48};
50 49
51sub get_layout { 50sub get_layout {
52 my $layout; 51 my $layout;
53 52
54 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
89 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
90 89
91 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
93 92
94 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
95 } 94 }
96} 95}
97 96
98sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
99 my ($ev) = @_; 98 my ($ev) = @_;
… …
105 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
106 105
107 $GRAB = $widget; 106 $GRAB = $widget;
108 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
109 108
110 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
111 } 110 }
112 111
113 if ($GRAB) { 112 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 114 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 115 my $delta = $ev->{button} * 2 - 9;
116 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
117
118 $ev->{dx} = $shift ? $delta : 0;
119 $ev->{dy} = $shift ? 0 : $delta;
120
118 $GRAB->emit (mouse_wheel => $ev); 121 $GRAB->emit (mouse_wheel => $ev);
119 } else { 122 } else {
120 $GRAB->emit (button_down => $ev) 123 $GRAB->emit (button_down => $ev)
121 } 124 }
122 } 125 }
… …
136 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
137 $grab->update if $grab; 140 $grab->update if $grab;
138 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
139 142
140 check_hover $widget; 143 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->trigger;
142 } 145 }
143} 146}
144 147
145sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
146 my ($ev) = @_; 149 my ($ev) = @_;
… …
235 h => undef, 238 h => undef,
236 can_events => 1, 239 can_events => 1,
237 @_ 240 @_
238 }, $class; 241 }, $class;
239 242
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 243 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 244
242 for (keys %$self) { 245 for (keys %$self) {
243 if (/^on_(.*)$/) { 246 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 247 $self->connect ($1 => delete $self->{$_});
245 } 248 }
… …
262 265
263sub destroy { 266sub destroy {
264 my ($self) = @_; 267 my ($self) = @_;
265 268
266 $self->hide; 269 $self->hide;
270 $self->emit ("destroy");
267 %$self = (); 271 %$self = ();
272}
273
274sub TO_JSON {
275 { "\fw" => $_[0]{s_id} }
268} 276}
269 277
270sub show { 278sub show {
271 my ($self) = @_; 279 my ($self) = @_;
272 280
… …
301 delete $self->{root}; 309 delete $self->{root};
302 310
303 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
304 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
305 313
306 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->trigger
307 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
308 316
309 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
310 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
311} 319}
… …
313sub set_visibility { 321sub set_visibility {
314 my ($self, $visible) = @_; 322 my ($self, $visible) = @_;
315 323
316 return if $self->{visible} == $visible; 324 return if $self->{visible} == $visible;
317 325
318 $visible ? $self->hide 326 $visible ? $self->show
319 : $self->show; 327 : $self->hide;
320} 328}
321 329
322sub toggle_visibility { 330sub toggle_visibility {
323 my ($self) = @_; 331 my ($self) = @_;
324 332
… …
351 359
352 $self->{force_w} = $w; 360 $self->{force_w} = $w;
353 $self->{force_h} = $h; 361 $self->{force_h} = $h;
354 362
355 $self->realloc; 363 $self->realloc;
364}
365
366# traverse the widget chain up to find the maximum "physical" size constraints
367sub get_max_wh {
368 my ($self) = @_;
369
370 return $self->{parent}->get_max_wh
371 if $self->{parent};
372
373 ($::WIDTH, $::HEIGHT)
356} 374}
357 375
358sub size_request { 376sub size_request {
359 require Carp; 377 require Carp;
360 Carp::confess "size_request is abstract"; 378 Carp::confess "size_request is abstract";
… …
422 440
423 $self->{tooltip} = $tooltip; 441 $self->{tooltip} = $tooltip;
424 442
425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 443 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
426 delete $CFPlus::UI::TOOLTIP->{owner}; 444 delete $CFPlus::UI::TOOLTIP->{owner};
427 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 445 $CFPlus::UI::TOOLTIP_WATCHER->trigger;
428 } 446 }
429} 447}
430 448
431# translate global coordinates to local coordinate system 449# translate global coordinates to local coordinate system
432sub coord2local { 450sub coord2local {
… …
502 520
503 defined wantarray and CFPlus::guard { 521 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 522 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 523 @{ $self->{signal_cb}{$signal} };
506 } 524 }
525}
526
527sub disconnect_all {
528 my ($self, $signal) = @_;
529
530 delete $self->{signal_cb}{$signal};
507} 531}
508 532
509my %has_coords = ( 533my %has_coords = (
510 button_down => 1, 534 button_down => 1,
511 button_up => 1, 535 button_up => 1,
… …
514); 538);
515 539
516sub emit { 540sub emit {
517 my ($self, $signal, @args) = @_; 541 my ($self, $signal, @args) = @_;
518 542
519 # I do not really like this solution, but I dislike duplication 543 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 544 # and needlessly verbose code, either.
521 my @append 545 my @append
522 = $has_coords{$signal} 546 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 547 ? $args[0]->xy ($self)
524 : (); 548 : ();
525 549
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 550 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 551
528 #d##TODO# stop propagating at first true, do not use sum 552 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 553 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 554 ($self->can ("invoke_$signal") || sub { 1 }), # closure
555 ) {
556 return $cb->($self, @args, @append) || next;
557 }
558
559 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 560 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 561}
533 562
534sub find_widget { 563#sub find_widget {
535 my ($self, $x, $y) = @_; 564# in .xs
536
537 return () unless $self->{can_events};
538
539 return $self
540 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543 ()
544}
545 565
546sub set_parent { 566sub set_parent {
547 my ($self, $parent) = @_; 567 my ($self, $parent) = @_;
548 568
549 Scalar::Util::weaken ($self->{parent} = $parent); 569 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 570 $self->set_visible if $parent->{visible};
551} 571}
552 572
553sub realloc { 573sub realloc {
554 my ($self) = @_; 574 my ($self) = @_;
… …
580 600
581# using global variables seems a bit hacky, but passing through all drawing 601# using global variables seems a bit hacky, but passing through all drawing
582# functions seems pointless. 602# functions seems pointless.
583our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 603our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584 604
585sub draw { 605#sub draw {
586 my ($self) = @_; 606#CFPlus.xs
587
588 return unless $self->{h} && $self->{w};
589
590 # update screen rectangle
591 local $draw_x = $draw_x + $self->{x};
592 local $draw_y = $draw_y + $self->{y};
593
594 # skip widgets that are entirely outside the drawing area
595 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598 glPushMatrix;
599 glTranslate $self->{x}, $self->{y}, 0;
600
601 if ($self == $HOVER && $self->{can_hover}) {
602 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603 glEnable GL_BLEND;
604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glBegin GL_QUADS;
606 glVertex 0 , 0;
607 glVertex $self->{w}, 0;
608 glVertex $self->{w}, $self->{h};
609 glVertex 0 , $self->{h};
610 glEnd;
611 glDisable GL_BLEND;
612 }
613
614 if ($ENV{CFPLUS_DEBUG} & 1) {
615 glPushMatrix;
616 glColor 1, 1, 0, 1;
617 glTranslate 0.375, 0.375;
618 glBegin GL_LINE_LOOP;
619 glVertex 0 , 0;
620 glVertex $self->{w} - 1, 0;
621 glVertex $self->{w} - 1, $self->{h} - 1;
622 glVertex 0 , $self->{h} - 1;
623 glEnd;
624 glPopMatrix;
625 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626 }
627
628 $self->_draw;
629 glPopMatrix;
630}
631 607
632sub _draw { 608sub _draw {
633 my ($self) = @_; 609 my ($self) = @_;
634 610
635 warn "no draw defined for $self\n"; 611 warn "no draw defined for $self\n";
… …
638sub DESTROY { 614sub DESTROY {
639 my ($self) = @_; 615 my ($self) = @_;
640 616
641 return if CFPlus::in_destruct; 617 return if CFPlus::in_destruct;
642 618
643 delete $WIDGET{$self+0}; 619 local $@;
644
645 eval { $self->destroy }; 620 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 621 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
622
623 delete $WIDGET{$self+0};
647} 624}
648 625
649############################################################################# 626#############################################################################
650 627
651package CFPlus::UI::DrawBG; 628package CFPlus::UI::DrawBG;
… …
655use strict; 632use strict;
656use CFPlus::OpenGL; 633use CFPlus::OpenGL;
657 634
658sub new { 635sub new {
659 my $class = shift; 636 my $class = shift;
660
661 # range [value, low, high, page]
662 637
663 $class->SUPER::new ( 638 $class->SUPER::new (
664 #bg => [0, 0, 0, 0.2], 639 #bg => [0, 0, 0, 0.2],
665 #active_bg => [1, 1, 1, 0.5], 640 #active_bg => [1, 1, 1, 0.5],
666 @_ 641 @_
… …
678 my ($w, $h) = @$self{qw(w h)}; 653 my ($w, $h) = @$self{qw(w h)};
679 654
680 glEnable GL_BLEND; 655 glEnable GL_BLEND;
681 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 656 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682 glColor_premultiply @$color; 657 glColor_premultiply @$color;
683
684 glBegin GL_QUADS;
685 glVertex 0 , 0;
686 glVertex 0 , $h;
687 glVertex $w, $h; 658 glRect 0, 0, $w, $h;
688 glVertex $w, 0;
689 glEnd;
690
691 glDisable GL_BLEND; 659 glDisable GL_BLEND;
692 } 660 }
693} 661}
694 662
695############################################################################# 663#############################################################################
… …
727 can_events => 0, 695 can_events => 0,
728 %arg, 696 %arg,
729 ); 697 );
730 698
731 $self->add (@$children) 699 $self->add (@$children)
732 if $children; 700 if $children && @$children;
733 701
734 $self 702 $self
735} 703}
736 704
737sub realloc { 705sub realloc {
… …
746 my ($self, @widgets) = @_; 714 my ($self, @widgets) = @_;
747 715
748 $_->set_parent ($self) 716 $_->set_parent ($self)
749 for @widgets; 717 for @widgets;
750 718
719 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 720 use sort 'stable';
752 721
753 $self->{children} = [ 722 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 723 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 724 @{$self->{children}}, @widgets
756 ]; 725 ];
757 726
758 $self->realloc; 727 $self->realloc;
728
729 $self->emit (c_add => \@widgets);
730
731 map $_+0, @widgets
759} 732}
760 733
761sub children { 734sub children {
762 @{ $_[0]{children} } 735 @{ $_[0]{children} }
763} 736}
764 737
765sub remove { 738sub remove {
766 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
767 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
768 delete $child->{parent}; 744 delete $child->{parent};
769 $child->hide; 745 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
772 748
773 $self->realloc; 749 $self->realloc;
774} 750}
775 751
776sub clear { 752sub clear {
777 my ($self) = @_; 753 my ($self) = @_;
778 754
779 my $children = delete $self->{children}; 755 my $children = $self->{children};
780 $self->{children} = []; 756 $self->{children} = [];
781 757
782 for (@$children) { 758 for (@$children) {
783 delete $_->{parent}; 759 delete $_->{parent};
784 $_->hide; 760 $_->hide;
… …
804} 780}
805 781
806sub _draw { 782sub _draw {
807 my ($self) = @_; 783 my ($self) = @_;
808 784
809 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
810} 786}
811 787
812############################################################################# 788#############################################################################
813 789
814package CFPlus::UI::Bin; 790package CFPlus::UI::Bin;
… …
824} 800}
825 801
826sub add { 802sub add {
827 my ($self, $child) = @_; 803 my ($self, $child) = @_;
828 804
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 805 $self->clear;
830 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
831} 807}
832 808
833sub remove { 809sub remove {
834 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
… …
852 828
853 1 829 1
854} 830}
855 831
856############################################################################# 832#############################################################################
857
858# back-buffered drawing area 833# back-buffered drawing area
859 834
860package CFPlus::UI::Window; 835package CFPlus::UI::Window;
861 836
862our @ISA = CFPlus::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
… …
898 glClear GL_COLOR_BUFFER_BIT; 873 glClear GL_COLOR_BUFFER_BIT;
899 874
900 { 875 {
901 package CFPlus::UI::Base; 876 package CFPlus::UI::Base;
902 877
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 878 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 879 (0, 0, $self->{w}, $self->{h});
880
881 $self->_render;
905 } 882 }
906
907 $self->_render;
908 }; 883 };
909} 884}
910 885
911sub _draw { 886sub _draw {
912 my ($self) = @_; 887 my ($self) = @_;
… …
924} 899}
925 900
926############################################################################# 901#############################################################################
927 902
928package CFPlus::UI::ViewPort; 903package CFPlus::UI::ViewPort;
904
905use List::Util qw(min max);
929 906
930our @ISA = CFPlus::UI::Window::; 907our @ISA = CFPlus::UI::Window::;
931 908
932sub new { 909sub new {
933 my $class = shift; 910 my $class = shift;
… …
942sub size_request { 919sub size_request {
943 my ($self) = @_; 920 my ($self) = @_;
944 921
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 923
947 $w = 10 if $self->{scroll_x}; 924 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 925 $h = 1 if $self->{scroll_y};
949 926
950 ($w, $h) 927 ($w, $h)
951} 928}
952 929
953sub invoke_size_allocate { 930sub invoke_size_allocate {
… …
965} 942}
966 943
967sub set_offset { 944sub set_offset {
968 my ($self, $x, $y) = @_; 945 my ($self, $x, $y) = @_;
969 946
947 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
948 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
949
950 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 951 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 952 $self->{view_y} = $y;
972 953
954 $self->emit (changed => $x, $y);
973 $self->update; 955 $self->update;
956 }
957}
958
959sub set_center {
960 my ($self, $x, $y) = @_;
961
962 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
963}
964
965sub make_visible {
966 my ($self, $x, $y, $border) = @_;
967
968 if ( $x < $self->{view_x} + $self->{w} * $border
969 || $x > $self->{view_x} + $self->{w} * (1 - $border)
970 || $y < $self->{view_y} + $self->{h} * $border
971 || $y > $self->{view_y} + $self->{h} * (1 - $border)
972 ) {
973 $self->set_center ($x, $y);
974 }
974} 975}
975 976
976# hmm, this does not work for topleft of $self... but we should not ask for that 977# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 978sub coord2local {
978 my ($self, $x, $y) = @_; 979 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 994 my ($self, $x, $y) = @_;
994 995
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 996 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 997 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 998 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 999 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 1000 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1001 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1002 }
1002} 1003}
1003 1004
… …
1014 1015
1015############################################################################# 1016#############################################################################
1016 1017
1017package CFPlus::UI::ScrolledWindow; 1018package CFPlus::UI::ScrolledWindow;
1018 1019
1019our @ISA = CFPlus::UI::HBox::; 1020our @ISA = CFPlus::UI::Table::;
1020 1021
1021sub new { 1022sub new {
1022 my ($class, %arg) = @_; 1023 my ($class, %arg) = @_;
1023 1024
1024 my $child = delete $arg{child}; 1025 my $child = delete $arg{child};
1025 1026
1026 my $self; 1027 my $self;
1027 1028
1028 my $slider = new CFPlus::UI::Slider 1029 my $hslider = new CFPlus::UI::Slider
1030 c_col => 0,
1031 c_row => 1,
1032 vertical => 0,
1033 range => [0, 0, 1, 0.01], # HACK fix
1034 on_changed => sub {
1035 $self->{hpos} = $_[1];
1036 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1037 },
1038 ;
1039
1040 my $vslider = new CFPlus::UI::Slider
1041 c_col => 1,
1042 c_row => 0,
1029 vertical => 1, 1043 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1044 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1045 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1046 $self->{vpos} = $_[1];
1047 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1048 },
1034 ; 1049 ;
1035 1050
1036 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1052 scroll_x => 0,
1053 scroll_y => 1,
1038 can_events => 1, 1054 can_events => 1,
1039 slider => $slider, 1055 hslider => $hslider,
1056 vslider => $vslider,
1057 col_expand => [1, 0],
1058 row_expand => [1, 0],
1040 %arg, 1059 %arg,
1041 ); 1060 );
1042 1061
1062 $self->{vp} = new CFPlus::UI::ViewPort
1063 c_col => 0,
1064 c_row => 0,
1065 expand => 1,
1066 scroll_x => $self->{scroll_x},
1067 scroll_y => $self->{scroll_y},
1068 on_changed => sub {
1069 my ($vp, $x, $y) = @_;
1070
1071 $vp->{parent}{hslider}->set_value ($x);
1072 $vp->{parent}{vslider}->set_value ($y);
1073
1074 0
1075 },
1076 on_size_allocate => sub {
1077 my ($vp, $w, $h) = @_;
1078 $vp->{parent}->update_slider;
1079 0
1080 },
1081 ;
1082
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add ($self->{vp});
1084
1044 $self->add ($child) if $child; 1085 $self->add ($child) if $child;
1045 1086
1046 $self 1087 $self
1047} 1088}
1048
1049#TODO# update range on size_allocate depending on child
1050 1089
1051sub add { 1090sub add {
1052 my ($self, $widget) = @_; 1091 my ($self, $widget) = @_;
1053 1092
1054 $self->{vp}->add ($self->{child} = $widget); 1093 $self->{vp}->add ($self->{child} = $widget);
1055} 1094}
1056 1095
1096sub set_offset { shift->{vp}->set_offset (@_) }
1097sub set_center { shift->{vp}->set_center (@_) }
1098sub make_visible { shift->{vp}->make_visible (@_) }
1099
1100sub update_slider {
1101 my ($self) = @_;
1102
1103 my $child = ($self->{vp} or return)->child;
1104
1105 if ($self->{scroll_x}) {
1106 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1107 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1108
1109 my $visible = $w1 > $w2;
1110 if ($visible != $self->{hslider_visible}) {
1111 $self->{hslider_visible} = $visible;
1112 $visible ? $self->SUPER::add ($self->{hslider})
1113 : $self->SUPER::remove ($self->{hslider});
1114 }
1115 }
1116
1117 if ($self->{scroll_y}) {
1118 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider_visible}) {
1123 $self->{vslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{vslider})
1125 : $self->SUPER::remove ($self->{vslider});
1126 }
1127 }
1128}
1129
1130sub start_dragging {
1131 my ($self, $ev) = @_;
1132
1133 $self->grab_focus;
1134
1135 my $ox = $self->{vp}{view_x};
1136 my $oy = $self->{vp}{view_y};
1137
1138 $self->{motion} = sub {
1139 my ($ev, $x, $y) = @_;
1140
1141 $ox -= $ev->{xrel};
1142 $oy -= $ev->{yrel};
1143
1144 $self->{vp}->set_offset ($ox, $oy);
1145 };
1146}
1147
1057sub invoke_mouse_wheel { 1148sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1149 my ($self, $ev) = @_;
1059 1150
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1151 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1152 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1153
1064 1 1154 1
1065} 1155}
1066 1156
1067sub update_slider { 1157sub invoke_button_down {
1068 my ($self) = @_; 1158 my ($self, $ev, $x, $y) = @_;
1069 1159
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1160 if ($ev->{button} == 2) {
1071} 1161 $self->start_dragging ($ev);
1162 return 1;
1163 }
1072 1164
1073sub update { 1165 0
1074 my ($self) = @_; 1166}
1075 1167
1076 $self->SUPER::update; 1168sub invoke_button_up {
1169 my ($self, $ev, $x, $y) = @_;
1077 1170
1078 $self->update_slider; 1171 if (delete $self->{motion}) {
1172 return 1;
1173 }
1174
1175 0
1176}
1177
1178sub invoke_mouse_motion {
1179 my ($self, $ev, $x, $y) = @_;
1180
1181 if ($self->{motion}) {
1182 $self->{motion}->($ev, $x, $y);
1183 return 1;
1184 }
1185
1186 0
1079} 1187}
1080 1188
1081sub invoke_size_allocate { 1189sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1190 my ($self, $w, $h) = @_;
1083 1191
1084 $self->update_slider; 1192 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1193 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1194}
1088 1195
1089############################################################################# 1196#############################################################################
1090 1197
… …
1110 my ($w, $h) = @$self{qw(w h)}; 1217 my ($w, $h) = @$self{qw(w h)};
1111 1218
1112 glEnable GL_BLEND; 1219 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} }; 1221 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h; 1222 glRect 0, 0, $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND; 1223 glDisable GL_BLEND;
1124 } 1224 }
1125 1225
1126 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1127} 1227}
1128 1228
1129############################################################################# 1229#############################################################################
1130 1230
1131package CFPlus::UI::FancyFrame; 1231package CFPlus::UI::FancyFrame;
1232
1233our @ISA = CFPlus::UI::Bin::;
1234
1235use CFPlus::OpenGL;
1236
1237sub new {
1238 my ($class, %arg) = @_;
1239
1240 if ((exists $arg{label}) && !ref $arg{label}) {
1241 $arg{label} = new CFPlus::UI::Label
1242 align => 1,
1243 valign => 0,
1244 text => $arg{label},
1245 fontsize => ($arg{border} || 0.8) * 0.75;
1246 }
1247
1248 my $self = $class->SUPER::new (
1249 # label => "",
1250 fg => [0.6, 0.3, 0.1],
1251 border => 0.8,
1252 style => 'single',
1253 %arg,
1254 );
1255
1256 $self
1257}
1258
1259sub add {
1260 my ($self, @widgets) = @_;
1261
1262 $self->SUPER::add (@widgets);
1263 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1264}
1265
1266sub border {
1267 int $_[0]{border} * $::FONTSIZE
1268}
1269
1270sub size_request {
1271 my ($self) = @_;
1272
1273 ($self->{label_w}, undef) = $self->{label}->size_request
1274 if $self->{label};
1275
1276 my ($w, $h) = $self->SUPER::size_request;
1277
1278 (
1279 $w + $self->border * 2,
1280 $h + $self->border * 2,
1281 )
1282}
1283
1284sub invoke_size_allocate {
1285 my ($self, $w, $h) = @_;
1286
1287 my $border = $self->border;
1288
1289 $w -= List::Util::max 0, $border * 2;
1290 $h -= List::Util::max 0, $border * 2;
1291
1292 if (my $label = $self->{label}) {
1293 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1294 $label->{h} = List::Util::min $h, $border;
1295 $label->invoke_size_allocate ($label->{w}, $label->{h});
1296 }
1297
1298 $self->child->configure ($border, $border, $w, $h);
1299
1300 1
1301}
1302
1303sub _draw {
1304 my ($self) = @_;
1305
1306 my $child = $self->{children}[0];
1307
1308 my $border = $self->border;
1309 my ($w, $h) = ($self->{w}, $self->{h});
1310
1311 $child->draw;
1312
1313 glColor @{$self->{fg}};
1314 glBegin GL_LINE_STRIP;
1315 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1317 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1318 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1319 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1321 glEnd;
1322
1323 if ($self->{label}) {
1324 glTranslate $border * 2, 0;
1325 $self->{label}->_draw;
1326 }
1327}
1328
1329#############################################################################
1330
1331package CFPlus::UI::Toplevel;
1132 1332
1133our @ISA = CFPlus::UI::Bin::; 1333our @ISA = CFPlus::UI::Bin::;
1134 1334
1135use CFPlus::OpenGL; 1335use CFPlus::OpenGL;
1136 1336
… …
1139 mipmap => 1, wrap => 1; 1339 mipmap => 1, wrap => 1;
1140 1340
1141my @border = 1341my @border =
1142 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1143 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1344
1345my @icon =
1346 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1347 qw(x1_move.png x1_resize.png);
1144 1348
1145sub new { 1349sub new {
1146 my ($class, %arg) = @_; 1350 my ($class, %arg) = @_;
1147 1351
1148 my $self = $class->SUPER::new ( 1352 my $self = $class->SUPER::new (
… …
1184 1388
1185sub border { 1389sub border {
1186 int $_[0]{border} * $::FONTSIZE 1390 int $_[0]{border} * $::FONTSIZE
1187} 1391}
1188 1392
1393sub get_max_wh {
1394 my ($self) = @_;
1395
1396 return ($self->{w}, $self->{h})
1397 if $self->{visible} && $self->{w};
1398
1399 $self->SUPER::get_max_wh
1400}
1401
1189sub size_request { 1402sub size_request {
1190 my ($self) = @_; 1403 my ($self) = @_;
1191 1404
1192 $self->{title_widget}->size_request 1405 $self->{title_widget}->size_request
1193 if $self->{title_widget}; 1406 if $self->{title_widget};
… …
1317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1318 1531
1319 my $border = $self->border; 1532 my $border = $self->border;
1320 1533
1321 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1322 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1323 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1324 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1325 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1326 1553
1327 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1328 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1329 1556
1330 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1351 1578
1352############################################################################# 1579#############################################################################
1353 1580
1354package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1355 1582
1356our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1357 1584
1358use List::Util qw(max sum); 1585use List::Util qw(max sum);
1359 1586
1360use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1361 1588
1362sub new { 1589sub new {
1363 my $class = shift; 1590 my $class = shift;
1364 1591
1365 $class->SUPER::new ( 1592 $class->SUPER::new (
1366 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1367 @_, 1595 @_,
1368 ) 1596 )
1369} 1597}
1370 1598
1371sub children {
1372 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1373}
1374
1375sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1376 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1377 1614
1378 while (@_) { 1615 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1380 $child->set_parent ($self);
1381 $self->{children}[$y][$x] = $child;
1382 }
1383 1617
1384 $self->{force_realloc} = 1; 1618 $child->{c_row} = $row;
1385 $self->{force_size_alloc} = 1; 1619 $child->{c_col} = $col;
1386 $self->realloc;
1387}
1388 1620
1389sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1390 my ($self, $child) = @_; 1628 my ($self) = @_;
1391 1629
1392 # TODO: not yet implemented 1630 my (@w, @h);
1393}
1394
1395# TODO: move to container class maybe? send children a signal on removal?
1396sub clear {
1397 my ($self) = @_;
1398 1631
1399 my @children = $self->children; 1632 my @children = $self->children;
1400 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1401 1643 }
1402 for (@children) {
1403 delete $_->{parent};
1404 $_->hide;
1405 }
1406 1644
1407 $self->realloc; 1645 # second pass, rows
1408} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1409
1410sub get_wh {
1411 my ($self) = @_;
1412
1413 my (@w, @h);
1414
1415 for my $y (0 .. $#{$self->{children}}) {
1416 my $row = $self->{children}[$y]
1417 or next;
1418
1419 for my $x (0 .. $#$row) {
1420 my $widget = $row->[$x]
1421 or next;
1422 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1423 1648
1424 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1425 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1426 } 1653 }
1427 } 1654 }
1428 1655
1429 (\@w, \@h) 1656 (\@w, \@h)
1430} 1657}
… …
1446 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1447 1674
1448 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1449 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1450 1677
1451 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1452 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1453 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1454 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1455 1682
1456 # linearly scale sizes
1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459 1684
1460 CFPlus::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1461 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1462 1694
1463 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1464 1697
1465 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1466 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1467 or next;
1468 1700
1469 my $x = 0; 1701 $widget->configure (
1470 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1471 1704 );
1472 for my $c (0 .. $#$row) { 1705 }
1473 my $col_w = $ws->[$c];
1474 1706
1475 if (my $widget = $row->[$c]) { 1707 1
1476 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1477 }
1478 1709
1479 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1480 } 1737 }
1738 }
1481 1739
1482 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1483 } 1771 }
1484 1772
1485 1 1773 1
1486} 1774}
1487 1775
1488sub find_widget {
1489 my ($self, $x, $y) = @_;
1490
1491 $x -= $self->{x};
1492 $y -= $self->{y};
1493
1494 my $res;
1495
1496 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1497 $res = $_->find_widget ($x, $y)
1498 and return $res;
1499 }
1500
1501 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1502}
1503
1504sub _draw {
1505 my ($self) = @_;
1506
1507 for (grep $_, @{$self->{children}}) {
1508 $_->draw for grep $_, @$_;
1509 }
1510}
1511
1512############################################################################# 1776#############################################################################
1513 1777
1514package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1515 1779
1516our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1517 1781
1518sub size_request { 1782sub size_request {
1519 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1520 1786
1521 $self->{vertical} 1787 $self->{vertical}
1522 ? ( 1788 ? (
1523 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1524 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1525 ) 1791 )
1526 : ( 1792 : (
1527 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1528 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1529 ) 1795 )
1530} 1796}
1531 1797
1532sub invoke_size_allocate { 1798sub invoke_size_allocate {
1533 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1657 1923
1658 delete $self->{ox}; 1924 delete $self->{ox};
1659 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1660} 1926}
1661 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1662sub set_text { 1934sub set_text {
1663 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1664 1936
1665 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1666 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
1689 1961
1690sub size_request { 1962sub size_request {
1691 my ($self) = @_; 1963 my ($self) = @_;
1692 1964
1693 $self->{size_req} ||= do { 1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1694 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1695 $self->{layout}->set_width ($self->{max_w} || -1); 1969 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1696 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1970 $self->{layout}->set_ellipsise ($self->{ellipsise});
1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1971 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1699 1973
1700 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
… …
1772 : ($self->{w} - $size->[0]) * 0.5); 2046 : ($self->{w} - $size->[0]) * 0.5);
1773 2047
1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776 : ($self->{h} - $size->[1]) * 0.5); 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1777 }; 2053 };
1778 2054
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2055# unless ($self->{list}) {
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2056# $self->{list} = CFPlus::OpenGL::glGenList;
1781 2057# CFPlus::OpenGL::glNewList $self->{list};
1782 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2058# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2059# CFPlus::OpenGL::glEndList;
2060# }
2061#
2062# CFPlus::OpenGL::glCallList $self->{list};
2063
2064 $self->{layout}->draw;
1783} 2065}
2066
2067#sub destroy {
2068# my ($self) = @_;
2069#
2070# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2071#
2072# $self->SUPER::destroy;
2073#}
1784 2074
1785############################################################################# 2075#############################################################################
1786 2076
1787package CFPlus::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1788 2078
… …
1794 my $class = shift; 2084 my $class = shift;
1795 2085
1796 $class->SUPER::new ( 2086 $class->SUPER::new (
1797 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1798 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1799 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1800 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1801 can_hover => 1, 2093 can_hover => 1,
1802 can_focus => 1, 2094 can_focus => 1,
1803 valign => 0, 2095 valign => 0,
1804 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
1805 #text => ... 2098 #text => ...
1806 #hidden => "*", 2099 #hidden => "*",
1807 @_ 2100 @_
1808 ) 2101 )
1809} 2102}
… …
1853 my $mod = $ev->{mod}; 2146 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1856 2149
1857 my $text = $self->get_text; 2150 my $text = $self->get_text;
2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1858 2153
1859 if ($uni == 8) { 2154 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2156 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 2162 } elsif ($sym == CFPlus::SDLK_HOME) {
2163 # what a hack
2164 $self->{cursor} =
2165 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2166 ? length $1
2167 : 0;
2168 } elsif ($sym == CFPlus::SDLK_END) {
2169 # uh, again
2170 $self->{cursor} =
2171 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2172 ? $self->{cursor} + length $1
2173 : length $self->{text};
2174 } elsif ($uni == 21) { # ctrl-u
2175 $text = "";
1868 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2177 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2178 $self->emit ('escape');
1873 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2183 } else {
1876 return 0; 2184 return 0;
1877 } 2185 }
1878 2186
1879 $self->_set_text ($text); 2187 $self->_set_text ($text);
1880 2188
1881 $self->realloc; 2189 $self->realloc;
2190 $self->update;
1882 2191
1883 1 2192 1
1884} 2193}
1885 2194
1886sub invoke_focus_in { 2195sub invoke_focus_in {
… …
1928 glColor_premultiply @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
1929 } 2238 }
1930 2239
1931 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1933 glBegin GL_QUADS;
1934 glVertex 0 , 0;
1935 glVertex 0 , $self->{h};
1936 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
1937 glVertex $self->{w}, 0;
1938 glEnd;
1939 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
1940 2244
1941 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
1942 2246
1943 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
… …
1945 2249
1946 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
1947 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
1948 utf8::encode $text; 2252 utf8::encode $text;
1949 2253
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1951 } 2255 }
1952 2256
2257 glColor_premultiply @{$self->{active_fg}};
1953 glBegin GL_LINES; 2258 glBegin GL_LINES;
1954 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2260 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1956 glEnd; 2261 glEnd;
2262
2263 glLineWidth 3;
2264 glColor @{$self->{active_outline}};
2265 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glBegin GL_LINE_STRIP;
2271 glVertex .5, $self->{h} * .5;
2272 glVertex .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} - 2.5;
2274 glVertex $self->{w} - .5, $self->{h} * .5;
2275 glEnd;
1957 } 2276 }
1958} 2277}
2278
2279#############################################################################
1959 2280
1960package CFPlus::UI::Entry; 2281package CFPlus::UI::Entry;
1961 2282
1962our @ISA = CFPlus::UI::EntryBase::; 2283our @ISA = CFPlus::UI::EntryBase::;
1963 2284
… …
1966sub invoke_key_down { 2287sub invoke_key_down {
1967 my ($self, $ev) = @_; 2288 my ($self, $ev) = @_;
1968 2289
1969 my $sym = $ev->{sym}; 2290 my $sym = $ev->{sym};
1970 2291
1971 if ($sym == 13) { 2292 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2293 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2294 my $txt = $self->get_text;
1974 2295
1975 $self->{history_pointer} = -1; 2296 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2297 $self->{history_saveback} = '';
… …
2006 1 2327 1
2007} 2328}
2008 2329
2009############################################################################# 2330#############################################################################
2010 2331
2332package CFPlus::UI::TextEdit;
2333
2334our @ISA = CFPlus::UI::EntryBase::;
2335
2336use CFPlus::OpenGL;
2337
2338sub move_cursor_ver {
2339 my ($self, $dy) = @_;
2340
2341 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2342
2343 $y += $dy;
2344
2345 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2346 $self->{cursor} = $index;
2347 delete $self->{cur_h};
2348 $self->update;
2349 return;
2350 }
2351}
2352
2353sub invoke_key_down {
2354 my ($self, $ev) = @_;
2355
2356 my $sym = $ev->{sym};
2357
2358 if ($sym == CFPlus::SDLK_UP) {
2359 $self->move_cursor_ver (-1);
2360 } elsif ($sym == CFPlus::SDLK_DOWN) {
2361 $self->move_cursor_ver (+1);
2362 } else {
2363 return $self->SUPER::invoke_key_down ($ev)
2364 }
2365
2366 1
2367}
2368
2369#############################################################################
2370
2011package CFPlus::UI::Button; 2371package CFPlus::UI::ButtonBin;
2012 2372
2013our @ISA = CFPlus::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
2014 2374
2015use CFPlus::OpenGL; 2375use CFPlus::OpenGL;
2016 2376
2017my @tex = 2377my @tex =
2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2019 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
2020 2380
2021sub new { 2381sub new {
2022 my $class = shift; 2382 my $class = shift;
2023 2383
2024 $class->SUPER::new ( 2384 $class->SUPER::new (
2025 padding_x => 4,
2026 padding_y => 4,
2027 fg => [1, 1, 1],
2028 active_fg => [0, 0, 1],
2029 can_hover => 1, 2385 can_hover => 1,
2030 align => 0, 2386 align => 0,
2031 valign => 0, 2387 valign => 0,
2032 can_events => 1, 2388 can_events => 1,
2033 @_ 2389 @_
… …
2045} 2401}
2046 2402
2047sub _draw { 2403sub _draw {
2048 my ($self) = @_; 2404 my ($self) = @_;
2049 2405
2050 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2051
2052 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 glColor 0, 0, 0, 1; 2408 glColor 0, 0, 0, 1;
2055 2409
2410 my $tex = $tex[$GRAB == $self];
2056 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2411 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2412
2413 glDisable GL_TEXTURE_2D;
2414
2415 $self->SUPER::_draw;
2416}
2417
2418#############################################################################
2419
2420package CFPlus::UI::Button;
2421
2422our @ISA = CFPlus::UI::Label::;
2423
2424use CFPlus::OpenGL;
2425
2426my @tex =
2427 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2428 qw(b1_button_inactive.png b1_button_active.png);
2429
2430sub new {
2431 my $class = shift;
2432
2433 $class->SUPER::new (
2434 padding_x => 4,
2435 padding_y => 4,
2436 fg => [1.0, 1.0, 1.0],
2437 active_fg => [0.8, 0.8, 0.8],
2438 can_hover => 1,
2439 align => 0,
2440 valign => 0,
2441 can_events => 1,
2442 @_
2443 )
2444}
2445
2446sub invoke_button_up {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 $self->emit ("activate")
2450 if $x >= 0 && $x < $self->{w}
2451 && $y >= 0 && $y < $self->{h};
2452
2453 1
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2460
2461 glEnable GL_TEXTURE_2D;
2462 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2463 glColor 0, 0, 0, 1;
2464
2465 my $tex = $tex[$GRAB == $self];
2466 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2057 2467
2058 glDisable GL_TEXTURE_2D; 2468 glDisable GL_TEXTURE_2D;
2059 2469
2060 $self->SUPER::_draw; 2470 $self->SUPER::_draw;
2061} 2471}
… …
2118sub _draw { 2528sub _draw {
2119 my ($self) = @_; 2529 my ($self) = @_;
2120 2530
2121 $self->SUPER::_draw; 2531 $self->SUPER::_draw;
2122 2532
2123 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2533 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2124 2534
2125 my ($w, $h) = @$self{qw(w h)}; 2535 my ($w, $h) = @$self{qw(w h)};
2126 2536
2127 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2537 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2128 2538
… …
2148sub new { 2558sub new {
2149 my $class = shift; 2559 my $class = shift;
2150 2560
2151 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2152 can_events => 0, 2562 can_events => 0,
2563 scale => 1,
2153 @_, 2564 @_,
2154 ); 2565 );
2155 2566
2156 $self->{path} || $self->{tex} 2567 $self->{path} || $self->{tex}
2157 or Carp::croak "'path' or 'tex' attributes required"; 2568 or Carp::croak "'path' or 'tex' attributes required";
2158 2569
2159 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2570 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2571 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2161 2572
2162 Scalar::Util::weaken $texture_cache{$self->{path}}; 2573 CFPlus::weaken $texture_cache{$self->{path}};
2163 2574
2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2575 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165 2576
2166 $self 2577 $self
2167} 2578}
… …
2182} 2593}
2183 2594
2184sub size_request { 2595sub size_request {
2185 my ($self) = @_; 2596 my ($self) = @_;
2186 2597
2187 ($self->{tex}{w}, $self->{tex}{h}) 2598 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2188} 2599}
2189 2600
2190sub _draw { 2601sub _draw {
2191 my ($self) = @_; 2602 my ($self) = @_;
2192 2603
… …
2202 } 2613 }
2203 2614
2204 glEnable GL_TEXTURE_2D; 2615 glEnable GL_TEXTURE_2D;
2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2206 2617
2207 $tex->draw_quad (0, 0, $w, $h); 2618 $tex->draw_quad_alpha (0, 0, $w, $h);
2208 2619
2209 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2210} 2621}
2211 2622
2212############################################################################# 2623#############################################################################
… …
2231 align => 0, 2642 align => 0,
2232 valign => 0, 2643 valign => 0,
2233 can_events => 1, 2644 can_events => 1,
2234 @_ 2645 @_
2235 ); 2646 );
2647}
2648
2649sub invoke_button_down {
2650 my ($self, $ev, $x, $y) = @_;
2651
2652 1
2236} 2653}
2237 2654
2238sub invoke_button_up { 2655sub invoke_button_up {
2239 my ($self, $ev, $x, $y) = @_; 2656 my ($self, $ev, $x, $y) = @_;
2240 2657
… …
2380 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2381} 2798}
2382 2799
2383############################################################################# 2800#############################################################################
2384 2801
2802package CFPlus::UI::Progress;
2803
2804our @ISA = CFPlus::UI::Label::;
2805
2806use CFPlus::OpenGL;
2807
2808sub new {
2809 my ($class, %arg) = @_;
2810
2811 my $self = $class->SUPER::new (
2812 fg => [1, 1, 1],
2813 bg => [0, 0, 1, 0.2],
2814 bar => [0.7, 0.5, 0.1, 0.8],
2815 outline => [0.4, 0.3, 0],
2816 fontsize => 0.9,
2817 valign => 0,
2818 align => 0,
2819 can_events => 1,
2820 ellipsise => 1,
2821 label => "%d%%",
2822 %arg,
2823 );
2824
2825 $self->set_value ($arg{value} || -1);
2826
2827 $self
2828}
2829
2830sub set_label {
2831 my ($self, $label) = @_;
2832
2833 return if $self->{label} eq $label;
2834 $self->{label} = $label;
2835
2836 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2837}
2838
2839sub set_value {
2840 my ($self, $value) = @_;
2841
2842 if ($self->{value} ne $value) {
2843 $self->{value} = $value;
2844
2845 if ($value < 0) {
2846 $self->set_text ("-");
2847 } else {
2848 $self->set_text (sprintf $self->{label}, $value * 100);
2849 }
2850
2851 $self->update;
2852 }
2853}
2854
2855sub _draw {
2856 my ($self) = @_;
2857
2858 glEnable GL_BLEND;
2859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2860
2861 if ($self->{value} >= 0) {
2862 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2863
2864 glColor_premultiply @{$self->{bar}};
2865 glRect 2, 2, $s, $self->{h} - 2;
2866 glColor_premultiply @{$self->{bg}};
2867 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2868 }
2869
2870 glColor_premultiply @{$self->{outline}};
2871 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2872
2873 glDisable GL_BLEND;
2874
2875 {
2876 local $self->{bg}; # do not draw background
2877 $self->SUPER::_draw;
2878 }
2879}
2880
2881#############################################################################
2882
2883package CFPlus::UI::ExperienceProgress;
2884
2885our @ISA = CFPlus::UI::Progress::;
2886
2887sub new {
2888 my ($class, %arg) = @_;
2889
2890 my $self = $class->SUPER::new (
2891 tooltip => sub {
2892 my ($self) = @_;
2893
2894 sprintf "level %d\n%s points\n%s next level\n%s to go",
2895 $self->{lvl},
2896 ::formsep ($self->{exp}),
2897 ::formsep ($self->{nxt}),
2898 ::formsep ($self->{nxt} - $self->{exp}),
2899 },
2900 %arg
2901 );
2902
2903 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2904 if $::CONN;
2905
2906 $self
2907}
2908
2909sub DESTROY {
2910 my ($self) = @_;
2911
2912 delete $::CONN->{on_exp_update}{$self+0}
2913 if $::CONN;
2914
2915 $self->SUPER::DESTROY;
2916}
2917
2918sub set_value {
2919 my ($self, $lvl, $exp) = @_;
2920
2921 $self->{lvl} = $lvl;
2922 $self->{exp} = $exp;
2923
2924 my $v = -1;
2925
2926 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2927 my $l0 = $table->[$lvl - 1];
2928 my $l1 = $table->[$lvl];
2929
2930 $self->{nxt} = $l1;
2931
2932 $v = ($exp - $l0) / ($l1 - $l0);
2933 }
2934
2935 $self->SUPER::set_value ($v);
2936}
2937
2938#############################################################################
2939
2385package CFPlus::UI::Gauge; 2940package CFPlus::UI::Gauge;
2386 2941
2387our @ISA = CFPlus::UI::VBox::; 2942our @ISA = CFPlus::UI::VBox::;
2388 2943
2389sub new { 2944sub new {
… …
2514 3069
2515 $self->SUPER::invoke_button_down ($ev, $x, $y); 3070 $self->SUPER::invoke_button_down ($ev, $x, $y);
2516 3071
2517 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3072 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2518 3073
2519 $self->invoke_mouse_motion ($ev, $x, $y) 3074 $self->invoke_mouse_motion ($ev, $x, $y);
3075
3076 1
2520} 3077}
2521 3078
2522sub invoke_mouse_motion { 3079sub invoke_mouse_motion {
2523 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
2524 3081
… …
2540sub invoke_mouse_wheel { 3097sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_; 3098 my ($self, $ev) = @_;
2542 3099
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3100 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544 3101
3102 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3103
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3104 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546 3105
2547 ! ! $delta 3106 1
2548} 3107}
2549 3108
2550sub update { 3109sub update {
2551 my ($self) = @_; 3110 my ($self) = @_;
2552 3111
… …
2660 #font => default_font 3219 #font => default_font
2661 @_, 3220 @_,
2662 3221
2663 layout => (new CFPlus::Layout), 3222 layout => (new CFPlus::Layout),
2664 par => [], 3223 par => [],
3224 max_par => 0,
2665 height => 0, 3225 height => 0,
2666 children => [ 3226 children => [
2667 (new CFPlus::UI::Empty expand => 1), 3227 (new CFPlus::UI::Empty expand => 1),
2668 (new CFPlus::UI::Slider vertical => 1), 3228 (new CFPlus::UI::Slider vertical => 1),
2669 ], 3229 ],
… …
2682} 3242}
2683 3243
2684sub size_request { 3244sub size_request {
2685 my ($self) = @_; 3245 my ($self) = @_;
2686 3246
2687 my ($empty, $slider) = @{ $self->{children} }; 3247 my ($empty, $slider) = $self->visible_children;
2688 3248
2689 local $self->{children} = [$empty, $slider]; 3249 local $self->{children} = [$empty, $slider];
2690 $self->SUPER::size_request 3250 $self->SUPER::size_request
2691} 3251}
2692 3252
… …
2748sub set_offset { 3308sub set_offset {
2749 my ($self, $offset) = @_; 3309 my ($self, $offset) = @_;
2750 3310
2751 # todo: base offset on lines or so, not on pixels 3311 # todo: base offset on lines or so, not on pixels
2752 $self->{children}[1]->set_value ($offset); 3312 $self->{children}[1]->set_value ($offset);
3313}
3314
3315sub current_paragraph {
3316 my ($self) = @_;
3317
3318 $self->{top_paragraph} - 1
3319}
3320
3321sub scroll_to {
3322 my ($self, $para) = @_;
3323
3324 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3325
3326 $self->{scroll_to} = $para;
3327 $self->update;
2753} 3328}
2754 3329
2755sub clear { 3330sub clear {
2756 my ($self) = @_; 3331 my ($self) = @_;
2757 3332
… …
2779 3354
2780 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3355 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2781 push @{$self->{par}}, $para; 3356 push @{$self->{par}}, $para;
2782 } 3357 }
2783 3358
3359 if (my $max = $self->{max_par}) {
3360 shift @{$self->{par}} while @{$self->{par}} > $max;
3361 }
3362
2784 $self->{need_reflow}++; 3363 $self->{need_reflow}++;
2785 $self->update; 3364 $self->update;
2786} 3365}
2787 3366
2788sub scroll_to_bottom { 3367sub scroll_to_bottom {
2789 my ($self) = @_; 3368 my ($self) = @_;
2790 3369
2791 $self->{scroll_to_bottom} = 1; 3370 $self->{scroll_to} = $#{$self->{par}};
2792 $self->update; 3371 $self->update;
2793} 3372}
2794 3373
3374sub force_uptodate {
3375 my ($self) = @_;
3376
3377 if (delete $self->{need_reflow}) {
3378 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3379
3380 my $height = 0;
3381
3382 for my $para (@{$self->{par}}) {
3383 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3384 my $layout = $self->get_layout ($para);
3385 my ($w, $h) = $layout->size;
3386
3387 $para->{w} = $w + $para->{indent};
3388 $para->{h} = $h;
3389 $para->{wrapped} = $layout->has_wrapped;
3390 }
3391
3392 $para->{y} = $height;
3393 $height += $para->{h};
3394 }
3395
3396 $self->{height} = $height;
3397 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3398
3399 delete $self->{texture};
3400 }
3401
3402 if (my $paridx = delete $self->{scroll_to}) {
3403 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3404 }
3405}
3406
2795sub update { 3407sub update {
2796 my ($self) = @_; 3408 my ($self) = @_;
2797 3409
2798 $self->SUPER::update; 3410 $self->SUPER::update;
2799 3411
2800 return unless $self->{h} > 0; 3412 return unless $self->{h} > 0;
2801 3413
2802 delete $self->{texture}; 3414 delete $self->{texture};
2803 3415
2804 $ROOT->on_post_alloc ($self => sub { 3416 $ROOT->on_post_alloc ($self => sub {
3417 $self->force_uptodate;
3418
2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3419 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2806
2807 if (delete $self->{need_reflow}) {
2808 my $height = 0;
2809
2810 for my $para (@{$self->{par}}) {
2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2812 my $layout = $self->get_layout ($para);
2813 my ($w, $h) = $layout->size;
2814
2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2818 }
2819
2820 $height += $para->{h};
2821 }
2822
2823 $self->{height} = $height;
2824
2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2826
2827 delete $self->{texture};
2828 }
2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833 3420
2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3421 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2835 glClearColor 0, 0, 0, 0; 3422 glClearColor 0, 0, 0, 0;
2836 glClear GL_COLOR_BUFFER_BIT; 3423 glClear GL_COLOR_BUFFER_BIT;
2837 3424
3425 package CFPlus::UI::Base;
3426 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3427 (0, 0, $self->{w}, $self->{h});
3428
3429 my $top = int $self->{children}[1]{range}[0];
3430
3431 my $paridx = 0;
3432 my $top_paragraph;
2838 my $top = int $self->{children}[1]{range}[0]; 3433 my $top = int $self->{children}[1]{range}[0];
2839 3434
2840 my $y0 = $top; 3435 my $y0 = $top;
2841 my $y1 = $top + $H; 3436 my $y1 = $top + $H;
2842 3437
2843 my $y = 0;
2844
2845 for my $para (@{$self->{par}}) { 3438 for my $para (@{$self->{par}}) {
2846 my $h = $para->{h}; 3439 my $h = $para->{h};
3440 my $y = $para->{y};
2847 3441
2848 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
2849
2850 my $layout = $self->get_layout ($para); 3443 my $layout = $self->get_layout ($para);
2851 3444
2852 $layout->render ($para->{indent}, $y - $y0); 3445 $layout->render ($para->{indent}, $y - $y0);
3446 $layout->draw;
2853 3447
2854 if (my @w = @{ $para->{widget} }) { 3448 if (my @w = @{ $para->{widget} }) {
2855 my @s = $layout->get_shapes; 3449 my @s = $layout->get_shapes;
2856 3450
2857 for (@w) { 3451 for (@w) {
… …
2863 $_->draw; 3457 $_->draw;
2864 } 3458 }
2865 } 3459 }
2866 } 3460 }
2867 3461
2868 $y += $h; 3462 $paridx++;
3463 $top_paragraph ||= $paridx if $y >= $top;
2869 } 3464 }
3465
3466 $self->{top_paragraph} = $top_paragraph;
2870 }; 3467 };
2871 }); 3468 });
2872} 3469}
2873 3470
2874sub reconfigure { 3471sub reconfigure {
… …
2976} 3573}
2977 3574
2978sub set_tooltip_from { 3575sub set_tooltip_from {
2979 my ($self, $widget) = @_; 3576 my ($self, $widget) = @_;
2980 3577
2981 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2982 if $widget->{tooltip} =~ /^#(.*)$/;
2983
2984 my $tooltip = $widget->{tooltip}; 3578 my $tip = $widget->{tooltip};
3579 $tip = $tip->($widget) if "CODE" eq ref $tip;
3580
3581 $tip = CFPlus::Pod::section_label tooltip => $1
3582 if $tip =~ /^#(.*)$/;
2985 3583
2986 if ($ENV{CFPLUS_DEBUG} & 2) { 3584 if ($ENV{CFPLUS_DEBUG} & 2) {
2987 $tooltip .= "\n\n" . (ref $widget) . "\n" 3585 $tip .= "\n\n" . (ref $widget) . "\n"
2988 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3586 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2989 . "req $widget->{req_w} $widget->{req_h}\n" 3587 . "req $widget->{req_w} $widget->{req_h}\n"
2990 . "visible $widget->{visible}"; 3588 . "visible $widget->{visible}";
2991 } 3589 }
2992 3590
2993 $tooltip =~ s/^\n+//; 3591 $tip =~ s/^\n+//;
2994 $tooltip =~ s/\n+$//; 3592 $tip =~ s/\n+$//;
2995 3593
2996 $self->add (new CFPlus::UI::Label 3594 $self->add (new CFPlus::UI::Label
2997 markup => $tooltip, 3595 markup => $tip,
2998 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3596 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2999 fontsize => 0.8, 3597 fontsize => 0.8,
3000 style => 1, # FLAG_INVERSE 3598 style => 1, # FLAG_INVERSE
3001 ellipsise => 0, 3599 ellipsise => 0,
3002 font => ($widget->{tooltip_font} || $::FONT_PROP), 3600 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3040} 3638}
3041 3639
3042sub _draw { 3640sub _draw {
3043 my ($self) = @_; 3641 my ($self) = @_;
3044 3642
3045 glTranslate 0.375, 0.375;
3046
3047 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
3048 3644
3049 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
3050 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
3051 glVertex 0 , 0;
3052 glVertex 0 , $h;
3053 glVertex $w, $h;
3054 glVertex $w, 0;
3055 glEnd;
3056 3647
3057 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
3058 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
3059 glVertex 0 , 0;
3060 glVertex 0 , $h;
3061 glVertex $w, $h;
3062 glVertex $w, 0;
3063 glEnd;
3064 3650
3065 glTranslate 2 - 0.375, 2 - 0.375; 3651 glTranslate 2, 2;
3066 3652
3067 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
3068} 3654}
3069 3655
3070############################################################################# 3656#############################################################################
… …
3077 3663
3078sub new { 3664sub new {
3079 my $class = shift; 3665 my $class = shift;
3080 3666
3081 my $self = $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
3082 aspect => 1, 3670 aspect => 1,
3083 can_events => 0, 3671 can_events => 0,
3084 @_, 3672 @_,
3085 ); 3673 );
3086 3674
3087 if ($self->{anim} && $self->{animspeed}) { 3675 if ($self->{anim} && $self->{animspeed}) {
3088 Scalar::Util::weaken (my $widget = $self); 3676 CFPlus::weaken (my $widget = $self);
3089 3677
3090 $self->{timer} = Event->timer ( 3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3091 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3092 hard => 1, 3680 $self->{timer} = EV::timer_ns 0, 0, sub {
3093 interval => $self->{animspeed}, 3681 return unless $::CONN;
3094 cb => sub { 3682
3683 my $w = $widget
3684 or return;
3685
3095 ++$widget->{frame}; 3686 ++$w->{frame};
3687 $w->update_face;
3688
3689 # somehow, $widget can go away
3096 $widget->update; 3690 $w->update;
3097 }, 3691 $w->update_timer;
3098 ); 3692 };
3693
3694 $self->update_face;
3695 $self->update_timer;
3099 } 3696 }
3100 3697
3101 $self 3698 $self
3102} 3699}
3103 3700
3701sub update_timer {
3702 my ($self) = @_;
3703
3704 return unless $self->{timer};
3705
3706 if ($self->{visible}) {
3707 $self->{timer}->set (
3708 $self->{anim_start}
3709 + $self->{animspeed}
3710 * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3711 );
3712 $self->{timer}->start;
3713 } else {
3714 $self->{timer}->stop;
3715 }
3716}
3717
3718sub update_face {
3719 my ($self) = @_;
3720
3721 if ($::CONN) {
3722 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3723 if ($anim && @$anim) {
3724 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3725 delete $self->{face_change_cb};
3726
3727 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3728 unless ($tex->{name} || $tex->{loading}) {
3729 $tex->upload (sub { $self->reconfigure });
3730 }
3731 }
3732 }
3733 }
3734 }
3735}
3736
3104sub size_request { 3737sub size_request {
3105 (32, 8) 3738 my ($self) = @_;
3739
3740 if ($::CONN) {
3741 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3742 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3743 if ($tex->{name}) {
3744 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3745 } elsif (!$tex->{loading}) {
3746 $tex->upload (sub { $self->reconfigure });
3747 }
3748 }
3749
3750 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3751 }
3752 }
3753
3754 ($self->{size_w} || 8, $self->{size_h} || 8)
3106} 3755}
3107 3756
3108sub update { 3757sub update {
3109 my ($self) = @_; 3758 my ($self) = @_;
3110 3759
3111 return unless $self->{visible}; 3760 return unless $self->{visible};
3112 3761
3113 $self->SUPER::update; 3762 $self->SUPER::update;
3114} 3763}
3115 3764
3765sub invoke_visibility_change {
3766 my ($self) = @_;
3767
3768 $self->update_timer;
3769
3770 0
3771}
3772
3116sub _draw { 3773sub _draw {
3117 my ($self) = @_; 3774 my ($self) = @_;
3118 3775
3119 return unless $::CONN;
3120
3121 $self->SUPER::_draw; 3776 $self->SUPER::_draw;
3122 3777
3123 my $face; 3778 if (my $tex = $self->{tex}) {
3124
3125 if ($self->{frame}) {
3126 my $anim = $::CONN->{anim}[$self->{anim}];
3127
3128 $face = $anim->[ $self->{frame} % @$anim ]
3129 if $anim && @$anim;
3130 }
3131
3132 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3133
3134 if ($tex) {
3135 glEnable GL_TEXTURE_2D; 3779 glEnable GL_TEXTURE_2D;
3136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3780 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3137 glColor 0, 0, 0, 1; 3781 glColor 0, 0, 0, 1;
3138 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3782 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3139 glDisable GL_TEXTURE_2D; 3783 glDisable GL_TEXTURE_2D;
… …
3141} 3785}
3142 3786
3143sub destroy { 3787sub destroy {
3144 my ($self) = @_; 3788 my ($self) = @_;
3145 3789
3146 $self->{timer}->cancel 3790 (delete $self->{timer})->cancel
3147 if $self->{timer}; 3791 if $self->{timer};
3148 3792
3149 $self->SUPER::destroy; 3793 $self->SUPER::destroy;
3150} 3794}
3151 3795
… …
3153 3797
3154package CFPlus::UI::Buttonbar; 3798package CFPlus::UI::Buttonbar;
3155 3799
3156our @ISA = CFPlus::UI::HBox::; 3800our @ISA = CFPlus::UI::HBox::;
3157 3801
3158# TODO: should actualyl wrap buttons and other goodies. 3802# TODO: should actually wrap buttons and other goodies.
3159 3803
3160############################################################################# 3804#############################################################################
3161 3805
3162package CFPlus::UI::Menu; 3806package CFPlus::UI::Menu;
3163 3807
3164our @ISA = CFPlus::UI::FancyFrame::; 3808our @ISA = CFPlus::UI::Toplevel::;
3165 3809
3166use CFPlus::OpenGL; 3810use CFPlus::OpenGL;
3167 3811
3168sub new { 3812sub new {
3169 my $class = shift; 3813 my $class = shift;
… …
3191 children => [ 3835 children => [
3192 (new CFPlus::UI::Label markup => $left, expand => 1), 3836 (new CFPlus::UI::Label markup => $left, expand => 1),
3193 (new CFPlus::UI::Label markup => $right, align => +1), 3837 (new CFPlus::UI::Label markup => $right, align => +1),
3194 ], 3838 ],
3195 ; 3839 ;
3196 3840
3197 } else { 3841 } else {
3198 $widget = new CFPlus::UI::Label 3842 $widget = new CFPlus::UI::Label
3199 can_hover => 1, 3843 can_hover => 1,
3200 can_events => 1, 3844 can_events => 1,
3201 markup => $widget, 3845 markup => $widget,
… …
3326 3970
3327############################################################################# 3971#############################################################################
3328 3972
3329package CFPlus::UI::Notebook; 3973package CFPlus::UI::Notebook;
3330 3974
3975use CFPlus::OpenGL;
3976
3331our @ISA = CFPlus::UI::VBox::; 3977our @ISA = CFPlus::UI::VBox::;
3332 3978
3333sub new { 3979sub new {
3334 my $class = shift; 3980 my $class = shift;
3335 3981
3336 my $self = $class->SUPER::new ( 3982 my $self = $class->SUPER::new (
3337 buttonbar => (new CFPlus::UI::Buttonbar), 3983 buttonbar => (new CFPlus::UI::Buttonbar),
3338 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3984 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3985 active_outline => [.7, .7, 0.2],
3339 # filter => # will be put between multiplexer and $self 3986 # filter => # will be put between multiplexer and $self
3340 @_, 3987 @_,
3341 ); 3988 );
3342 3989
3343 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3990 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3344 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3991 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3345 3992
3993 {
3994 Scalar::Util::weaken (my $wself = $self);
3995
3996 $self->{multiplexer}->connect (c_add => sub {
3997 my ($mplex, $widgets) = @_;
3998
3999 for my $child (@$widgets) {
4000 Scalar::Util::weaken $child;
4001 $child->{c_tab_} ||= do {
4002 my $tab =
4003 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4004 ? $child->{c_tab}
4005 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4006
4007 $tab->connect (activate => sub {
4008 $wself->set_current_page ($child);
4009 });
4010
4011 $tab
4012 };
4013
4014 $self->{buttonbar}->add ($child->{c_tab_});
4015 }
4016 });
4017
4018 $self->{multiplexer}->connect (c_remove => sub {
4019 my ($mplex, $widgets) = @_;
4020
4021 for my $child (@$widgets) {
4022 $wself->{buttonbar}->remove ($child->{c_tab_});
4023 }
4024 });
4025 }
4026
3346 $self 4027 $self
3347} 4028}
3348 4029
3349sub add { 4030sub add {
4031 my ($self, @widgets) = @_;
4032
4033 $self->{multiplexer}->add (@widgets)
4034}
4035
4036sub remove {
4037 my ($self, @widgets) = @_;
4038
4039 $self->{multiplexer}->remove (@widgets)
4040}
4041
4042sub pages {
4043 my ($self) = @_;
4044 $self->{multiplexer}->children
4045}
4046
4047sub add_tab {
3350 my ($self, $title, $widget, $tooltip) = @_; 4048 my ($self, $title, $widget, $tooltip) = @_;
3351 4049
3352 Scalar::Util::weaken $self; 4050 $title = [$title, $tooltip] unless ref $title;
4051 $widget->{c_tab} = $title;
3353 4052
3354 $self->{buttonbar}->add (new CFPlus::UI::Button
3355 markup => $title,
3356 tooltip => $tooltip,
3357 on_activate => sub { $self->set_current_page ($widget) },
3358 );
3359
3360 $self->{multiplexer}->add ($widget); 4053 $self->add ($widget);
3361} 4054}
3362 4055
3363sub get_current_page { 4056sub get_current_page {
3364 my ($self) = @_; 4057 my ($self) = @_;
3365 4058
… …
3369sub set_current_page { 4062sub set_current_page {
3370 my ($self, $page) = @_; 4063 my ($self, $page) = @_;
3371 4064
3372 $self->{multiplexer}->set_current_page ($page); 4065 $self->{multiplexer}->set_current_page ($page);
3373 $self->emit (page_changed => $self->{multiplexer}{current}); 4066 $self->emit (page_changed => $self->{multiplexer}{current});
4067}
4068
4069sub _draw {
4070 my ($self) = @_;
4071
4072 $self->SUPER::_draw ();
4073
4074 if (my $cur = $self->{multiplexer}{current}) {
4075 if ($cur = $cur->{c_tab_}) {
4076 glTranslate $self->{buttonbar}{x} + $cur->{x},
4077 $self->{buttonbar}{y} + $cur->{y};
4078 glLineWidth 3;
4079 #glEnable GL_BLEND;
4080 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4081 glColor @{$self->{active_outline}};
4082 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4083 glLineWidth 1;
4084 #glDisable GL_BLEND;
4085 }
4086 }
3374} 4087}
3375 4088
3376############################################################################# 4089#############################################################################
3377 4090
3378package CFPlus::UI::Selector; 4091package CFPlus::UI::Selector;
… …
3410} 4123}
3411 4124
3412sub _set_value { 4125sub _set_value {
3413 my ($self, $value) = @_; 4126 my ($self, $value) = @_;
3414 4127
3415 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4128 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4129 $item ||= $self->{options}[0]
3416 or return; 4130 or return;
3417 4131
3418 $self->{value} = $item->[0]; 4132 $self->{value} = $item->[0];
3419 $self->set_markup ("$item->[1] ⇓"); 4133 $self->set_markup ("$item->[1] ⇓");
3420 $self->set_tooltip ($item->[2]); 4134# $self->set_tooltip ($item->[2]);
3421} 4135}
3422 4136
3423sub set_value { 4137sub set_value {
3424 my ($self, $value) = @_; 4138 my ($self, $value) = @_;
3425 4139
3426 return unless $self->{value} ne $value; 4140 return unless $self->{value} ne $value;
3427 4141
3428 $self->_set_value ($value); 4142 $self->_set_value ($value);
3429 $self->emit (changed => $value); 4143 $self->emit (changed => $value);
4144}
4145
4146sub set_options {
4147 my ($self, $options) = @_;
4148
4149 $self->{options} = $options;
4150 $self->_set_value ($self->{value});
3430} 4151}
3431 4152
3432############################################################################# 4153#############################################################################
3433 4154
3434package CFPlus::UI::Statusbox; 4155package CFPlus::UI::Statusbox;
… …
3441 my $self = $class->SUPER::new ( 4162 my $self = $class->SUPER::new (
3442 fontsize => 0.8, 4163 fontsize => 0.8,
3443 @_, 4164 @_,
3444 ); 4165 );
3445 4166
3446 Scalar::Util::weaken (my $this = $self); 4167 CFPlus::weaken (my $this = $self);
3447 4168
3448 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4169 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3449 4170
3450 $self 4171 $self
3451} 4172}
3452 4173
3453sub reorder { 4174sub reorder {
… …
3461 4182
3462 while (my ($k, $v) = each %{ $self->{item} }) { 4183 while (my ($k, $v) = each %{ $self->{item} }) {
3463 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4184 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3464 } 4185 }
3465 4186
4187 $self->{timer}->set (1, 1);
4188
3466 my @widgets; 4189 my @widgets;
3467 4190
3468 my @items = sort { 4191 my @items = sort {
3469 $a->{pri} <=> $b->{pri} 4192 $a->{pri} <=> $b->{pri}
3470 or $b->{id} <=> $a->{id} 4193 or $b->{id} <=> $a->{id}
3471 } values %{ $self->{item} }; 4194 } values %{ $self->{item} };
3472
3473 $self->{timer}->interval (1);
3474 4195
3475 my $count = 10 + 1; 4196 my $count = 10 + 1;
3476 for my $item (@items) { 4197 for my $item (@items) {
3477 last unless --$count; 4198 last unless --$count;
3478 4199
… …
3502 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4223 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3503 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4224 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3504 $label->update; 4225 $label->update;
3505 $label->set_max_size (undef, $label->{req_h} * $diff) 4226 $label->set_max_size (undef, $label->{req_h} * $diff)
3506 if $diff < 1; 4227 if $diff < 1;
3507 $self->{timer}->interval (1/30); 4228 $self->{timer}->set (1/30, 1/30);
3508 } else { 4229 } else {
3509 $label->{fg}[3] = $item->{fg}[3] || 1; 4230 $label->{fg}[3] = $item->{fg}[3] || 1;
3510 } 4231 }
3511 4232
3512 push @widgets, $label; 4233 push @widgets, $label;
… …
3574 $self->SUPER::destroy; 4295 $self->SUPER::destroy;
3575} 4296}
3576 4297
3577############################################################################# 4298#############################################################################
3578 4299
3579package CFPlus::UI::Inventory;
3580
3581our @ISA = CFPlus::UI::Table::;
3582
3583sub new {
3584 my $class = shift;
3585
3586 my $self = $class->SUPER::new (
3587 col_expand => [0, 1, 0],
3588 items => [],
3589 @_,
3590 );
3591
3592 $self->set_sort_order (undef);
3593
3594 $self
3595}
3596
3597sub update_items {
3598 my ($self) = @_;
3599
3600 $self->clear;
3601
3602 my @item = $self->{sort}->(@{ $self->{items} });
3603
3604 my @adds;
3605 my $row = 0;
3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3607 CFPlus::Item::update_widgets $item;
3608
3609 push @adds, 0, $row, $item->{face_widget};
3610 push @adds, 1, $row, $item->{desc_widget};
3611 push @adds, 2, $row, $item->{weight_widget};
3612
3613 $row++;
3614 }
3615
3616 $self->add (@adds);
3617}
3618
3619sub set_sort_order {
3620 my ($self, $order) = @_;
3621
3622 $self->{sort} = $order ||= sub {
3623 sort {
3624 $a->{type} <=> $b->{type}
3625 or $a->{name} cmp $b->{name}
3626 } @_
3627 };
3628
3629 $self->update_items;
3630}
3631
3632sub set_items {
3633 my ($self, $items) = @_;
3634
3635 $self->{items} = [$items ? values %$items : ()];
3636 $self->update_items;
3637}
3638
3639#############################################################################
3640
3641package CFPlus::UI::SpellList;
3642
3643our @ISA = CFPlus::UI::Table::;
3644
3645sub new {
3646 my $class = shift;
3647
3648 my $self = $class->SUPER::new (
3649 binding => [],
3650 commands => [],
3651 @_,
3652 )
3653}
3654
3655my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3656
3657my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3659my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3665my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3667
3668sub rebuild_spell_list {
3669 my ($self) = @_;
3670
3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3672 $self->clear;
3673
3674 return unless $::CONN;
3675
3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3681
3682 my $row = 0;
3683
3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3685 my $spell = $self->{spell}{$_};
3686
3687 $row++;
3688
3689 my $spell_cb = sub {
3690 my ($widget, $ev) = @_;
3691
3692 if ($ev->{button} == 1) {
3693 $::CONN->user_send ("cast $spell->{name}");
3694 } elsif ($ev->{button} == 2) {
3695 $::CONN->user_send ("invoke $spell->{name}");
3696 } elsif ($ev->{button} == 3) {
3697 (new CFPlus::UI::Menu
3698 items => [
3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3701 ],
3702 )->popup ($ev);
3703 } else {
3704 return 0;
3705 }
3706
3707 1
3708 };
3709
3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3711
3712 #TODO: add path info to tooltip
3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3714
3715 $self->add (0, $row, new CFPlus::UI::Face
3716 face => $spell->{face},
3717 can_hover => 1,
3718 can_events => 1,
3719 tooltip => $tooltip,
3720 on_button_down => $spell_cb,
3721 );
3722
3723 $self->add (1, $row, new CFPlus::UI::Label
3724 expand => 1,
3725 text => $spell->{name},
3726 can_hover => 1,
3727 can_events => 1,
3728 tooltip => $tooltip,
3729 on_button_down => $spell_cb,
3730 );
3731
3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3736 }
3737 });
3738}
3739
3740sub add_spell {
3741 my ($self, $spell) = @_;
3742
3743 $self->{spell}->{$spell->{name}} = $spell;
3744 $self->rebuild_spell_list;
3745}
3746
3747sub remove_spell {
3748 my ($self, $spell) = @_;
3749
3750 delete $self->{spell}->{$spell->{name}};
3751 $self->rebuild_spell_list;
3752}
3753
3754sub clear_spells {
3755 my ($self) = @_;
3756
3757 $self->{spell} = {};
3758 $self->rebuild_spell_list;
3759}
3760
3761#############################################################################
3762
3763package CFPlus::UI::Root; 4300package CFPlus::UI::Root;
3764 4301
3765our @ISA = CFPlus::UI::Container::; 4302our @ISA = CFPlus::UI::Container::;
3766 4303
3767use List::Util qw(min max); 4304use List::Util qw(min max);
… …
3774 my $self = $class->SUPER::new ( 4311 my $self = $class->SUPER::new (
3775 visible => 1, 4312 visible => 1,
3776 @_, 4313 @_,
3777 ); 4314 );
3778 4315
3779 Scalar::Util::weaken ($self->{root} = $self); 4316 CFPlus::weaken ($self->{root} = $self);
3780 4317
3781 $self 4318 $self
3782} 4319}
3783 4320
3784sub size_request { 4321sub size_request {
… …
3832} 4369}
3833 4370
3834sub update { 4371sub update {
3835 my ($self) = @_; 4372 my ($self) = @_;
3836 4373
3837 $::WANT_REFRESH++; 4374 $::WANT_REFRESH->start;
3838} 4375}
3839 4376
3840sub add { 4377sub add {
3841 my ($self, @children) = @_; 4378 my ($self, @children) = @_;
3842 4379
… …
3879 while ($self->{refresh_hook}) { 4416 while ($self->{refresh_hook}) {
3880 $_->() 4417 $_->()
3881 for values %{delete $self->{refresh_hook}}; 4418 for values %{delete $self->{refresh_hook}};
3882 } 4419 }
3883 4420
3884 if ($self->{realloc}) { 4421 while ($self->{realloc}) {
3885 my %queue; 4422 my %queue;
3886 my @queue; 4423 my @queue;
3887 my $widget; 4424 my $widget;
3888 4425
3889 outer: 4426 outer:
… …
3936 } 4473 }
3937 } 4474 }
3938 4475
3939 delete $self->{realloc}{$widget+0}; 4476 delete $self->{realloc}{$widget+0};
3940 } 4477 }
3941 }
3942 4478
3943 while (my $size_alloc = delete $self->{size_alloc}) { 4479 while (my $size_alloc = delete $self->{size_alloc}) {
3944 my @queue = sort { $b->{visible} <=> $a->{visible} } 4480 my @queue = sort { $a->{visible} <=> $b->{visible} }
3945 values %$size_alloc; 4481 values %$size_alloc;
3946 4482
3947 while () { 4483 while () {
3948 my $widget = pop @queue || last; 4484 my $widget = pop @queue || last;
3949 4485
3950 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4486 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3951 4487
3952 $w = 0 if $w < 0;
3953 $h = 0 if $h < 0;
3954
3955 $w = max $widget->{min_w}, $w; 4488 $w = max $widget->{min_w}, $w;
3956 $h = max $widget->{min_h}, $h; 4489 $h = max $widget->{min_h}, $h;
3957 4490
3958# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4491# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3959# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4492# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3960 4493
3961 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4494 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3962 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4495 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3963 4496
3964 $w = int $w + 0.5; 4497 $w = int $w + 0.5;
3965 $h = int $h + 0.5; 4498 $h = int $h + 0.5;
3966 4499
3967 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4500 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3968 $widget->{old_w} = $widget->{w}; 4501 $widget->{old_w} = $widget->{w};
3969 $widget->{old_h} = $widget->{h}; 4502 $widget->{old_h} = $widget->{h};
3970 4503
3971 $widget->{w} = $w; 4504 $widget->{w} = $w;
3972 $widget->{h} = $h; 4505 $widget->{h} = $h;
3973 4506
3974 $widget->emit (size_allocate => $w, $h); 4507 $widget->emit (size_allocate => $w, $h);
4508 }
3975 } 4509 }
3976 } 4510 }
3977 } 4511 }
3978 4512
3979 while ($self->{post_alloc_hook}) { 4513 while ($self->{post_alloc_hook}) {
3980 $_->() 4514 $_->()
3981 for values %{delete $self->{post_alloc_hook}}; 4515 for values %{delete $self->{post_alloc_hook}};
3982 } 4516 }
3983
3984 4517
3985 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4518 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3986 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4519 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3987 glClear GL_COLOR_BUFFER_BIT; 4520 glClear GL_COLOR_BUFFER_BIT;
3988 4521
… …
3993 glLoadIdentity; 4526 glLoadIdentity;
3994 4527
3995 { 4528 {
3996 package CFPlus::UI::Base; 4529 package CFPlus::UI::Base;
3997 4530
3998 ($draw_x, $draw_y, $draw_w, $draw_h) = 4531 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3999 (0, 0, $self->{w}, $self->{h}); 4532 (0, 0, $self->{w}, $self->{h});
4000 }
4001 4533
4002 $self->_draw; 4534 $self->_draw;
4535 }
4003} 4536}
4004 4537
4005############################################################################# 4538#############################################################################
4006 4539
4007package CFPlus::UI; 4540package CFPlus::UI;

Diff Legend

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