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.359 by root, Fri Dec 8 15:07:08 2006 UTC vs.
Revision 1.431 by root, Tue Aug 21 02:41:52 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; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
111 } 113 }
112 114
113 if ($GRAB) { 115 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 117 # mousewheel
116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
118 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
119 } else { 125 } else {
120 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
121 } 127 }
122 } 128 }
235 h => undef, 241 h => undef,
236 can_events => 1, 242 can_events => 1,
237 @_ 243 @_
238 }, $class; 244 }, $class;
239 245
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 247
242 for (keys %$self) { 248 for (keys %$self) {
243 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
245 } 251 }
262 268
263sub destroy { 269sub destroy {
264 my ($self) = @_; 270 my ($self) = @_;
265 271
266 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
267 %$self = (); 274 %$self = ();
275}
276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
268} 279}
269 280
270sub show { 281sub show {
271 my ($self) = @_; 282 my ($self) = @_;
272 283
313sub set_visibility { 324sub set_visibility {
314 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
315 326
316 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
317 328
318 $visible ? $self->hide 329 $visible ? $self->show
319 : $self->show; 330 : $self->hide;
320} 331}
321 332
322sub toggle_visibility { 333sub toggle_visibility {
323 my ($self) = @_; 334 my ($self) = @_;
324 335
502 513
503 defined wantarray and CFPlus::guard { 514 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 516 @{ $self->{signal_cb}{$signal} };
506 } 517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
507} 524}
508 525
509my %has_coords = ( 526my %has_coords = (
510 button_down => 1, 527 button_down => 1,
511 button_up => 1, 528 button_up => 1,
523 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
524 : (); 541 : ();
525 542
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 544
528 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 554}
533 555
534sub find_widget { 556#sub find_widget {
535 my ($self, $x, $y) = @_; 557# 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 558
546sub set_parent { 559sub set_parent {
547 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
548 561
549 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
551} 564}
552 565
553sub realloc { 566sub realloc {
554 my ($self) = @_; 567 my ($self) = @_;
580 593
581# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
582# functions seems pointless. 595# functions seems pointless.
583our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584 597
585sub draw { 598#sub draw {
586 my ($self) = @_; 599#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 600
632sub _draw { 601sub _draw {
633 my ($self) = @_; 602 my ($self) = @_;
634 603
635 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
638sub DESTROY { 607sub DESTROY {
639 my ($self) = @_; 608 my ($self) = @_;
640 609
641 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
642 611
643 delete $WIDGET{$self+0}; 612 local $@;
644
645 eval { $self->destroy }; 613 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
615
616 delete $WIDGET{$self+0};
647} 617}
648 618
649############################################################################# 619#############################################################################
650 620
651package CFPlus::UI::DrawBG; 621package CFPlus::UI::DrawBG;
655use strict; 625use strict;
656use CFPlus::OpenGL; 626use CFPlus::OpenGL;
657 627
658sub new { 628sub new {
659 my $class = shift; 629 my $class = shift;
660
661 # range [value, low, high, page]
662 630
663 $class->SUPER::new ( 631 $class->SUPER::new (
664 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
665 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
666 @_ 634 @_
678 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
679 647
680 glEnable GL_BLEND; 648 glEnable GL_BLEND;
681 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682 glColor_premultiply @$color; 650 glColor_premultiply @$color;
683
684 glBegin GL_QUADS;
685 glVertex 0 , 0;
686 glVertex 0 , $h;
687 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
688 glVertex $w, 0;
689 glEnd;
690
691 glDisable GL_BLEND; 652 glDisable GL_BLEND;
692 } 653 }
693} 654}
694 655
695############################################################################# 656#############################################################################
727 can_events => 0, 688 can_events => 0,
728 %arg, 689 %arg,
729 ); 690 );
730 691
731 $self->add (@$children) 692 $self->add (@$children)
732 if $children; 693 if $children && @$children;
733 694
734 $self 695 $self
735} 696}
736 697
737sub realloc { 698sub realloc {
746 my ($self, @widgets) = @_; 707 my ($self, @widgets) = @_;
747 708
748 $_->set_parent ($self) 709 $_->set_parent ($self)
749 for @widgets; 710 for @widgets;
750 711
712 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 713 use sort 'stable';
752 714
753 $self->{children} = [ 715 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 716 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
756 ]; 718 ];
757 719
758 $self->realloc; 720 $self->realloc;
721
722 $self->emit (c_add => \@widgets);
723
724 map $_+0, @widgets
759} 725}
760 726
761sub children { 727sub children {
762 @{ $_[0]{children} } 728 @{ $_[0]{children} }
763} 729}
764 730
765sub remove { 731sub remove {
766 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
767 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
768 delete $child->{parent}; 737 delete $child->{parent};
769 $child->hide; 738 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
772 741
773 $self->realloc; 742 $self->realloc;
774} 743}
775 744
776sub clear { 745sub clear {
777 my ($self) = @_; 746 my ($self) = @_;
778 747
779 my $children = delete $self->{children}; 748 my $children = $self->{children};
780 $self->{children} = []; 749 $self->{children} = [];
781 750
782 for (@$children) { 751 for (@$children) {
783 delete $_->{parent}; 752 delete $_->{parent};
784 $_->hide; 753 $_->hide;
804} 773}
805 774
806sub _draw { 775sub _draw {
807 my ($self) = @_; 776 my ($self) = @_;
808 777
809 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
810} 779}
811 780
812############################################################################# 781#############################################################################
813 782
814package CFPlus::UI::Bin; 783package CFPlus::UI::Bin;
824} 793}
825 794
826sub add { 795sub add {
827 my ($self, $child) = @_; 796 my ($self, $child) = @_;
828 797
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
830 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
831} 800}
832 801
833sub remove { 802sub remove {
834 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
924} 893}
925 894
926############################################################################# 895#############################################################################
927 896
928package CFPlus::UI::ViewPort; 897package CFPlus::UI::ViewPort;
898
899use List::Util qw(min max);
929 900
930our @ISA = CFPlus::UI::Window::; 901our @ISA = CFPlus::UI::Window::;
931 902
932sub new { 903sub new {
933 my $class = shift; 904 my $class = shift;
942sub size_request { 913sub size_request {
943 my ($self) = @_; 914 my ($self) = @_;
944 915
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 917
947 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
949 920
950 ($w, $h) 921 ($w, $h)
951} 922}
952 923
953sub invoke_size_allocate { 924sub invoke_size_allocate {
965} 936}
966 937
967sub set_offset { 938sub set_offset {
968 my ($self, $x, $y) = @_; 939 my ($self, $x, $y) = @_;
969 940
941 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
942 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
943
944 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 945 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 946 $self->{view_y} = $y;
972 947
948 $self->emit (changed => $x, $y);
973 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
968 }
974} 969}
975 970
976# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 972sub coord2local {
978 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
993 my ($self, $x, $y) = @_; 988 my ($self, $x, $y) = @_;
994 989
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 991 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 992 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 993 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 994 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 995 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 996 }
1002} 997}
1003 998
1014 1009
1015############################################################################# 1010#############################################################################
1016 1011
1017package CFPlus::UI::ScrolledWindow; 1012package CFPlus::UI::ScrolledWindow;
1018 1013
1019our @ISA = CFPlus::UI::HBox::; 1014our @ISA = CFPlus::UI::Table::;
1020 1015
1021sub new { 1016sub new {
1022 my ($class, %arg) = @_; 1017 my ($class, %arg) = @_;
1023 1018
1024 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1025 1020
1026 my $self; 1021 my $self;
1027 1022
1028 my $slider = new CFPlus::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1024 c_col => 0,
1025 c_row => 1,
1026 vertical => 0,
1027 range => [0, 0, 1, 0.01], # HACK fix
1028 on_changed => sub {
1029 $self->{hpos} = $_[1];
1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1031 },
1032 ;
1033
1034 my $vslider = new CFPlus::UI::Slider
1035 c_col => 1,
1036 c_row => 0,
1029 vertical => 1, 1037 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1039 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1040 $self->{vpos} = $_[1];
1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1042 },
1034 ; 1043 ;
1035 1044
1036 $self = $class->SUPER::new ( 1045 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1046 scroll_x => 0,
1047 scroll_y => 1,
1038 can_events => 1, 1048 can_events => 1,
1039 slider => $slider, 1049 hslider => $hslider,
1050 vslider => $vslider,
1051 col_expand => [1, 0],
1052 row_expand => [1, 0],
1040 %arg, 1053 %arg,
1041 ); 1054 );
1042 1055
1056 $self->{vp} = new CFPlus::UI::ViewPort
1057 c_col => 0,
1058 c_row => 0,
1059 expand => 1,
1060 scroll_x => $self->{scroll_x},
1061 scroll_y => $self->{scroll_y},
1062 on_changed => sub {
1063 my ($vp, $x, $y) = @_;
1064
1065 $vp->{parent}{hslider}->set_value ($x);
1066 $vp->{parent}{vslider}->set_value ($y);
1067
1068 0
1069 },
1070 on_size_allocate => sub {
1071 my ($vp, $w, $h) = @_;
1072 $vp->{parent}->update_slider;
1073 0
1074 },
1075 ;
1076
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1077 $self->SUPER::add ($self->{vp});
1078
1044 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1045 1080
1046 $self 1081 $self
1047} 1082}
1048
1049#TODO# update range on size_allocate depending on child
1050 1083
1051sub add { 1084sub add {
1052 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1053 1086
1054 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1055} 1088}
1056 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1094sub update_slider {
1095 my ($self) = @_;
1096
1097 my $child = ($self->{vp} or return)->child;
1098
1099 if ($self->{scroll_x}) {
1100 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1101 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1102
1103 my $visible = $w1 > $w2;
1104 if ($visible != $self->{hslider_visible}) {
1105 $self->{hslider_visible} = $visible;
1106 $visible ? $self->SUPER::add ($self->{hslider})
1107 : $self->SUPER::remove ($self->{hslider});
1108 }
1109 }
1110
1111 if ($self->{scroll_y}) {
1112 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1113 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1114
1115 my $visible = $h1 > $h2;
1116 if ($visible != $self->{vslider_visible}) {
1117 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->SUPER::remove ($self->{vslider});
1120 }
1121 }
1122}
1123
1124sub start_dragging {
1125 my ($self, $ev) = @_;
1126
1127 $self->grab_focus;
1128
1129 my $ox = $self->{vp}{view_x};
1130 my $oy = $self->{vp}{view_y};
1131
1132 $self->{motion} = sub {
1133 my ($ev, $x, $y) = @_;
1134
1135 $ox -= $ev->{xrel};
1136 $oy -= $ev->{yrel};
1137
1138 $self->{vp}->set_offset ($ox, $oy);
1139 };
1140}
1141
1057sub invoke_mouse_wheel { 1142sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1143 my ($self, $ev) = @_;
1059 1144
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1145 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1146 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1147
1064 1 1148 1
1065} 1149}
1066 1150
1067sub update_slider { 1151sub invoke_button_down {
1068 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1069 1153
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1071} 1155 $self->start_dragging ($ev);
1156 return 1;
1157 }
1072 1158
1073sub update { 1159 0
1074 my ($self) = @_; 1160}
1075 1161
1076 $self->SUPER::update; 1162sub invoke_button_up {
1163 my ($self, $ev, $x, $y) = @_;
1077 1164
1078 $self->update_slider; 1165 if (delete $self->{motion}) {
1166 return 1;
1167 }
1168
1169 0
1170}
1171
1172sub invoke_mouse_motion {
1173 my ($self, $ev, $x, $y) = @_;
1174
1175 if ($self->{motion}) {
1176 $self->{motion}->($ev, $x, $y);
1177 return 1;
1178 }
1179
1180 0
1079} 1181}
1080 1182
1081sub invoke_size_allocate { 1183sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1083 1185
1084 $self->update_slider; 1186 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1187 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1188}
1088 1189
1089############################################################################# 1190#############################################################################
1090 1191
1110 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1111 1212
1112 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1124 } 1218 }
1125 1219
1126 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1127} 1221}
1240 1334
1241my @border = 1335my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1337 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1338
1339my @icon =
1340 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1341 qw(x1_move.png x1_resize.png);
1342
1245sub new { 1343sub new {
1246 my ($class, %arg) = @_; 1344 my ($class, %arg) = @_;
1247 1345
1248 my $self = $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1347 bg => [1, 1, 1, 1],
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1516
1419 my $border = $self->border; 1517 my $border = $self->border;
1420 1518
1421 glColor @{ $self->{border_bg} }; 1519 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524
1525 # move
1526 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531
1532 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1538
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1540 glColor @{ $self->{bg} };
1429 1541
1430 # TODO: repeat texture not scale 1542 # TODO: repeat texture not scale
1451 1563
1452############################################################################# 1564#############################################################################
1453 1565
1454package CFPlus::UI::Table; 1566package CFPlus::UI::Table;
1455 1567
1456our @ISA = CFPlus::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1457 1569
1458use List::Util qw(max sum); 1570use List::Util qw(max sum);
1459 1571
1460use CFPlus::OpenGL; 1572use CFPlus::OpenGL;
1461 1573
1462sub new { 1574sub new {
1463 my $class = shift; 1575 my $class = shift;
1464 1576
1465 $class->SUPER::new ( 1577 $class->SUPER::new (
1466 col_expand => [], 1578 col_expand => [],
1579 row_expand => [],
1467 @_, 1580 @_,
1468 ) 1581 )
1469} 1582}
1470 1583
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub add { 1584sub add {
1585 my ($self, @widgets) = @_;
1586
1587 for my $child (@widgets) {
1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1591
1592 $self->SUPER::add (@widgets);
1593}
1594
1595sub add_at {
1476 my ($self) = shift; 1596 my $self = shift;
1597
1598 my @widgets;
1477 1599
1478 while (@_) { 1600 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1602
1484 $self->{force_realloc} = 1; 1603 $child->{c_row} = $row;
1485 $self->{force_size_alloc} = 1; 1604 $child->{c_col} = $col;
1486 $self->realloc;
1487}
1488 1605
1489sub remove { 1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1490 my ($self, $child) = @_; 1613 my ($self) = @_;
1491 1614
1492 # TODO: not yet implemented 1615 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1616
1499 my @children = $self->children; 1617 my @children = $self->children;
1500 delete $self->{children}; 1618
1619 # first pass, columns
1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622
1623 my $sw = sum @w[$c .. $c + $cs - 1];
1624
1625 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1627 }
1501 1628 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1629
1507 $self->realloc; 1630 # second pass, rows
1508} 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1509
1510sub get_wh {
1511 my ($self) = @_;
1512
1513 my (@w, @h);
1514
1515 for my $y (0 .. $#{$self->{children}}) {
1516 my $row = $self->{children}[$y]
1517 or next;
1518
1519 for my $x (0 .. $#$row) {
1520 my $widget = $row->[$x]
1521 or next;
1522 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1523 1633
1524 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1638 }
1527 } 1639 }
1528 1640
1529 (\@w, \@h) 1641 (\@w, \@h)
1530} 1642}
1546 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1547 1659
1548 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1550 1662
1551 # TODO: nicer code && do row_expand 1663 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1555 1667
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1669
1560 CFPlus::UI::harmonize $ws; 1670 CFPlus::UI::harmonize $ws;
1671
1672 my @row_expand = @{$self->{row_expand}};
1673 @row_expand = (1) x @$ws unless @row_expand;
1674 my $row_expand = (sum @row_expand) || 1;
1675
1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1677
1561 CFPlus::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1562 1679
1563 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1682
1565 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1567 or next;
1568 1685
1569 my $x = 0; 1686 $widget->configure (
1570 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1689 );
1572 for my $c (0 .. $#$row) { 1690 }
1573 my $col_w = $ws->[$c];
1574 1691
1575 if (my $widget = $row->[$c]) { 1692 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1693}
1577 }
1578 1694
1579 $x += $col_w; 1695#############################################################################
1696
1697package CFPlus::UI::Fixed;
1698
1699use List::Util qw(min max);
1700
1701our @ISA = CFPlus::UI::Container::;
1702
1703sub _scale($$$) {
1704 my ($rel, $val, $max) = @_;
1705
1706 $rel ? $val * $max : $val
1707}
1708
1709sub size_request {
1710 my ($self) = @_;
1711
1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1713
1714 # determine overall size by querying abs widgets
1715 for my $child ($self->visible_children) {
1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1719
1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1580 } 1722 }
1723 }
1581 1724
1582 $y += $row_h; 1725 my $W = $x2 - $x1;
1726 my $H = $y2 - $y1;
1727
1728 # now layout remaining widgets
1729 for my $child ($self->visible_children) {
1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x += $child->{c_halign} * $child->{req_w};
1753 $y += $child->{c_valign} * $child->{req_h};
1754
1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1583 } 1756 }
1584 1757
1585 1 1758 1
1586} 1759}
1587 1760
1588sub find_widget {
1589 my ($self, $x, $y) = @_;
1590
1591 $x -= $self->{x};
1592 $y -= $self->{y};
1593
1594 my $res;
1595
1596 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597 $res = $_->find_widget ($x, $y)
1598 and return $res;
1599 }
1600
1601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602}
1603
1604sub _draw {
1605 my ($self) = @_;
1606
1607 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_;
1609 }
1610}
1611
1612############################################################################# 1761#############################################################################
1613 1762
1614package CFPlus::UI::Box; 1763package CFPlus::UI::Box;
1615 1764
1616our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1617 1766
1618sub size_request { 1767sub size_request {
1619 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1620 1771
1621 $self->{vertical} 1772 $self->{vertical}
1622 ? ( 1773 ? (
1623 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1624 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1625 ) 1776 )
1626 : ( 1777 : (
1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1628 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1629 ) 1780 )
1630} 1781}
1631 1782
1632sub invoke_size_allocate { 1783sub invoke_size_allocate {
1633 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
1757 1908
1758 delete $self->{ox}; 1909 delete $self->{ox};
1759 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1760} 1911}
1761 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1762sub set_text { 1919sub set_text {
1763 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1764 1921
1765 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1766 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
1872 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
1873 2030
1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1877 }; 2036 };
1878 2037
1879 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
1880 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
1881 2040# CFPlus::OpenGL::glNewList $self->{list};
1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList;
2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
2046
2047 $self->{layout}->draw;
1883} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
1884 2057
1885############################################################################# 2058#############################################################################
1886 2059
1887package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
1888 2061
1894 my $class = shift; 2067 my $class = shift;
1895 2068
1896 $class->SUPER::new ( 2069 $class->SUPER::new (
1897 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
1898 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
1899 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
1900 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
1901 can_hover => 1, 2076 can_hover => 1,
1902 can_focus => 1, 2077 can_focus => 1,
1903 valign => 0, 2078 valign => 0,
1904 can_events => 1, 2079 can_events => 1,
1905 ellipsise => 0, 2080 ellipsise => 0,
1955 my $sym = $ev->{sym}; 2130 my $sym = $ev->{sym};
1956 my $uni = $ev->{unicode}; 2131 my $uni = $ev->{unicode};
1957 2132
1958 my $text = $self->get_text; 2133 my $text = $self->get_text;
1959 2134
2135 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2136
1960 if ($uni == 8) { 2137 if ($uni == 8) {
1961 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1962 } elsif ($uni == 127) { 2139 } elsif ($uni == 127) {
1963 substr $text, $self->{cursor}, 1, ""; 2140 substr $text, $self->{cursor}, 1, "";
1964 } elsif ($sym == CFPlus::SDLK_LEFT) { 2141 } elsif ($sym == CFPlus::SDLK_LEFT) {
1965 --$self->{cursor} if $self->{cursor}; 2142 --$self->{cursor} if $self->{cursor};
1966 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2143 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1967 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2144 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1968 } elsif ($sym == CFPlus::SDLK_HOME) { 2145 } elsif ($sym == CFPlus::SDLK_HOME) {
2146 # what a hack
1969 $self->{cursor} = 0; 2147 $self->{cursor} =
2148 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2149 ? length $1
2150 : 0;
1970 } elsif ($sym == CFPlus::SDLK_END) { 2151 } elsif ($sym == CFPlus::SDLK_END) {
2152 # uh, again
2153 $self->{cursor} =
2154 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1971 $self->{cursor} = length $text; 2155 ? $self->{cursor} + length $1
2156 : length $self->{text};
1972 } elsif ($uni == 21) { # ctrl-u 2157 } elsif ($uni == 21) { # ctrl-u
1973 $text = ""; 2158 $text = "";
1974 $self->{cursor} = 0; 2159 $self->{cursor} = 0;
1975 } elsif ($uni == 27) { 2160 } elsif ($uni == 27) {
1976 $self->emit ('escape'); 2161 $self->emit ('escape');
1977 } elsif ($uni) { 2162 } elsif ($uni == 0x0d) {
2163 substr $text, $self->{cursor}++, 0, "\012";
2164 } elsif ($uni >= 0x20) {
1978 substr $text, $self->{cursor}++, 0, chr $uni; 2165 substr $text, $self->{cursor}++, 0, chr $uni;
1979 } else { 2166 } else {
1980 return 0; 2167 return 0;
1981 } 2168 }
1982 2169
2033 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2034 } 2221 }
2035 2222
2036 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2037 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2038 glBegin GL_QUADS;
2039 glVertex 0 , 0;
2040 glVertex 0 , $self->{h};
2041 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2042 glVertex $self->{w}, 0;
2043 glEnd;
2044 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2045 2227
2046 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2047 2229
2048 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
2050 2232
2051 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2052 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2053 utf8::encode $text; 2235 utf8::encode $text;
2054 2236
2055 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2056 } 2238 }
2057 2239
2240 glColor_premultiply @{$self->{active_fg}};
2058 glBegin GL_LINES; 2241 glBegin GL_LINES;
2059 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2060 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2061 glEnd; 2244 glEnd;
2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2259 glEnd;
2062 } 2260 }
2063} 2261}
2064 2262
2065############################################################################# 2263#############################################################################
2066 2264
2073sub invoke_key_down { 2271sub invoke_key_down {
2074 my ($self, $ev) = @_; 2272 my ($self, $ev) = @_;
2075 2273
2076 my $sym = $ev->{sym}; 2274 my $sym = $ev->{sym};
2077 2275
2078 if ($sym == 13) { 2276 if ($ev->{uni} == 0x0d || $sym == 13) {
2079 unshift @{$self->{history}}, 2277 unshift @{$self->{history}},
2080 my $txt = $self->get_text; 2278 my $txt = $self->get_text;
2081 2279
2082 $self->{history_pointer} = -1; 2280 $self->{history_pointer} = -1;
2083 $self->{history_saveback} = ''; 2281 $self->{history_saveback} = '';
2104 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2302 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2105 } else { 2303 } else {
2106 $self->set_text ($self->{history_saveback}); 2304 $self->set_text ($self->{history_saveback});
2107 } 2305 }
2108 2306
2109 } elsif ($ev->{unicode} >= 0x20) { 2307 } else {
2110 return $self->SUPER::invoke_key_down ($ev) 2308 return $self->SUPER::invoke_key_down ($ev)
2111 } 2309 }
2112 2310
2113 1 2311 1
2114} 2312}
2152 1 2350 1
2153} 2351}
2154 2352
2155############################################################################# 2353#############################################################################
2156 2354
2157package CFPlus::UI::Button; 2355package CFPlus::UI::ButtonBin;
2158 2356
2159our @ISA = CFPlus::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
2160 2358
2161use CFPlus::OpenGL; 2359use CFPlus::OpenGL;
2162 2360
2163my @tex = 2361my @tex =
2164 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
2166 2364
2167sub new { 2365sub new {
2168 my $class = shift; 2366 my $class = shift;
2169 2367
2170 $class->SUPER::new ( 2368 $class->SUPER::new (
2171 padding_x => 4,
2172 padding_y => 4,
2173 fg => [1, 1, 1],
2174 active_fg => [0, 0, 1],
2175 can_hover => 1, 2369 can_hover => 1,
2176 align => 0, 2370 align => 0,
2177 valign => 0, 2371 valign => 0,
2178 can_events => 1, 2372 can_events => 1,
2179 @_ 2373 @_
2191} 2385}
2192 2386
2193sub _draw { 2387sub _draw {
2194 my ($self) = @_; 2388 my ($self) = @_;
2195 2389
2196 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2197
2198 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
2199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2200 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
2201 2393
2394 my $tex = $tex[$GRAB == $self];
2202 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2396
2397 glDisable GL_TEXTURE_2D;
2398
2399 $self->SUPER::_draw;
2400}
2401
2402#############################################################################
2403
2404package CFPlus::UI::Button;
2405
2406our @ISA = CFPlus::UI::Label::;
2407
2408use CFPlus::OpenGL;
2409
2410my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png);
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 4,
2419 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1,
2423 align => 0,
2424 valign => 0,
2425 can_events => 1,
2426 @_
2427 )
2428}
2429
2430sub invoke_button_up {
2431 my ($self, $ev, $x, $y) = @_;
2432
2433 $self->emit ("activate")
2434 if $x >= 0 && $x < $self->{w}
2435 && $y >= 0 && $y < $self->{h};
2436
2437 1
2438}
2439
2440sub _draw {
2441 my ($self) = @_;
2442
2443 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2203 2451
2204 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2205 2453
2206 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2207} 2455}
2294sub new { 2542sub new {
2295 my $class = shift; 2543 my $class = shift;
2296 2544
2297 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2298 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2299 @_, 2548 @_,
2300 ); 2549 );
2301 2550
2302 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2303 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
2304 2553
2305 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2554 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2306 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2555 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2307 2556
2308 Scalar::Util::weaken $texture_cache{$self->{path}}; 2557 CFPlus::weaken $texture_cache{$self->{path}};
2309 2558
2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2559 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2311 2560
2312 $self 2561 $self
2313} 2562}
2328} 2577}
2329 2578
2330sub size_request { 2579sub size_request {
2331 my ($self) = @_; 2580 my ($self) = @_;
2332 2581
2333 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2334} 2583}
2335 2584
2336sub _draw { 2585sub _draw {
2337 my ($self) = @_; 2586 my ($self) = @_;
2338 2587
2348 } 2597 }
2349 2598
2350 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2352 2601
2353 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2354 2603
2355 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2356} 2605}
2357 2606
2358############################################################################# 2607#############################################################################
2377 align => 0, 2626 align => 0,
2378 valign => 0, 2627 valign => 0,
2379 can_events => 1, 2628 can_events => 1,
2380 @_ 2629 @_
2381 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2382} 2637}
2383 2638
2384sub invoke_button_up { 2639sub invoke_button_up {
2385 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2386 2641
2526 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2527} 2782}
2528 2783
2529############################################################################# 2784#############################################################################
2530 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 %arg,
2806 );
2807
2808 $self->set_value ($arg{value} || -1);
2809
2810 $self
2811}
2812
2813sub set_value {
2814 my ($self, $value) = @_;
2815
2816 if ($self->{value} != $value) {
2817 $self->{value} = $value;
2818
2819 if ($value < 0) {
2820 $self->set_text ("-");
2821 } else {
2822 $self->set_text (sprintf "%d%%", $value * 100);
2823 }
2824 $self->update;
2825 }
2826}
2827
2828sub _draw {
2829 my ($self) = @_;
2830
2831 glEnable GL_BLEND;
2832 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2833
2834 if ($self->{value} >= 0) {
2835 my $s = 3 + ($self->{w} - 6) * $self->{value};
2836
2837 glColor_premultiply @{$self->{bar}};
2838 glRect 2, 2, $s, $self->{h} - 2;
2839 glColor_premultiply @{$self->{bg}};
2840 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2841 }
2842
2843 glColor_premultiply @{$self->{outline}};
2844 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2845
2846 glDisable GL_BLEND;
2847
2848 {
2849 local $self->{bg}; # do not draw background
2850 $self->SUPER::_draw;
2851 }
2852}
2853
2854#############################################################################
2855
2856package CFPlus::UI::ExperienceProgress;
2857
2858our @ISA = CFPlus::UI::Progress::;
2859
2860sub new {
2861 my ($class, %arg) = @_;
2862
2863 my $self = $class->SUPER::new (
2864 %arg
2865 );
2866
2867 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2868 if $::CONN;
2869
2870 $self
2871}
2872
2873sub DESTROY {
2874 my ($self) = @_;
2875
2876 delete $::CONN->{on_exp_update}{$self+0}
2877 if $::CONN;
2878
2879 $self->SUPER::DESTROY;
2880}
2881
2882sub set_value {
2883 my ($self, $lvl, $exp) = @_;
2884
2885 my $v = -1;
2886
2887 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2888 my $l0 = $table->[$lvl - 1];
2889 my $l1 = $table->[$lvl];
2890
2891 $v = ($exp - $l0) / ($l1 - $l0);
2892 }
2893
2894 $self->SUPER::set_value ($v);
2895}
2896
2897#############################################################################
2898
2531package CFPlus::UI::Gauge; 2899package CFPlus::UI::Gauge;
2532 2900
2533our @ISA = CFPlus::UI::VBox::; 2901our @ISA = CFPlus::UI::VBox::;
2534 2902
2535sub new { 2903sub new {
2660 3028
2661 $self->SUPER::invoke_button_down ($ev, $x, $y); 3029 $self->SUPER::invoke_button_down ($ev, $x, $y);
2662 3030
2663 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3031 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2664 3032
2665 $self->invoke_mouse_motion ($ev, $x, $y) 3033 $self->invoke_mouse_motion ($ev, $x, $y);
3034
3035 1
2666} 3036}
2667 3037
2668sub invoke_mouse_motion { 3038sub invoke_mouse_motion {
2669 my ($self, $ev, $x, $y) = @_; 3039 my ($self, $ev, $x, $y) = @_;
2670 3040
2686sub invoke_mouse_wheel { 3056sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_; 3057 my ($self, $ev) = @_;
2688 3058
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3059 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690 3060
3061 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3062
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3063 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2692 3064
2693 ! ! $delta 3065 1
2694} 3066}
2695 3067
2696sub update { 3068sub update {
2697 my ($self) = @_; 3069 my ($self) = @_;
2698 3070
2806 #font => default_font 3178 #font => default_font
2807 @_, 3179 @_,
2808 3180
2809 layout => (new CFPlus::Layout), 3181 layout => (new CFPlus::Layout),
2810 par => [], 3182 par => [],
3183 max_par => 0,
2811 height => 0, 3184 height => 0,
2812 children => [ 3185 children => [
2813 (new CFPlus::UI::Empty expand => 1), 3186 (new CFPlus::UI::Empty expand => 1),
2814 (new CFPlus::UI::Slider vertical => 1), 3187 (new CFPlus::UI::Slider vertical => 1),
2815 ], 3188 ],
2828} 3201}
2829 3202
2830sub size_request { 3203sub size_request {
2831 my ($self) = @_; 3204 my ($self) = @_;
2832 3205
2833 my ($empty, $slider) = @{ $self->{children} }; 3206 my ($empty, $slider) = $self->visible_children;
2834 3207
2835 local $self->{children} = [$empty, $slider]; 3208 local $self->{children} = [$empty, $slider];
2836 $self->SUPER::size_request 3209 $self->SUPER::size_request
2837} 3210}
2838 3211
2940 3313
2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3314 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942 push @{$self->{par}}, $para; 3315 push @{$self->{par}}, $para;
2943 } 3316 }
2944 3317
3318 if (my $max = $self->{max_par}) {
3319 shift @{$self->{par}} while @{$self->{par}} > $max;
3320 }
3321
2945 $self->{need_reflow}++; 3322 $self->{need_reflow}++;
2946 $self->update; 3323 $self->update;
2947} 3324}
2948 3325
2949sub scroll_to_bottom { 3326sub scroll_to_bottom {
3023 3400
3024 if ($y0 < $y + $h && $y < $y1) { 3401 if ($y0 < $y + $h && $y < $y1) {
3025 my $layout = $self->get_layout ($para); 3402 my $layout = $self->get_layout ($para);
3026 3403
3027 $layout->render ($para->{indent}, $y - $y0); 3404 $layout->render ($para->{indent}, $y - $y0);
3405 $layout->draw;
3028 3406
3029 if (my @w = @{ $para->{widget} }) { 3407 if (my @w = @{ $para->{widget} }) {
3030 my @s = $layout->get_shapes; 3408 my @s = $layout->get_shapes;
3031 3409
3032 for (@w) { 3410 for (@w) {
3223 glTranslate 0.375, 0.375; 3601 glTranslate 0.375, 0.375;
3224 3602
3225 my ($w, $h) = @$self{qw(w h)}; 3603 my ($w, $h) = @$self{qw(w h)};
3226 3604
3227 glColor 1, 0.8, 0.4; 3605 glColor 1, 0.8, 0.4;
3228 glBegin GL_QUADS; 3606 glRect 0, 0, $w, $h;
3229 glVertex 0 , 0;
3230 glVertex 0 , $h;
3231 glVertex $w, $h;
3232 glVertex $w, 0;
3233 glEnd;
3234 3607
3235 glColor 0, 0, 0; 3608 glColor 0, 0, 0;
3236 glBegin GL_LINE_LOOP; 3609 glRect_lineloop 0, 0, $w, $h;
3237 glVertex 0 , 0;
3238 glVertex 0 , $h;
3239 glVertex $w, $h;
3240 glVertex $w, 0;
3241 glEnd;
3242 3610
3243 glTranslate 2 - 0.375, 2 - 0.375; 3611 glTranslate 2 - 0.375, 2 - 0.375;
3244 3612
3245 $self->SUPER::_draw; 3613 $self->SUPER::_draw;
3246} 3614}
3255 3623
3256sub new { 3624sub new {
3257 my $class = shift; 3625 my $class = shift;
3258 3626
3259 my $self = $class->SUPER::new ( 3627 my $self = $class->SUPER::new (
3628 size_w => 32,
3629 size_h => 8,
3260 aspect => 1, 3630 aspect => 1,
3261 can_events => 0, 3631 can_events => 0,
3262 @_, 3632 @_,
3263 ); 3633 );
3264 3634
3265 if ($self->{anim} && $self->{animspeed}) { 3635 if ($self->{anim} && $self->{animspeed}) {
3266 Scalar::Util::weaken (my $widget = $self); 3636 CFPlus::weaken (my $widget = $self);
3267 3637
3638 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3639 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3268 $self->{timer} = Event->timer ( 3640 $self->{timer} = Event->timer (
3269 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3270 hard => 1, 3641 parked => 1,
3271 interval => $self->{animspeed},
3272 cb => sub { 3642 cb => sub {
3643 return unless $::CONN;
3644
3645 my $w = $widget
3646 or return;
3647
3273 ++$widget->{frame}; 3648 ++$w->{frame};
3649 $w->update_face;
3650
3651 # somehow, $widget can go away
3274 $widget->update; 3652 $w->update;
3653 $w->update_timer;
3275 }, 3654 },
3276 ); 3655 );
3656
3657 $self->update_face;
3658 $self->update_timer;
3277 } 3659 }
3278 3660
3279 $self 3661 $self
3280} 3662}
3281 3663
3664sub update_timer {
3665 my ($self) = @_;
3666
3667 return unless $self->{timer};
3668
3669 if ($self->{visible}) {
3670 $self->{timer}->at (
3671 $self->{anim_start}
3672 + $self->{animspeed}
3673 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3674 );
3675 $self->{timer}->start;
3676 } else {
3677 $self->{timer}->stop;
3678 }
3679}
3680
3681sub update_face {
3682 my ($self) = @_;
3683
3684 if ($::CONN) {
3685 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3686 if ($anim && @$anim) {
3687 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3688 delete $self->{face_change_cb};
3689
3690 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3691 unless ($tex->{name} || $tex->{loading}) {
3692 $tex->upload (sub { $self->reconfigure });
3693 }
3694 }
3695 }
3696 }
3697 }
3698}
3699
3282sub size_request { 3700sub size_request {
3283 (32, 8) 3701 my ($self) = @_;
3702
3703 if ($::CONN) {
3704 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3705 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3706 if ($tex->{name}) {
3707 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3708 } elsif (!$tex->{loading}) {
3709 $tex->upload (sub { $self->reconfigure });
3710 }
3711 }
3712
3713 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3714 }
3715 }
3716
3717 ($self->{size_w} || 8, $self->{size_h} || 8)
3284} 3718}
3285 3719
3286sub update { 3720sub update {
3287 my ($self) = @_; 3721 my ($self) = @_;
3288 3722
3289 return unless $self->{visible}; 3723 return unless $self->{visible};
3290 3724
3291 $self->SUPER::update; 3725 $self->SUPER::update;
3292} 3726}
3293 3727
3728sub invoke_visibility_change {
3729 my ($self) = @_;
3730
3731 $self->update_timer;
3732
3733 0
3734}
3735
3294sub _draw { 3736sub _draw {
3295 my ($self) = @_; 3737 my ($self) = @_;
3296 3738
3297 return unless $::CONN;
3298
3299 $self->SUPER::_draw; 3739 $self->SUPER::_draw;
3300 3740
3301 my $face; 3741 if (my $tex = $self->{tex}) {
3302
3303 if ($self->{frame}) {
3304 my $anim = $::CONN->{anim}[$self->{anim}];
3305
3306 $face = $anim->[ $self->{frame} % @$anim ]
3307 if $anim && @$anim;
3308 }
3309
3310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3311
3312 if ($tex) {
3313 glEnable GL_TEXTURE_2D; 3742 glEnable GL_TEXTURE_2D;
3314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3315 glColor 0, 0, 0, 1; 3744 glColor 0, 0, 0, 1;
3316 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3317 glDisable GL_TEXTURE_2D; 3746 glDisable GL_TEXTURE_2D;
3319} 3748}
3320 3749
3321sub destroy { 3750sub destroy {
3322 my ($self) = @_; 3751 my ($self) = @_;
3323 3752
3324 $self->{timer}->cancel 3753 (delete $self->{timer})->cancel
3325 if $self->{timer}; 3754 if $self->{timer};
3326 3755
3327 $self->SUPER::destroy; 3756 $self->SUPER::destroy;
3328} 3757}
3329 3758
3369 children => [ 3798 children => [
3370 (new CFPlus::UI::Label markup => $left, expand => 1), 3799 (new CFPlus::UI::Label markup => $left, expand => 1),
3371 (new CFPlus::UI::Label markup => $right, align => +1), 3800 (new CFPlus::UI::Label markup => $right, align => +1),
3372 ], 3801 ],
3373 ; 3802 ;
3374 3803
3375 } else { 3804 } else {
3376 $widget = new CFPlus::UI::Label 3805 $widget = new CFPlus::UI::Label
3377 can_hover => 1, 3806 can_hover => 1,
3378 can_events => 1, 3807 can_events => 1,
3379 markup => $widget, 3808 markup => $widget,
3515 buttonbar => (new CFPlus::UI::Buttonbar), 3944 buttonbar => (new CFPlus::UI::Buttonbar),
3516 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3945 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3517 # filter => # will be put between multiplexer and $self 3946 # filter => # will be put between multiplexer and $self
3518 @_, 3947 @_,
3519 ); 3948 );
3520 3949
3521 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3950 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3522 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3951 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3523 3952
3953 {
3954 Scalar::Util::weaken (my $wself = $self);
3955
3956 $self->{multiplexer}->connect (c_add => sub {
3957 my ($mplex, $widgets) = @_;
3958
3959 for my $child (@$widgets) {
3960 Scalar::Util::weaken $child;
3961 $child->{c_tab_} ||= do {
3962 my $tab =
3963 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3964 ? $child->{c_tab}
3965 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3966
3967 $tab->connect (activate => sub {
3968 $wself->set_current_page ($child);
3969 });
3970
3971 $tab
3972 };
3973
3974 $self->{buttonbar}->add ($child->{c_tab_});
3975 }
3976 });
3977
3978 $self->{multiplexer}->connect (c_remove => sub {
3979 my ($mplex, $widgets) = @_;
3980
3981 for my $child (@$widgets) {
3982 $wself->{buttonbar}->remove ($child->{c_tab_});
3983 }
3984 });
3985 }
3986
3524 $self 3987 $self
3525} 3988}
3526 3989
3527sub add { 3990sub add {
3991 my ($self, @widgets) = @_;
3992
3993 $self->{multiplexer}->add (@widgets)
3994}
3995
3996sub remove {
3997 my ($self, @widgets) = @_;
3998
3999 $self->{multiplexer}->remove (@widgets)
4000}
4001
4002sub pages {
4003 my ($self) = @_;
4004 $self->{multiplexer}->children
4005}
4006
4007sub add_tab {
3528 my ($self, $title, $widget, $tooltip) = @_; 4008 my ($self, $title, $widget, $tooltip) = @_;
3529 4009
3530 Scalar::Util::weaken $self; 4010 $title = [$title, $tooltip] unless ref $title;
4011 $widget->{c_tab} = $title;
3531 4012
3532 $self->{buttonbar}->add (new CFPlus::UI::Button
3533 markup => $title,
3534 tooltip => $tooltip,
3535 on_activate => sub { $self->set_current_page ($widget) },
3536 );
3537
3538 $self->{multiplexer}->add ($widget); 4013 $self->add ($widget);
3539} 4014}
3540 4015
3541sub get_current_page { 4016sub get_current_page {
3542 my ($self) = @_; 4017 my ($self) = @_;
3543 4018
3619 my $self = $class->SUPER::new ( 4094 my $self = $class->SUPER::new (
3620 fontsize => 0.8, 4095 fontsize => 0.8,
3621 @_, 4096 @_,
3622 ); 4097 );
3623 4098
3624 Scalar::Util::weaken (my $this = $self); 4099 CFPlus::weaken (my $this = $self);
3625 4100
3626 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4101 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3627 4102
3628 $self 4103 $self
3629} 4104}
3752 $self->SUPER::destroy; 4227 $self->SUPER::destroy;
3753} 4228}
3754 4229
3755############################################################################# 4230#############################################################################
3756 4231
3757package CFPlus::UI::Inventory;
3758
3759our @ISA = CFPlus::UI::Table::;
3760
3761sub new {
3762 my $class = shift;
3763
3764 my $self = $class->SUPER::new (
3765 col_expand => [0, 1, 0],
3766 items => [],
3767 @_,
3768 );
3769
3770 $self->set_sort_order (undef);
3771
3772 $self
3773}
3774
3775sub update_items {
3776 my ($self) = @_;
3777
3778 $self->clear;
3779
3780 my @item = $self->{sort}->(@{ $self->{items} });
3781
3782 my @adds;
3783 my $row = 0;
3784 for my $item ($self->{sort}->(@{ $self->{items} })) {
3785 CFPlus::Item::update_widgets $item;
3786
3787 push @adds, 0, $row, $item->{face_widget};
3788 push @adds, 1, $row, $item->{desc_widget};
3789 push @adds, 2, $row, $item->{weight_widget};
3790
3791 $row++;
3792 }
3793
3794 $self->add (@adds);
3795}
3796
3797sub set_sort_order {
3798 my ($self, $order) = @_;
3799
3800 $self->{sort} = $order ||= sub {
3801 sort {
3802 $a->{type} <=> $b->{type}
3803 or $a->{name} cmp $b->{name}
3804 } @_
3805 };
3806
3807 $self->update_items;
3808}
3809
3810sub set_items {
3811 my ($self, $items) = @_;
3812
3813 $self->{items} = [$items ? values %$items : ()];
3814 $self->update_items;
3815}
3816
3817#############################################################################
3818
3819package CFPlus::UI::SpellList;
3820
3821our @ISA = CFPlus::UI::Table::;
3822
3823sub new {
3824 my $class = shift;
3825
3826 my $self = $class->SUPER::new (
3827 binding => [],
3828 commands => [],
3829 @_,
3830 )
3831}
3832
3833my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3834
3835my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3836 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3837my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3838 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3839my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3840 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3841my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3842 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3843my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3844 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3845
3846sub rebuild_spell_list {
3847 my ($self) = @_;
3848
3849 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3850 $self->clear;
3851
3852 return unless $::CONN;
3853
3854 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3855 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3856 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3857 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3858 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3859
3860 my $row = 0;
3861
3862 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3863 my $spell = $self->{spell}{$_};
3864
3865 $row++;
3866
3867 my $spell_cb = sub {
3868 my ($widget, $ev) = @_;
3869
3870 if ($ev->{button} == 1) {
3871 $::CONN->user_send ("cast $spell->{name}");
3872 } elsif ($ev->{button} == 2) {
3873 $::CONN->user_send ("invoke $spell->{name}");
3874 } elsif ($ev->{button} == 3) {
3875 my $shortname = CFPlus::shorten $spell->{name}, 14;
3876 (new CFPlus::UI::Menu
3877 items => [
3878 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3879 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3880 ],
3881 )->popup ($ev);
3882 } else {
3883 return 0;
3884 }
3885
3886 1
3887 };
3888
3889 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3890
3891 #TODO: add path info to tooltip
3892 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3893
3894 $self->add (0, $row, new CFPlus::UI::Face
3895 face => $spell->{face},
3896 can_hover => 1,
3897 can_events => 1,
3898 tooltip => $tooltip,
3899 on_button_down => $spell_cb,
3900 );
3901
3902 $self->add (1, $row, new CFPlus::UI::Label
3903 expand => 1,
3904 text => $spell->{name},
3905 can_hover => 1,
3906 can_events => 1,
3907 tooltip => $tooltip,
3908 on_button_down => $spell_cb,
3909 );
3910
3911 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3912 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3913 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3914 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3915 }
3916 });
3917}
3918
3919sub add_spell {
3920 my ($self, $spell) = @_;
3921
3922 $self->{spell}->{$spell->{name}} = $spell;
3923 $self->rebuild_spell_list;
3924}
3925
3926sub remove_spell {
3927 my ($self, $spell) = @_;
3928
3929 delete $self->{spell}->{$spell->{name}};
3930 $self->rebuild_spell_list;
3931}
3932
3933sub clear_spells {
3934 my ($self) = @_;
3935
3936 $self->{spell} = {};
3937 $self->rebuild_spell_list;
3938}
3939
3940#############################################################################
3941
3942package CFPlus::UI::Root; 4232package CFPlus::UI::Root;
3943 4233
3944our @ISA = CFPlus::UI::Container::; 4234our @ISA = CFPlus::UI::Container::;
3945 4235
3946use List::Util qw(min max); 4236use List::Util qw(min max);
3953 my $self = $class->SUPER::new ( 4243 my $self = $class->SUPER::new (
3954 visible => 1, 4244 visible => 1,
3955 @_, 4245 @_,
3956 ); 4246 );
3957 4247
3958 Scalar::Util::weaken ($self->{root} = $self); 4248 CFPlus::weaken ($self->{root} = $self);
3959 4249
3960 $self 4250 $self
3961} 4251}
3962 4252
3963sub size_request { 4253sub size_request {
4011} 4301}
4012 4302
4013sub update { 4303sub update {
4014 my ($self) = @_; 4304 my ($self) = @_;
4015 4305
4016 $::WANT_REFRESH++; 4306 $::WANT_REFRESH->start;
4017} 4307}
4018 4308
4019sub add { 4309sub add {
4020 my ($self, @children) = @_; 4310 my ($self, @children) = @_;
4021 4311
4058 while ($self->{refresh_hook}) { 4348 while ($self->{refresh_hook}) {
4059 $_->() 4349 $_->()
4060 for values %{delete $self->{refresh_hook}}; 4350 for values %{delete $self->{refresh_hook}};
4061 } 4351 }
4062 4352
4063 if ($self->{realloc}) { 4353 while ($self->{realloc}) {
4064 my %queue; 4354 my %queue;
4065 my @queue; 4355 my @queue;
4066 my $widget; 4356 my $widget;
4067 4357
4068 outer: 4358 outer:
4115 } 4405 }
4116 } 4406 }
4117 4407
4118 delete $self->{realloc}{$widget+0}; 4408 delete $self->{realloc}{$widget+0};
4119 } 4409 }
4120 }
4121 4410
4122 while (my $size_alloc = delete $self->{size_alloc}) { 4411 while (my $size_alloc = delete $self->{size_alloc}) {
4123 my @queue = sort { $b->{visible} <=> $a->{visible} } 4412 my @queue = sort { $a->{visible} <=> $b->{visible} }
4124 values %$size_alloc; 4413 values %$size_alloc;
4125 4414
4126 while () { 4415 while () {
4127 my $widget = pop @queue || last; 4416 my $widget = pop @queue || last;
4128 4417
4129 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4418 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4130 4419
4131 $w = 0 if $w < 0;
4132 $h = 0 if $h < 0;
4133
4134 $w = max $widget->{min_w}, $w; 4420 $w = max $widget->{min_w}, $w;
4135 $h = max $widget->{min_h}, $h; 4421 $h = max $widget->{min_h}, $h;
4136 4422
4137# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4423# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4138# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4424# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4139 4425
4140 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4426 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4141 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4427 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4142 4428
4143 $w = int $w + 0.5; 4429 $w = int $w + 0.5;
4144 $h = int $h + 0.5; 4430 $h = int $h + 0.5;
4145 4431
4146 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4432 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4147 $widget->{old_w} = $widget->{w}; 4433 $widget->{old_w} = $widget->{w};
4148 $widget->{old_h} = $widget->{h}; 4434 $widget->{old_h} = $widget->{h};
4149 4435
4150 $widget->{w} = $w; 4436 $widget->{w} = $w;
4151 $widget->{h} = $h; 4437 $widget->{h} = $h;
4152 4438
4153 $widget->emit (size_allocate => $w, $h); 4439 $widget->emit (size_allocate => $w, $h);
4440 }
4154 } 4441 }
4155 } 4442 }
4156 } 4443 }
4157 4444
4158 while ($self->{post_alloc_hook}) { 4445 while ($self->{post_alloc_hook}) {
4159 $_->() 4446 $_->()
4160 for values %{delete $self->{post_alloc_hook}}; 4447 for values %{delete $self->{post_alloc_hook}};
4161 } 4448 }
4162
4163 4449
4164 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4165 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4166 glClear GL_COLOR_BUFFER_BIT; 4452 glClear GL_COLOR_BUFFER_BIT;
4167 4453

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines