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.358 by root, Fri Dec 8 14:59:54 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 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
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show; 36 $TOOLTIP->show;
40 } 37 }
41 38
42 return; 39 return;
43 } 40 }
44 } 41 }
45 } 42 }
46 43
47 $TOOLTIP->hide; 44 $TOOLTIP->hide;
45 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 46 delete $TOOLTIP->{owner};
49}); 47});
50 48
51sub get_layout { 49sub get_layout {
52 my $layout; 50 my $layout;
… …
111 } 109 }
112 110
113 if ($GRAB) { 111 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 112 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 113 # mousewheel
116 $ev->{dx} = 0;
117 $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
118 $GRAB->emit (mouse_wheel => $ev); 120 $GRAB->emit (mouse_wheel => $ev);
119 } else { 121 } else {
120 $GRAB->emit (button_down => $ev) 122 $GRAB->emit (button_down => $ev)
121 } 123 }
122 } 124 }
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
262 264
263sub destroy { 265sub destroy {
264 my ($self) = @_; 266 my ($self) = @_;
265 267
266 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
271}
272
273sub TO_JSON {
274 { "\fw" => $_[0]{s_id} }
268} 275}
269 276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
351 358
352 $self->{force_w} = $w; 359 $self->{force_w} = $w;
353 $self->{force_h} = $h; 360 $self->{force_h} = $h;
354 361
355 $self->realloc; 362 $self->realloc;
363}
364
365# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT)
356} 373}
357 374
358sub size_request { 375sub size_request {
359 require Carp; 376 require Carp;
360 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
… …
502 519
503 defined wantarray and CFPlus::guard { 520 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 521 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 522 @{ $self->{signal_cb}{$signal} };
506 } 523 }
524}
525
526sub disconnect_all {
527 my ($self, $signal) = @_;
528
529 delete $self->{signal_cb}{$signal};
507} 530}
508 531
509my %has_coords = ( 532my %has_coords = (
510 button_down => 1, 533 button_down => 1,
511 button_up => 1, 534 button_up => 1,
… …
523 ? $args[0]->xy ($self) 546 ? $args[0]->xy ($self)
524 : (); 547 : ();
525 548
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 549 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 550
528 #d##TODO# stop propagating at first true, do not use sum 551 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 552 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 553 ($self->can ("invoke_$signal") || sub { 1 }), # closure
554 ) {
555 return $cb->($self, @args, @append) || next;
556 }
557
558 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 559 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 560}
533 561
534sub find_widget { 562#sub find_widget {
535 my ($self, $x, $y) = @_; 563# 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 564
546sub set_parent { 565sub set_parent {
547 my ($self, $parent) = @_; 566 my ($self, $parent) = @_;
548 567
549 Scalar::Util::weaken ($self->{parent} = $parent); 568 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 569 $self->set_visible if $parent->{visible};
551} 570}
552 571
553sub realloc { 572sub realloc {
554 my ($self) = @_; 573 my ($self) = @_;
… …
580 599
581# using global variables seems a bit hacky, but passing through all drawing 600# using global variables seems a bit hacky, but passing through all drawing
582# functions seems pointless. 601# functions seems pointless.
583our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 602our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584 603
585sub draw { 604#sub draw {
586 my ($self) = @_; 605#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 606
632sub _draw { 607sub _draw {
633 my ($self) = @_; 608 my ($self) = @_;
634 609
635 warn "no draw defined for $self\n"; 610 warn "no draw defined for $self\n";
… …
638sub DESTROY { 613sub DESTROY {
639 my ($self) = @_; 614 my ($self) = @_;
640 615
641 return if CFPlus::in_destruct; 616 return if CFPlus::in_destruct;
642 617
643 delete $WIDGET{$self+0}; 618 local $@;
644
645 eval { $self->destroy }; 619 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
621
622 delete $WIDGET{$self+0};
647} 623}
648 624
649############################################################################# 625#############################################################################
650 626
651package CFPlus::UI::DrawBG; 627package CFPlus::UI::DrawBG;
… …
655use strict; 631use strict;
656use CFPlus::OpenGL; 632use CFPlus::OpenGL;
657 633
658sub new { 634sub new {
659 my $class = shift; 635 my $class = shift;
660
661 # range [value, low, high, page]
662 636
663 $class->SUPER::new ( 637 $class->SUPER::new (
664 #bg => [0, 0, 0, 0.2], 638 #bg => [0, 0, 0, 0.2],
665 #active_bg => [1, 1, 1, 0.5], 639 #active_bg => [1, 1, 1, 0.5],
666 @_ 640 @_
… …
678 my ($w, $h) = @$self{qw(w h)}; 652 my ($w, $h) = @$self{qw(w h)};
679 653
680 glEnable GL_BLEND; 654 glEnable GL_BLEND;
681 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 655 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
682 glColor_premultiply @$color; 656 glColor_premultiply @$color;
683
684 glBegin GL_QUADS;
685 glVertex 0 , 0;
686 glVertex 0 , $h;
687 glVertex $w, $h; 657 glRect 0, 0, $w, $h;
688 glVertex $w, 0;
689 glEnd;
690
691 glDisable GL_BLEND; 658 glDisable GL_BLEND;
692 } 659 }
693} 660}
694 661
695############################################################################# 662#############################################################################
… …
727 can_events => 0, 694 can_events => 0,
728 %arg, 695 %arg,
729 ); 696 );
730 697
731 $self->add (@$children) 698 $self->add (@$children)
732 if $children; 699 if $children && @$children;
733 700
734 $self 701 $self
735} 702}
736 703
737sub realloc { 704sub realloc {
… …
746 my ($self, @widgets) = @_; 713 my ($self, @widgets) = @_;
747 714
748 $_->set_parent ($self) 715 $_->set_parent ($self)
749 for @widgets; 716 for @widgets;
750 717
718 # TODO: only do this in widgets that need it, e.g. root, fixed
751 use sort 'stable'; 719 use sort 'stable';
752 720
753 $self->{children} = [ 721 $self->{children} = [
754 sort { $a->{z} <=> $b->{z} } 722 sort { $a->{z} <=> $b->{z} }
755 @{$self->{children}}, @widgets 723 @{$self->{children}}, @widgets
756 ]; 724 ];
757 725
758 $self->realloc; 726 $self->realloc;
727
728 $self->emit (c_add => \@widgets);
729
730 map $_+0, @widgets
759} 731}
760 732
761sub children { 733sub children {
762 @{ $_[0]{children} } 734 @{ $_[0]{children} }
763} 735}
764 736
765sub remove { 737sub remove {
766 my ($self, $child) = @_; 738 my ($self, @widgets) = @_;
767 739
740 $self->emit (c_remove => \@widgets);
741
742 for my $child (@widgets) {
768 delete $child->{parent}; 743 delete $child->{parent};
769 $child->hide; 744 $child->hide;
770
771 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 745 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
746 }
772 747
773 $self->realloc; 748 $self->realloc;
774} 749}
775 750
776sub clear { 751sub clear {
777 my ($self) = @_; 752 my ($self) = @_;
778 753
779 my $children = delete $self->{children}; 754 my $children = $self->{children};
780 $self->{children} = []; 755 $self->{children} = [];
781 756
782 for (@$children) { 757 for (@$children) {
783 delete $_->{parent}; 758 delete $_->{parent};
784 $_->hide; 759 $_->hide;
… …
804} 779}
805 780
806sub _draw { 781sub _draw {
807 my ($self) = @_; 782 my ($self) = @_;
808 783
809 $_->draw for @{$self->{children}}; 784 $_->draw for $self->visible_children;
810} 785}
811 786
812############################################################################# 787#############################################################################
813 788
814package CFPlus::UI::Bin; 789package CFPlus::UI::Bin;
… …
824} 799}
825 800
826sub add { 801sub add {
827 my ($self, $child) = @_; 802 my ($self, $child) = @_;
828 803
829 $self->SUPER::remove ($_) for @{ $self->{children} }; 804 $self->clear;
830 $self->SUPER::add ($child); 805 $self->SUPER::add ($child);
831} 806}
832 807
833sub remove { 808sub remove {
834 my ($self, $widget) = @_; 809 my ($self, $widget) = @_;
… …
852 827
853 1 828 1
854} 829}
855 830
856############################################################################# 831#############################################################################
857
858# back-buffered drawing area 832# back-buffered drawing area
859 833
860package CFPlus::UI::Window; 834package CFPlus::UI::Window;
861 835
862our @ISA = CFPlus::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
… …
924} 898}
925 899
926############################################################################# 900#############################################################################
927 901
928package CFPlus::UI::ViewPort; 902package CFPlus::UI::ViewPort;
903
904use List::Util qw(min max);
929 905
930our @ISA = CFPlus::UI::Window::; 906our @ISA = CFPlus::UI::Window::;
931 907
932sub new { 908sub new {
933 my $class = shift; 909 my $class = shift;
… …
942sub size_request { 918sub size_request {
943 my ($self) = @_; 919 my ($self) = @_;
944 920
945 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 921 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946 922
947 $w = 10 if $self->{scroll_x}; 923 $w = 1 if $self->{scroll_x};
948 $h = 10 if $self->{scroll_y}; 924 $h = 1 if $self->{scroll_y};
949 925
950 ($w, $h) 926 ($w, $h)
951} 927}
952 928
953sub invoke_size_allocate { 929sub invoke_size_allocate {
… …
965} 941}
966 942
967sub set_offset { 943sub set_offset {
968 my ($self, $x, $y) = @_; 944 my ($self, $x, $y) = @_;
969 945
946 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
947 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
948
949 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 950 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 951 $self->{view_y} = $y;
972 952
953 $self->emit (changed => $x, $y);
973 $self->update; 954 $self->update;
955 }
956}
957
958sub set_center {
959 my ($self, $x, $y) = @_;
960
961 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
962}
963
964sub make_visible {
965 my ($self, $x, $y, $border) = @_;
966
967 if ( $x < $self->{view_x} + $self->{w} * $border
968 || $x > $self->{view_x} + $self->{w} * (1 - $border)
969 || $y < $self->{view_y} + $self->{h} * $border
970 || $y > $self->{view_y} + $self->{h} * (1 - $border)
971 ) {
972 $self->set_center ($x, $y);
973 }
974} 974}
975 975
976# hmm, this does not work for topleft of $self... but we should not ask for that 976# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 977sub coord2local {
978 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
… …
993 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
994 994
995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
997 ) { 997 ) {
998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999 } else { 999 } else {
1000 $self->CFPlus::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
1001 } 1001 }
1002} 1002}
1003 1003
… …
1014 1014
1015############################################################################# 1015#############################################################################
1016 1016
1017package CFPlus::UI::ScrolledWindow; 1017package CFPlus::UI::ScrolledWindow;
1018 1018
1019our @ISA = CFPlus::UI::HBox::; 1019our @ISA = CFPlus::UI::Table::;
1020 1020
1021sub new { 1021sub new {
1022 my ($class, %arg) = @_; 1022 my ($class, %arg) = @_;
1023 1023
1024 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1025 1025
1026 my $self; 1026 my $self;
1027 1027
1028 my $slider = new CFPlus::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1029 c_col => 0,
1030 c_row => 1,
1031 vertical => 0,
1032 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub {
1034 $self->{hpos} = $_[1];
1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1036 },
1037 ;
1038
1039 my $vslider = new CFPlus::UI::Slider
1040 c_col => 1,
1041 c_row => 0,
1029 vertical => 1, 1042 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1044 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vpos} = $_[1];
1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1047 },
1034 ; 1048 ;
1035 1049
1036 $self = $class->SUPER::new ( 1050 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1051 scroll_x => 0,
1052 scroll_y => 1,
1038 can_events => 1, 1053 can_events => 1,
1039 slider => $slider, 1054 hslider => $hslider,
1055 vslider => $vslider,
1056 col_expand => [1, 0],
1057 row_expand => [1, 0],
1040 %arg, 1058 %arg,
1041 ); 1059 );
1042 1060
1061 $self->{vp} = new CFPlus::UI::ViewPort
1062 c_col => 0,
1063 c_row => 0,
1064 expand => 1,
1065 scroll_x => $self->{scroll_x},
1066 scroll_y => $self->{scroll_y},
1067 on_changed => sub {
1068 my ($vp, $x, $y) = @_;
1069
1070 $vp->{parent}{hslider}->set_value ($x);
1071 $vp->{parent}{vslider}->set_value ($y);
1072
1073 0
1074 },
1075 on_size_allocate => sub {
1076 my ($vp, $w, $h) = @_;
1077 $vp->{parent}->update_slider;
1078 0
1079 },
1080 ;
1081
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add ($self->{vp});
1083
1044 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1045 1085
1046 $self 1086 $self
1047} 1087}
1048
1049#TODO# update range on size_allocate depending on child
1050 1088
1051sub add { 1089sub add {
1052 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
1053 1091
1054 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
1055} 1093}
1056 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
1099sub update_slider {
1100 my ($self) = @_;
1101
1102 my $child = ($self->{vp} or return)->child;
1103
1104 if ($self->{scroll_x}) {
1105 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107
1108 my $visible = $w1 > $w2;
1109 if ($visible != $self->{hslider_visible}) {
1110 $self->{hslider_visible} = $visible;
1111 $visible ? $self->SUPER::add ($self->{hslider})
1112 : $self->SUPER::remove ($self->{hslider});
1113 }
1114 }
1115
1116 if ($self->{scroll_y}) {
1117 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1118 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1119
1120 my $visible = $h1 > $h2;
1121 if ($visible != $self->{vslider_visible}) {
1122 $self->{vslider_visible} = $visible;
1123 $visible ? $self->SUPER::add ($self->{vslider})
1124 : $self->SUPER::remove ($self->{vslider});
1125 }
1126 }
1127}
1128
1129sub start_dragging {
1130 my ($self, $ev) = @_;
1131
1132 $self->grab_focus;
1133
1134 my $ox = $self->{vp}{view_x};
1135 my $oy = $self->{vp}{view_y};
1136
1137 $self->{motion} = sub {
1138 my ($ev, $x, $y) = @_;
1139
1140 $ox -= $ev->{xrel};
1141 $oy -= $ev->{yrel};
1142
1143 $self->{vp}->set_offset ($ox, $oy);
1144 };
1145}
1146
1057sub invoke_mouse_wheel { 1147sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1148 my ($self, $ev) = @_;
1059 1149
1060 return 0 unless $ev->{dy}; # only vertical movements
1061
1062 $self->{slider}->emit (mouse_wheel => $ev); 1150 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1151 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063 1152
1064 1 1153 1
1065} 1154}
1066 1155
1067sub update_slider { 1156sub invoke_button_down {
1068 my ($self) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1069 1158
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1159 if ($ev->{button} == 2) {
1071} 1160 $self->start_dragging ($ev);
1161 return 1;
1162 }
1072 1163
1073sub update { 1164 0
1074 my ($self) = @_; 1165}
1075 1166
1076 $self->SUPER::update; 1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1077 1169
1078 $self->update_slider; 1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1079} 1186}
1080 1187
1081sub invoke_size_allocate { 1188sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1083 1190
1084 $self->update_slider; 1191 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1193}
1088 1194
1089############################################################################# 1195#############################################################################
1090 1196
… …
1110 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1111 1217
1112 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1113 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1114 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1115
1116 glBegin GL_QUADS;
1117 glVertex 0 , 0;
1118 glVertex 0 , $h;
1119 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1120 glVertex $w, 0;
1121 glEnd;
1122
1123 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1124 } 1223 }
1125 1224
1126 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1127} 1226}
… …
1240 1339
1241my @border = 1340my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1341 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); 1342 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1343
1344my @icon =
1345 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1346 qw(x1_move.png x1_resize.png);
1347
1245sub new { 1348sub new {
1246 my ($class, %arg) = @_; 1349 my ($class, %arg) = @_;
1247 1350
1248 my $self = $class->SUPER::new ( 1351 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1352 bg => [1, 1, 1, 1],
… …
1284 1387
1285sub border { 1388sub border {
1286 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1287} 1390}
1288 1391
1392sub get_max_wh {
1393 my ($self) = @_;
1394
1395 return ($self->{w}, $self->{h})
1396 if $self->{visible} && $self->{w};
1397
1398 $self->SUPER::get_max_wh
1399}
1400
1289sub size_request { 1401sub size_request {
1290 my ($self) = @_; 1402 my ($self) = @_;
1291 1403
1292 $self->{title_widget}->size_request 1404 $self->{title_widget}->size_request
1293 if $self->{title_widget}; 1405 if $self->{title_widget};
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1530
1419 my $border = $self->border; 1531 my $border = $self->border;
1420 1532
1421 glColor @{ $self->{border_bg} }; 1533 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1534 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1535 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1536 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1537 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1538
1539 # move
1540 my $w2 = ($w - $border) * .5;
1541 my $h2 = ($h - $border) * .5;
1542 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1543 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1545
1546 # resize
1547 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1548 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1549 unless $self->{has_close_button};
1550 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1551 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1552
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1553 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1554 glColor @{ $self->{bg} };
1429 1555
1430 # TODO: repeat texture not scale 1556 # TODO: repeat texture not scale
… …
1451 1577
1452############################################################################# 1578#############################################################################
1453 1579
1454package CFPlus::UI::Table; 1580package CFPlus::UI::Table;
1455 1581
1456our @ISA = CFPlus::UI::Base::; 1582our @ISA = CFPlus::UI::Container::;
1457 1583
1458use List::Util qw(max sum); 1584use List::Util qw(max sum);
1459 1585
1460use CFPlus::OpenGL; 1586use CFPlus::OpenGL;
1461 1587
1462sub new { 1588sub new {
1463 my $class = shift; 1589 my $class = shift;
1464 1590
1465 $class->SUPER::new ( 1591 $class->SUPER::new (
1466 col_expand => [], 1592 col_expand => [],
1593 row_expand => [],
1467 @_, 1594 @_,
1468 ) 1595 )
1469} 1596}
1470 1597
1471sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473}
1474
1475sub add { 1598sub add {
1599 my ($self, @widgets) = @_;
1600
1601 for my $child (@widgets) {
1602 $child->{c_rowspan} ||= 1;
1603 $child->{c_colspan} ||= 1;
1604 }
1605
1606 $self->SUPER::add (@widgets);
1607}
1608
1609sub add_at {
1476 my ($self) = shift; 1610 my $self = shift;
1611
1612 my @widgets;
1477 1613
1478 while (@_) { 1614 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child;
1482 }
1483 1616
1484 $self->{force_realloc} = 1; 1617 $child->{c_row} = $row;
1485 $self->{force_size_alloc} = 1; 1618 $child->{c_col} = $col;
1486 $self->realloc;
1487}
1488 1619
1489sub remove { 1620 push @widgets, $child;
1621 }
1622
1623 $self->add (@widgets);
1624}
1625
1626sub get_wh {
1490 my ($self, $child) = @_; 1627 my ($self) = @_;
1491 1628
1492 # TODO: not yet implemented 1629 my (@w, @h);
1493}
1494
1495# TODO: move to container class maybe? send children a signal on removal?
1496sub clear {
1497 my ($self) = @_;
1498 1630
1499 my @children = $self->children; 1631 my @children = $self->children;
1500 delete $self->{children}; 1632
1633 # first pass, columns
1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1636
1637 my $sw = sum @w[$c .. $c + $cs - 1];
1638
1639 if ($w > $sw) {
1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1641 }
1501 1642 }
1502 for (@children) {
1503 delete $_->{parent};
1504 $_->hide;
1505 }
1506 1643
1507 $self->realloc; 1644 # second pass, rows
1508} 1645 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)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1523 1647
1524 $w[$x] = max $w[$x], $w; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1525 $h[$y] = max $h[$y], $h; 1649
1650 if ($h > $sh) {
1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526 } 1652 }
1527 } 1653 }
1528 1654
1529 (\@w, \@h) 1655 (\@w, \@h)
1530} 1656}
… …
1546 my ($ws, $hs) = $self->get_wh; 1672 my ($ws, $hs) = $self->get_wh;
1547 1673
1548 my $req_w = (sum @$ws) || 1; 1674 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1675 my $req_h = (sum @$hs) || 1;
1550 1676
1551 # TODO: nicer code && do row_expand 1677 # now linearly scale the rows/columns to the allocated size
1552 my @col_expand = @{$self->{col_expand}}; 1678 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1679 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1680 my $col_expand = (sum @col_expand) || 1;
1555 1681
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1682 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1683
1560 CFPlus::UI::harmonize $ws; 1684 CFPlus::UI::harmonize $ws;
1685
1686 my @row_expand = @{$self->{row_expand}};
1687 @row_expand = (1) x @$ws unless @row_expand;
1688 my $row_expand = (sum @row_expand) || 1;
1689
1690 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1691
1561 CFPlus::UI::harmonize $hs; 1692 CFPlus::UI::harmonize $hs;
1562 1693
1563 my $y; 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564 1696
1565 for my $r (0 .. $#{$self->{children}}) { 1697 for my $widget ($self->children) {
1566 my $row = $self->{children}[$r] 1698 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 1699
1569 my $x = 0; 1700 $widget->configure (
1570 my $row_h = $hs->[$r]; 1701 $x[$c], $y[$r],
1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571 1703 );
1572 for my $c (0 .. $#$row) { 1704 }
1573 my $col_w = $ws->[$c];
1574 1705
1575 if (my $widget = $row->[$c]) { 1706 1
1576 $widget->configure ($x, $y, $col_w, $row_h); 1707}
1577 }
1578 1708
1579 $x += $col_w; 1709#############################################################################
1710
1711package CFPlus::UI::Fixed;
1712
1713use List::Util qw(min max);
1714
1715our @ISA = CFPlus::UI::Container::;
1716
1717sub _scale($$$) {
1718 my ($rel, $val, $max) = @_;
1719
1720 $rel ? $val * $max : $val
1721}
1722
1723sub size_request {
1724 my ($self) = @_;
1725
1726 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1727
1728 # determine overall size by querying abs widgets
1729 for my $child ($self->visible_children) {
1730 unless ($child->{c_rel}) {
1731 my $x = $child->{c_x};
1732 my $y = $child->{c_y};
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};
1580 } 1736 }
1737 }
1581 1738
1582 $y += $row_h; 1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 # now layout remaining widgets
1743 for my $child ($self->visible_children) {
1744 if ($child->{c_rel}) {
1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1747
1748 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1749 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1750 }
1751 }
1752
1753 my $W = $x2 - $x1;
1754 my $H = $y2 - $y1;
1755
1756 ($W, $H)
1757}
1758
1759sub invoke_size_allocate {
1760 my ($self, $W, $H) = @_;
1761
1762 for my $child ($self->visible_children) {
1763 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1764 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1765
1766 $x += $child->{c_halign} * $child->{req_w};
1767 $y += $child->{c_valign} * $child->{req_h};
1768
1769 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1583 } 1770 }
1584 1771
1585 1 1772 1
1586} 1773}
1587 1774
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############################################################################# 1775#############################################################################
1613 1776
1614package CFPlus::UI::Box; 1777package CFPlus::UI::Box;
1615 1778
1616our @ISA = CFPlus::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1617 1780
1618sub size_request { 1781sub size_request {
1619 my ($self) = @_; 1782 my ($self) = @_;
1783
1784 my @children = $self->visible_children;
1620 1785
1621 $self->{vertical} 1786 $self->{vertical}
1622 ? ( 1787 ? (
1623 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1624 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1625 ) 1790 )
1626 : ( 1791 : (
1627 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1628 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1629 ) 1794 )
1630} 1795}
1631 1796
1632sub invoke_size_allocate { 1797sub invoke_size_allocate {
1633 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
… …
1757 1922
1758 delete $self->{ox}; 1923 delete $self->{ox};
1759 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1760} 1925}
1761 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1762sub set_text { 1933sub set_text {
1763 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1764 1935
1765 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1766 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
1789 1960
1790sub size_request { 1961sub size_request {
1791 my ($self) = @_; 1962 my ($self) = @_;
1792 1963
1793 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1794 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1795 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1796 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1797 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1798 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1799 1972
1800 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
1872 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
1873 2046
1874 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1875 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1877 }; 2052 };
1878 2053
1879 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2054# unless ($self->{list}) {
1880 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
1881 2056# CFPlus::OpenGL::glNewList $self->{list};
1882 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2057# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2058# CFPlus::OpenGL::glEndList;
2059# }
2060#
2061# CFPlus::OpenGL::glCallList $self->{list};
2062
2063 $self->{layout}->draw;
1883} 2064}
2065
2066#sub destroy {
2067# my ($self) = @_;
2068#
2069# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2070#
2071# $self->SUPER::destroy;
2072#}
1884 2073
1885############################################################################# 2074#############################################################################
1886 2075
1887package CFPlus::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
1888 2077
… …
1894 my $class = shift; 2083 my $class = shift;
1895 2084
1896 $class->SUPER::new ( 2085 $class->SUPER::new (
1897 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
1898 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
1899 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
1900 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
1901 can_hover => 1, 2092 can_hover => 1,
1902 can_focus => 1, 2093 can_focus => 1,
1903 valign => 0, 2094 valign => 0,
1904 can_events => 1, 2095 can_events => 1,
1905 ellipsise => 0, 2096 ellipsise => 0,
… …
1955 my $sym = $ev->{sym}; 2146 my $sym = $ev->{sym};
1956 my $uni = $ev->{unicode}; 2147 my $uni = $ev->{unicode};
1957 2148
1958 my $text = $self->get_text; 2149 my $text = $self->get_text;
1959 2150
2151 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2152
1960 if ($uni == 8) { 2153 if ($uni == 8) {
1961 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2154 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1962 } elsif ($uni == 127) { 2155 } elsif ($uni == 127) {
1963 substr $text, $self->{cursor}, 1, ""; 2156 substr $text, $self->{cursor}, 1, "";
1964 } elsif ($sym == CFPlus::SDLK_LEFT) { 2157 } elsif ($sym == CFPlus::SDLK_LEFT) {
1965 --$self->{cursor} if $self->{cursor}; 2158 --$self->{cursor} if $self->{cursor};
1966 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2159 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1967 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2160 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1968 } elsif ($sym == CFPlus::SDLK_HOME) { 2161 } elsif ($sym == CFPlus::SDLK_HOME) {
2162 # what a hack
1969 $self->{cursor} = 0; 2163 $self->{cursor} =
2164 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2165 ? length $1
2166 : 0;
1970 } elsif ($sym == CFPlus::SDLK_END) { 2167 } elsif ($sym == CFPlus::SDLK_END) {
2168 # uh, again
2169 $self->{cursor} =
2170 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1971 $self->{cursor} = length $text; 2171 ? $self->{cursor} + length $1
2172 : length $self->{text};
1972 } elsif ($uni == 21) { # ctrl-u 2173 } elsif ($uni == 21) { # ctrl-u
1973 $text = ""; 2174 $text = "";
1974 $self->{cursor} = 0; 2175 $self->{cursor} = 0;
1975 } elsif ($uni == 27) { 2176 } elsif ($uni == 27) {
1976 $self->emit ('escape'); 2177 $self->emit ('escape');
2178 } elsif ($uni == 0x0d) {
2179 substr $text, $self->{cursor}++, 0, "\012";
1977 } elsif ($uni >= 0x20) { 2180 } elsif ($uni >= 0x20) {
1978 substr $text, $self->{cursor}++, 0, chr $uni; 2181 substr $text, $self->{cursor}++, 0, chr $uni;
1979 } else { 2182 } else {
1980 return 0; 2183 return 0;
1981 } 2184 }
… …
2033 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2034 } 2237 }
2035 2238
2036 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2037 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 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}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2042 glVertex $self->{w}, 0;
2043 glEnd;
2044 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2045 2243
2046 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2047 2245
2048 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2050 2248
2051 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
2052 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
2053 utf8::encode $text; 2251 utf8::encode $text;
2054 2252
2055 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2253 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2056 } 2254 }
2057 2255
2256 glColor_premultiply @{$self->{active_fg}};
2058 glBegin GL_LINES; 2257 glBegin GL_LINES;
2059 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2060 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2260 glEnd;
2261
2262 glLineWidth 3;
2263 glColor @{$self->{active_outline}};
2264 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2265 glLineWidth 1;
2266
2267 } else {
2268 glColor @{$self->{outline}};
2269 glBegin GL_LINE_STRIP;
2270 glVertex .5, $self->{h} * .5;
2271 glVertex .5, $self->{h} - 2.5;
2272 glVertex $self->{w} - .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} * .5;
2061 glEnd; 2274 glEnd;
2062 } 2275 }
2063} 2276}
2064 2277
2065############################################################################# 2278#############################################################################
… …
2073sub invoke_key_down { 2286sub invoke_key_down {
2074 my ($self, $ev) = @_; 2287 my ($self, $ev) = @_;
2075 2288
2076 my $sym = $ev->{sym}; 2289 my $sym = $ev->{sym};
2077 2290
2078 if ($sym == 13) { 2291 if ($ev->{uni} == 0x0d || $sym == 13) {
2079 unshift @{$self->{history}}, 2292 unshift @{$self->{history}},
2080 my $txt = $self->get_text; 2293 my $txt = $self->get_text;
2081 2294
2082 $self->{history_pointer} = -1; 2295 $self->{history_pointer} = -1;
2083 $self->{history_saveback} = ''; 2296 $self->{history_saveback} = '';
… …
2124sub move_cursor_ver { 2337sub move_cursor_ver {
2125 my ($self, $dy) = @_; 2338 my ($self, $dy) = @_;
2126 2339
2127 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2340 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2128 2341
2129 do { 2342 $y += $dy;
2343
2130 if (defined (my $index = $self->{layout}->line_x_to_index ($y + $dy, $x))) { 2344 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2131 $self->{cursor} = $index; 2345 $self->{cursor} = $index;
2132 delete $self->{cur_h}; 2346 delete $self->{cur_h};
2133 $self->update; 2347 $self->update;
2134 return; 2348 return;
2135 } 2349 }
2136 } while --$x >= 0;
2137} 2350}
2138 2351
2139sub invoke_key_down { 2352sub invoke_key_down {
2140 my ($self, $ev) = @_; 2353 my ($self, $ev) = @_;
2141 2354
… …
2152 1 2365 1
2153} 2366}
2154 2367
2155############################################################################# 2368#############################################################################
2156 2369
2157package CFPlus::UI::Button; 2370package CFPlus::UI::ButtonBin;
2158 2371
2159our @ISA = CFPlus::UI::Label::; 2372our @ISA = CFPlus::UI::Bin::;
2160 2373
2161use CFPlus::OpenGL; 2374use CFPlus::OpenGL;
2162 2375
2163my @tex = 2376my @tex =
2164 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 qw(b1_button_active.png); 2378 qw(b1_button_inactive.png b1_button_active.png);
2166 2379
2167sub new { 2380sub new {
2168 my $class = shift; 2381 my $class = shift;
2169 2382
2170 $class->SUPER::new ( 2383 $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, 2384 can_hover => 1,
2176 align => 0, 2385 align => 0,
2177 valign => 0, 2386 valign => 0,
2178 can_events => 1, 2387 can_events => 1,
2179 @_ 2388 @_
… …
2191} 2400}
2192 2401
2193sub _draw { 2402sub _draw {
2194 my ($self) = @_; 2403 my ($self) = @_;
2195 2404
2196 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2197
2198 glEnable GL_TEXTURE_2D; 2405 glEnable GL_TEXTURE_2D;
2199 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2406 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2200 glColor 0, 0, 0, 1; 2407 glColor 0, 0, 0, 1;
2201 2408
2409 my $tex = $tex[$GRAB == $self];
2202 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2410 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2411
2412 glDisable GL_TEXTURE_2D;
2413
2414 $self->SUPER::_draw;
2415}
2416
2417#############################################################################
2418
2419package CFPlus::UI::Button;
2420
2421our @ISA = CFPlus::UI::Label::;
2422
2423use CFPlus::OpenGL;
2424
2425my @tex =
2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2427 qw(b1_button_inactive.png b1_button_active.png);
2428
2429sub new {
2430 my $class = shift;
2431
2432 $class->SUPER::new (
2433 padding_x => 4,
2434 padding_y => 4,
2435 fg => [1.0, 1.0, 1.0],
2436 active_fg => [0.8, 0.8, 0.8],
2437 can_hover => 1,
2438 align => 0,
2439 valign => 0,
2440 can_events => 1,
2441 @_
2442 )
2443}
2444
2445sub invoke_button_up {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 $self->emit ("activate")
2449 if $x >= 0 && $x < $self->{w}
2450 && $y >= 0 && $y < $self->{h};
2451
2452 1
2453}
2454
2455sub _draw {
2456 my ($self) = @_;
2457
2458 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2459
2460 glEnable GL_TEXTURE_2D;
2461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2462 glColor 0, 0, 0, 1;
2463
2464 my $tex = $tex[$GRAB == $self];
2465 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2203 2466
2204 glDisable GL_TEXTURE_2D; 2467 glDisable GL_TEXTURE_2D;
2205 2468
2206 $self->SUPER::_draw; 2469 $self->SUPER::_draw;
2207} 2470}
… …
2264sub _draw { 2527sub _draw {
2265 my ($self) = @_; 2528 my ($self) = @_;
2266 2529
2267 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2268 2531
2269 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2270 2533
2271 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2272 2535
2273 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2536 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2274 2537
… …
2294sub new { 2557sub new {
2295 my $class = shift; 2558 my $class = shift;
2296 2559
2297 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2298 can_events => 0, 2561 can_events => 0,
2562 scale => 1,
2299 @_, 2563 @_,
2300 ); 2564 );
2301 2565
2302 $self->{path} || $self->{tex} 2566 $self->{path} || $self->{tex}
2303 or Carp::croak "'path' or 'tex' attributes required"; 2567 or Carp::croak "'path' or 'tex' attributes required";
2304 2568
2305 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2569 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2306 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2570 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2307 2571
2308 Scalar::Util::weaken $texture_cache{$self->{path}}; 2572 CFPlus::weaken $texture_cache{$self->{path}};
2309 2573
2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2574 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2311 2575
2312 $self 2576 $self
2313} 2577}
… …
2328} 2592}
2329 2593
2330sub size_request { 2594sub size_request {
2331 my ($self) = @_; 2595 my ($self) = @_;
2332 2596
2333 ($self->{tex}{w}, $self->{tex}{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2334} 2598}
2335 2599
2336sub _draw { 2600sub _draw {
2337 my ($self) = @_; 2601 my ($self) = @_;
2338 2602
… …
2348 } 2612 }
2349 2613
2350 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2352 2616
2353 $tex->draw_quad (0, 0, $w, $h); 2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2354 2618
2355 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2356} 2620}
2357 2621
2358############################################################################# 2622#############################################################################
… …
2377 align => 0, 2641 align => 0,
2378 valign => 0, 2642 valign => 0,
2379 can_events => 1, 2643 can_events => 1,
2380 @_ 2644 @_
2381 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2382} 2652}
2383 2653
2384sub invoke_button_up { 2654sub invoke_button_up {
2385 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2386 2656
… …
2526 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2527} 2797}
2528 2798
2529############################################################################# 2799#############################################################################
2530 2800
2801package CFPlus::UI::Progress;
2802
2803our @ISA = CFPlus::UI::Label::;
2804
2805use CFPlus::OpenGL;
2806
2807sub new {
2808 my ($class, %arg) = @_;
2809
2810 my $self = $class->SUPER::new (
2811 fg => [1, 1, 1],
2812 bg => [0, 0, 1, 0.2],
2813 bar => [0.7, 0.5, 0.1, 0.8],
2814 outline => [0.4, 0.3, 0],
2815 fontsize => 0.9,
2816 valign => 0,
2817 align => 0,
2818 can_events => 1,
2819 ellipsise => 1,
2820 label => "%d%%",
2821 %arg,
2822 );
2823
2824 $self->set_value ($arg{value} || -1);
2825
2826 $self
2827}
2828
2829sub set_label {
2830 my ($self, $label) = @_;
2831
2832 return if $self->{label} eq $label;
2833 $self->{label} = $label;
2834
2835 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2836}
2837
2838sub set_value {
2839 my ($self, $value) = @_;
2840
2841 if ($self->{value} ne $value) {
2842 $self->{value} = $value;
2843
2844 if ($value < 0) {
2845 $self->set_text ("-");
2846 } else {
2847 $self->set_text (sprintf $self->{label}, $value * 100);
2848 }
2849
2850 $self->update;
2851 }
2852}
2853
2854sub _draw {
2855 my ($self) = @_;
2856
2857 glEnable GL_BLEND;
2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2859
2860 if ($self->{value} >= 0) {
2861 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2862
2863 glColor_premultiply @{$self->{bar}};
2864 glRect 2, 2, $s, $self->{h} - 2;
2865 glColor_premultiply @{$self->{bg}};
2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2867 }
2868
2869 glColor_premultiply @{$self->{outline}};
2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2871
2872 glDisable GL_BLEND;
2873
2874 {
2875 local $self->{bg}; # do not draw background
2876 $self->SUPER::_draw;
2877 }
2878}
2879
2880#############################################################################
2881
2882package CFPlus::UI::ExperienceProgress;
2883
2884our @ISA = CFPlus::UI::Progress::;
2885
2886sub new {
2887 my ($class, %arg) = @_;
2888
2889 my $self = $class->SUPER::new (
2890 tooltip => sub {
2891 my ($self) = @_;
2892
2893 sprintf "level %d\n%s points\n%s next level\n%s to go",
2894 $self->{lvl},
2895 ::formsep ($self->{exp}),
2896 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}),
2898 },
2899 %arg
2900 );
2901
2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2903 if $::CONN;
2904
2905 $self
2906}
2907
2908sub DESTROY {
2909 my ($self) = @_;
2910
2911 delete $::CONN->{on_exp_update}{$self+0}
2912 if $::CONN;
2913
2914 $self->SUPER::DESTROY;
2915}
2916
2917sub set_value {
2918 my ($self, $lvl, $exp) = @_;
2919
2920 $self->{lvl} = $lvl;
2921 $self->{exp} = $exp;
2922
2923 my $v = -1;
2924
2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2926 my $l0 = $table->[$lvl - 1];
2927 my $l1 = $table->[$lvl];
2928
2929 $self->{nxt} = $l1;
2930
2931 $v = ($exp - $l0) / ($l1 - $l0);
2932 }
2933
2934 $self->SUPER::set_value ($v);
2935}
2936
2937#############################################################################
2938
2531package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2532 2940
2533our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2534 2942
2535sub new { 2943sub new {
… …
2660 3068
2661 $self->SUPER::invoke_button_down ($ev, $x, $y); 3069 $self->SUPER::invoke_button_down ($ev, $x, $y);
2662 3070
2663 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3071 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2664 3072
2665 $self->invoke_mouse_motion ($ev, $x, $y) 3073 $self->invoke_mouse_motion ($ev, $x, $y);
3074
3075 1
2666} 3076}
2667 3077
2668sub invoke_mouse_motion { 3078sub invoke_mouse_motion {
2669 my ($self, $ev, $x, $y) = @_; 3079 my ($self, $ev, $x, $y) = @_;
2670 3080
… …
2686sub invoke_mouse_wheel { 3096sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_; 3097 my ($self, $ev) = @_;
2688 3098
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3099 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690 3100
3101 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3102
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 3103 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2692 3104
2693 ! ! $delta 3105 1
2694} 3106}
2695 3107
2696sub update { 3108sub update {
2697 my ($self) = @_; 3109 my ($self) = @_;
2698 3110
… …
2806 #font => default_font 3218 #font => default_font
2807 @_, 3219 @_,
2808 3220
2809 layout => (new CFPlus::Layout), 3221 layout => (new CFPlus::Layout),
2810 par => [], 3222 par => [],
3223 max_par => 0,
2811 height => 0, 3224 height => 0,
2812 children => [ 3225 children => [
2813 (new CFPlus::UI::Empty expand => 1), 3226 (new CFPlus::UI::Empty expand => 1),
2814 (new CFPlus::UI::Slider vertical => 1), 3227 (new CFPlus::UI::Slider vertical => 1),
2815 ], 3228 ],
… …
2828} 3241}
2829 3242
2830sub size_request { 3243sub size_request {
2831 my ($self) = @_; 3244 my ($self) = @_;
2832 3245
2833 my ($empty, $slider) = @{ $self->{children} }; 3246 my ($empty, $slider) = $self->visible_children;
2834 3247
2835 local $self->{children} = [$empty, $slider]; 3248 local $self->{children} = [$empty, $slider];
2836 $self->SUPER::size_request 3249 $self->SUPER::size_request
2837} 3250}
2838 3251
… …
2940 3353
2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3354 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942 push @{$self->{par}}, $para; 3355 push @{$self->{par}}, $para;
2943 } 3356 }
2944 3357
3358 if (my $max = $self->{max_par}) {
3359 shift @{$self->{par}} while @{$self->{par}} > $max;
3360 }
3361
2945 $self->{need_reflow}++; 3362 $self->{need_reflow}++;
2946 $self->update; 3363 $self->update;
2947} 3364}
2948 3365
2949sub scroll_to_bottom { 3366sub scroll_to_bottom {
… …
3023 3440
3024 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3025 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3026 3443
3027 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3028 3446
3029 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3030 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3031 3449
3032 for (@w) { 3450 for (@w) {
… …
3154} 3572}
3155 3573
3156sub set_tooltip_from { 3574sub set_tooltip_from {
3157 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3158 3576
3159 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3160 if $widget->{tooltip} =~ /^#(.*)$/;
3161
3162 my $tooltip = $widget->{tooltip}; 3577 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579
3580 $tip = CFPlus::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/;
3163 3582
3164 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3165 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3166 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3167 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3168 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3169 } 3588 }
3170 3589
3171 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3172 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3173 3592
3174 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3175 markup => $tooltip, 3594 markup => $tip,
3176 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3177 fontsize => 0.8, 3596 fontsize => 0.8,
3178 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3179 ellipsise => 0, 3598 ellipsise => 0,
3180 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3218} 3637}
3219 3638
3220sub _draw { 3639sub _draw {
3221 my ($self) = @_; 3640 my ($self) = @_;
3222 3641
3223 glTranslate 0.375, 0.375;
3224
3225 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3226 3643
3227 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3228 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
3229 glVertex 0 , 0;
3230 glVertex 0 , $h;
3231 glVertex $w, $h;
3232 glVertex $w, 0;
3233 glEnd;
3234 3646
3235 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3236 glBegin GL_LINE_LOOP; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
3237 glVertex 0 , 0;
3238 glVertex 0 , $h;
3239 glVertex $w, $h;
3240 glVertex $w, 0;
3241 glEnd;
3242 3649
3243 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3244 3651
3245 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3246} 3653}
3247 3654
3248############################################################################# 3655#############################################################################
… …
3255 3662
3256sub new { 3663sub new {
3257 my $class = shift; 3664 my $class = shift;
3258 3665
3259 my $self = $class->SUPER::new ( 3666 my $self = $class->SUPER::new (
3667 size_w => 32,
3668 size_h => 8,
3260 aspect => 1, 3669 aspect => 1,
3261 can_events => 0, 3670 can_events => 0,
3262 @_, 3671 @_,
3263 ); 3672 );
3264 3673
3265 if ($self->{anim} && $self->{animspeed}) { 3674 if ($self->{anim} && $self->{animspeed}) {
3266 Scalar::Util::weaken (my $widget = $self); 3675 CFPlus::weaken (my $widget = $self);
3267 3676
3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3268 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3269 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3270 hard => 1, 3680 parked => 1,
3271 interval => $self->{animspeed},
3272 cb => sub { 3681 cb => sub {
3682 return unless $::CONN;
3683
3684 my $w = $widget
3685 or return;
3686
3273 ++$widget->{frame}; 3687 ++$w->{frame};
3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3274 $widget->update; 3691 $w->update;
3692 $w->update_timer;
3275 }, 3693 },
3276 ); 3694 );
3695
3696 $self->update_face;
3697 $self->update_timer;
3277 } 3698 }
3278 3699
3279 $self 3700 $self
3280} 3701}
3281 3702
3703sub update_timer {
3704 my ($self) = @_;
3705
3706 return unless $self->{timer};
3707
3708 if ($self->{visible}) {
3709 $self->{timer}->at (
3710 $self->{anim_start}
3711 + $self->{animspeed}
3712 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3713 );
3714 $self->{timer}->start;
3715 } else {
3716 $self->{timer}->stop;
3717 }
3718}
3719
3720sub update_face {
3721 my ($self) = @_;
3722
3723 if ($::CONN) {
3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3725 if ($anim && @$anim) {
3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3727 delete $self->{face_change_cb};
3728
3729 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3730 unless ($tex->{name} || $tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3733 }
3734 }
3735 }
3736 }
3737}
3738
3282sub size_request { 3739sub size_request {
3283 (32, 8) 3740 my ($self) = @_;
3741
3742 if ($::CONN) {
3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3745 if ($tex->{name}) {
3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3747 } elsif (!$tex->{loading}) {
3748 $tex->upload (sub { $self->reconfigure });
3749 }
3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3753 }
3754 }
3755
3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3284} 3757}
3285 3758
3286sub update { 3759sub update {
3287 my ($self) = @_; 3760 my ($self) = @_;
3288 3761
3289 return unless $self->{visible}; 3762 return unless $self->{visible};
3290 3763
3291 $self->SUPER::update; 3764 $self->SUPER::update;
3292} 3765}
3293 3766
3767sub invoke_visibility_change {
3768 my ($self) = @_;
3769
3770 $self->update_timer;
3771
3772 0
3773}
3774
3294sub _draw { 3775sub _draw {
3295 my ($self) = @_; 3776 my ($self) = @_;
3296 3777
3297 return unless $::CONN;
3298
3299 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3300 3779
3301 my $face; 3780 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; 3781 glEnable GL_TEXTURE_2D;
3314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3315 glColor 0, 0, 0, 1; 3783 glColor 0, 0, 0, 1;
3316 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3784 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3317 glDisable GL_TEXTURE_2D; 3785 glDisable GL_TEXTURE_2D;
… …
3319} 3787}
3320 3788
3321sub destroy { 3789sub destroy {
3322 my ($self) = @_; 3790 my ($self) = @_;
3323 3791
3324 $self->{timer}->cancel 3792 (delete $self->{timer})->cancel
3325 if $self->{timer}; 3793 if $self->{timer};
3326 3794
3327 $self->SUPER::destroy; 3795 $self->SUPER::destroy;
3328} 3796}
3329 3797
… …
3369 children => [ 3837 children => [
3370 (new CFPlus::UI::Label markup => $left, expand => 1), 3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3371 (new CFPlus::UI::Label markup => $right, align => +1), 3839 (new CFPlus::UI::Label markup => $right, align => +1),
3372 ], 3840 ],
3373 ; 3841 ;
3374 3842
3375 } else { 3843 } else {
3376 $widget = new CFPlus::UI::Label 3844 $widget = new CFPlus::UI::Label
3377 can_hover => 1, 3845 can_hover => 1,
3378 can_events => 1, 3846 can_events => 1,
3379 markup => $widget, 3847 markup => $widget,
… …
3504 3972
3505############################################################################# 3973#############################################################################
3506 3974
3507package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3508 3976
3977use CFPlus::OpenGL;
3978
3509our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3510 3980
3511sub new { 3981sub new {
3512 my $class = shift; 3982 my $class = shift;
3513 3983
3514 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3515 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3516 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3517 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3518 @_, 3989 @_,
3519 ); 3990 );
3520 3991
3521 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3522 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3523 3994
3995 {
3996 Scalar::Util::weaken (my $wself = $self);
3997
3998 $self->{multiplexer}->connect (c_add => sub {
3999 my ($mplex, $widgets) = @_;
4000
4001 for my $child (@$widgets) {
4002 Scalar::Util::weaken $child;
4003 $child->{c_tab_} ||= do {
4004 my $tab =
4005 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4006 ? $child->{c_tab}
4007 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4008
4009 $tab->connect (activate => sub {
4010 $wself->set_current_page ($child);
4011 });
4012
4013 $tab
4014 };
4015
4016 $self->{buttonbar}->add ($child->{c_tab_});
4017 }
4018 });
4019
4020 $self->{multiplexer}->connect (c_remove => sub {
4021 my ($mplex, $widgets) = @_;
4022
4023 for my $child (@$widgets) {
4024 $wself->{buttonbar}->remove ($child->{c_tab_});
4025 }
4026 });
4027 }
4028
3524 $self 4029 $self
3525} 4030}
3526 4031
3527sub add { 4032sub add {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->add (@widgets)
4036}
4037
4038sub remove {
4039 my ($self, @widgets) = @_;
4040
4041 $self->{multiplexer}->remove (@widgets)
4042}
4043
4044sub pages {
4045 my ($self) = @_;
4046 $self->{multiplexer}->children
4047}
4048
4049sub add_tab {
3528 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3529 4051
3530 Scalar::Util::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3531 4054
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); 4055 $self->add ($widget);
3539} 4056}
3540 4057
3541sub get_current_page { 4058sub get_current_page {
3542 my ($self) = @_; 4059 my ($self) = @_;
3543 4060
… …
3547sub set_current_page { 4064sub set_current_page {
3548 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3549 4066
3550 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3551 $self->emit (page_changed => $self->{multiplexer}{current}); 4068 $self->emit (page_changed => $self->{multiplexer}{current});
4069}
4070
4071sub _draw {
4072 my ($self) = @_;
4073
4074 $self->SUPER::_draw ();
4075
4076 if (my $cur = $self->{multiplexer}{current}) {
4077 if ($cur = $cur->{c_tab_}) {
4078 glTranslate $self->{buttonbar}{x} + $cur->{x},
4079 $self->{buttonbar}{y} + $cur->{y};
4080 glLineWidth 3;
4081 #glEnable GL_BLEND;
4082 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4083 glColor @{$self->{active_outline}};
4084 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4085 glLineWidth 1;
4086 #glDisable GL_BLEND;
4087 }
4088 }
3552} 4089}
3553 4090
3554############################################################################# 4091#############################################################################
3555 4092
3556package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
… …
3619 my $self = $class->SUPER::new ( 4156 my $self = $class->SUPER::new (
3620 fontsize => 0.8, 4157 fontsize => 0.8,
3621 @_, 4158 @_,
3622 ); 4159 );
3623 4160
3624 Scalar::Util::weaken (my $this = $self); 4161 CFPlus::weaken (my $this = $self);
3625 4162
3626 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4163 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3627 4164
3628 $self 4165 $self
3629} 4166}
… …
3752 $self->SUPER::destroy; 4289 $self->SUPER::destroy;
3753} 4290}
3754 4291
3755############################################################################# 4292#############################################################################
3756 4293
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; 4294package CFPlus::UI::Root;
3943 4295
3944our @ISA = CFPlus::UI::Container::; 4296our @ISA = CFPlus::UI::Container::;
3945 4297
3946use List::Util qw(min max); 4298use List::Util qw(min max);
… …
3953 my $self = $class->SUPER::new ( 4305 my $self = $class->SUPER::new (
3954 visible => 1, 4306 visible => 1,
3955 @_, 4307 @_,
3956 ); 4308 );
3957 4309
3958 Scalar::Util::weaken ($self->{root} = $self); 4310 CFPlus::weaken ($self->{root} = $self);
3959 4311
3960 $self 4312 $self
3961} 4313}
3962 4314
3963sub size_request { 4315sub size_request {
… …
4011} 4363}
4012 4364
4013sub update { 4365sub update {
4014 my ($self) = @_; 4366 my ($self) = @_;
4015 4367
4016 $::WANT_REFRESH++; 4368 $::WANT_REFRESH->start;
4017} 4369}
4018 4370
4019sub add { 4371sub add {
4020 my ($self, @children) = @_; 4372 my ($self, @children) = @_;
4021 4373
… …
4058 while ($self->{refresh_hook}) { 4410 while ($self->{refresh_hook}) {
4059 $_->() 4411 $_->()
4060 for values %{delete $self->{refresh_hook}}; 4412 for values %{delete $self->{refresh_hook}};
4061 } 4413 }
4062 4414
4063 if ($self->{realloc}) { 4415 while ($self->{realloc}) {
4064 my %queue; 4416 my %queue;
4065 my @queue; 4417 my @queue;
4066 my $widget; 4418 my $widget;
4067 4419
4068 outer: 4420 outer:
… …
4115 } 4467 }
4116 } 4468 }
4117 4469
4118 delete $self->{realloc}{$widget+0}; 4470 delete $self->{realloc}{$widget+0};
4119 } 4471 }
4120 }
4121 4472
4122 while (my $size_alloc = delete $self->{size_alloc}) { 4473 while (my $size_alloc = delete $self->{size_alloc}) {
4123 my @queue = sort { $b->{visible} <=> $a->{visible} } 4474 my @queue = sort { $a->{visible} <=> $b->{visible} }
4124 values %$size_alloc; 4475 values %$size_alloc;
4125 4476
4126 while () { 4477 while () {
4127 my $widget = pop @queue || last; 4478 my $widget = pop @queue || last;
4128 4479
4129 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4480 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4130 4481
4131 $w = 0 if $w < 0;
4132 $h = 0 if $h < 0;
4133
4134 $w = max $widget->{min_w}, $w; 4482 $w = max $widget->{min_w}, $w;
4135 $h = max $widget->{min_h}, $h; 4483 $h = max $widget->{min_h}, $h;
4136 4484
4137# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4485# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4138# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4486# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4139 4487
4140 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4488 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4141 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4489 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4142 4490
4143 $w = int $w + 0.5; 4491 $w = int $w + 0.5;
4144 $h = int $h + 0.5; 4492 $h = int $h + 0.5;
4145 4493
4146 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4494 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4147 $widget->{old_w} = $widget->{w}; 4495 $widget->{old_w} = $widget->{w};
4148 $widget->{old_h} = $widget->{h}; 4496 $widget->{old_h} = $widget->{h};
4149 4497
4150 $widget->{w} = $w; 4498 $widget->{w} = $w;
4151 $widget->{h} = $h; 4499 $widget->{h} = $h;
4152 4500
4153 $widget->emit (size_allocate => $w, $h); 4501 $widget->emit (size_allocate => $w, $h);
4502 }
4154 } 4503 }
4155 } 4504 }
4156 } 4505 }
4157 4506
4158 while ($self->{post_alloc_hook}) { 4507 while ($self->{post_alloc_hook}) {
4159 $_->() 4508 $_->()
4160 for values %{delete $self->{post_alloc_hook}}; 4509 for values %{delete $self->{post_alloc_hook}};
4161 } 4510 }
4162
4163 4511
4164 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4512 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4165 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4513 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4166 glClear GL_COLOR_BUFFER_BIT; 4514 glClear GL_COLOR_BUFFER_BIT;
4167 4515

Diff Legend

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