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

Diff Legend

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