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.395 by root, Sat Jul 21 13:56:00 2007 UTC vs.
Revision 1.452 by root, Wed Dec 26 20:09:38 2007 UTC

… …
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use List::Util (); 6use List::Util ();
7use Event;
8 7
9use CFPlus; 8use CFPlus;
10use CFPlus::Pod; 9use CFPlus::Pod;
11use CFPlus::Texture; 10use CFPlus::Texture;
12 11
… …
17our $TOOLTIP; 16our $TOOLTIP;
18our $BUTTON_STATE; 17our $BUTTON_STATE;
19 18
20our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
21 20
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 21our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
22 $_[0]->stop;
23
23 if (!$GRAB) { 24 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 28 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 31 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 32 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 33
33 return if $ENV{CFPLUS_DEBUG} & 8; 34 return if $ENV{CFPLUS_DEBUG} & 8;
34 35
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 36 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 37 $TOOLTIP->show;
41 } 38 }
42 39
43 return; 40 return;
… …
46 } 43 }
47 44
48 $TOOLTIP->hide; 45 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 46 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
51}); 48};
52 49
53sub get_layout { 50sub get_layout {
54 my $layout; 51 my $layout;
55 52
56 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
91 my $hover = $HOVER; $HOVER = $widget; 88 my $hover = $HOVER; $HOVER = $widget;
92 89
93 $hover->update if $hover && $hover->{can_hover}; 90 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 91 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 92
96 $TOOLTIP_WATCHER->start; 93 $TOOLTIP_WATCHER->again;
97 } 94 }
98} 95}
99 96
100sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
101 my ($ev) = @_; 98 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
108 105
109 $GRAB = $widget; 106 $GRAB = $widget;
110 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
111 108
112 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->invoke;
113 } 110 }
114 111
115 if ($GRAB) { 112 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 114 # mousewheel
… …
142 my $grab = $GRAB; undef $GRAB; 139 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 140 $grab->update if $grab;
144 $GRAB->update if $GRAB; 141 $GRAB->update if $GRAB;
145 142
146 check_hover $widget; 143 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 144 $TOOLTIP_WATCHER->invoke;
148 } 145 }
149} 146}
150 147
151sub feed_sdl_motion_event { 148sub feed_sdl_motion_event {
152 my ($ev) = @_; 149 my ($ev) = @_;
… …
273 $self->emit ("destroy"); 270 $self->emit ("destroy");
274 %$self = (); 271 %$self = ();
275} 272}
276 273
277sub TO_JSON { 274sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 275 { "\fw" => $_[0]{s_id} }
279} 276}
280 277
281sub show { 278sub show {
282 my ($self) = @_; 279 my ($self) = @_;
283 280
… …
312 delete $self->{root}; 309 delete $self->{root};
313 310
314 undef $GRAB if $GRAB == $self; 311 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 312 undef $HOVER if $HOVER == $self;
316 313
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 314 $CFPlus::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 315 if $TOOLTIP->{owner} == $self;
319 316
320 $self->emit ("focus_out"); 317 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 318 $self->emit (visibility_change => 0);
322} 319}
… …
341sub hide { 338sub hide {
342 my ($self) = @_; 339 my ($self) = @_;
343 340
344 $self->set_invisible; 341 $self->set_invisible;
345 342
343 # extra $parent copy for 5.8.8+ bug workaround
344 # (otherwise $_[0] in remove gets freed
345 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 346 $parent->remove ($self);
347 if $self->{parent}; 347 }
348} 348}
349 349
350sub move_abs { 350sub move_abs {
351 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
352 352
… …
362 362
363 $self->{force_w} = $w; 363 $self->{force_w} = $w;
364 $self->{force_h} = $h; 364 $self->{force_h} = $h;
365 365
366 $self->realloc; 366 $self->realloc;
367}
368
369# traverse the widget chain up to find the maximum "physical" size constraints
370sub get_max_wh {
371 my ($self) = @_;
372
373 return $self->{parent}->get_max_wh
374 if $self->{parent};
375
376 ($::WIDTH, $::HEIGHT)
367} 377}
368 378
369sub size_request { 379sub size_request {
370 require Carp; 380 require Carp;
371 Carp::confess "size_request is abstract"; 381 Carp::confess "size_request is abstract";
… …
433 443
434 $self->{tooltip} = $tooltip; 444 $self->{tooltip} = $tooltip;
435 445
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 446 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 447 delete $CFPlus::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 448 $CFPlus::UI::TOOLTIP_WATCHER->invoke;
439 } 449 }
440} 450}
441 451
442# translate global coordinates to local coordinate system 452# translate global coordinates to local coordinate system
443sub coord2local { 453sub coord2local {
444 my ($self, $x, $y) = @_; 454 my ($self, $x, $y) = @_;
445 455
446 Carp::confess unless $self->{parent};#d# 456 return (undef, undef) unless $self->{parent};
447 457
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 458 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 459}
450 460
451# translate local coordinates to global coordinate system 461# translate local coordinates to global coordinate system
452sub coord2global { 462sub coord2global {
453 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
454 464
455 Carp::confess unless $self->{parent};#d# 465 return (undef, undef) unless $self->{parent};
456 466
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 467 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 468}
459 469
460sub invoke_focus_in { 470sub invoke_focus_in {
… …
593 603
594# using global variables seems a bit hacky, but passing through all drawing 604# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 605# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 606our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 607
598sub draw { 608#sub draw {
599 my ($self) = @_; 609#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 610
645sub _draw { 611sub _draw {
646 my ($self) = @_; 612 my ($self) = @_;
647 613
648 warn "no draw defined for $self\n"; 614 warn "no draw defined for $self\n";
649} 615}
650 616
651my $cntx;#d#
652sub DESTROY { 617sub DESTROY {
653 my ($self) = @_; 618 my ($self) = @_;
654 619
655 return if CFPlus::in_destruct; 620 return if CFPlus::in_destruct;
656 621
622 local $@;
657 eval { $self->destroy }; 623 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 624 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 625
660 delete $WIDGET{$self+0}; 626 delete $WIDGET{$self+0};
661} 627}
… …
669use strict; 635use strict;
670use CFPlus::OpenGL; 636use CFPlus::OpenGL;
671 637
672sub new { 638sub new {
673 my $class = shift; 639 my $class = shift;
674
675 # range [value, low, high, page]
676 640
677 $class->SUPER::new ( 641 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 642 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 643 #active_bg => [1, 1, 1, 0.5],
680 @_ 644 @_
… …
692 my ($w, $h) = @$self{qw(w h)}; 656 my ($w, $h) = @$self{qw(w h)};
693 657
694 glEnable GL_BLEND; 658 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 659 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 660 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 661 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 662 glDisable GL_BLEND;
706 } 663 }
707} 664}
708 665
709############################################################################# 666#############################################################################
… …
769 sort { $a->{z} <=> $b->{z} } 726 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 727 @{$self->{children}}, @widgets
771 ]; 728 ];
772 729
773 $self->realloc; 730 $self->realloc;
731
732 $self->emit (c_add => \@widgets);
733
734 map $_+0, @widgets
774} 735}
775 736
776sub children { 737sub children {
777 @{ $_[0]{children} } 738 @{ $_[0]{children} }
778} 739}
779 740
780sub remove { 741sub remove {
781 my ($self, $child) = @_; 742 my ($self, @widgets) = @_;
782 743
744 $self->emit (c_remove => \@widgets);
745
746 for my $child (@widgets) {
783 delete $child->{parent}; 747 delete $child->{parent};
784 $child->hide; 748 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 749 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
750 }
787 751
788 $self->realloc; 752 $self->realloc;
789} 753}
790 754
791sub clear { 755sub clear {
… …
819} 783}
820 784
821sub _draw { 785sub _draw {
822 my ($self) = @_; 786 my ($self) = @_;
823 787
824 $_->draw for @{$self->{children}}; 788 $_->draw for $self->visible_children;
825} 789}
826 790
827############################################################################# 791#############################################################################
828 792
829package CFPlus::UI::Bin; 793package CFPlus::UI::Bin;
… …
839} 803}
840 804
841sub add { 805sub add {
842 my ($self, $child) = @_; 806 my ($self, $child) = @_;
843 807
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 808 $self->clear;
845 $self->SUPER::add ($child); 809 $self->SUPER::add ($child);
846} 810}
847 811
848sub remove { 812sub remove {
849 my ($self, $widget) = @_; 813 my ($self, $widget) = @_;
… …
867 831
868 1 832 1
869} 833}
870 834
871############################################################################# 835#############################################################################
872
873# back-buffered drawing area 836# back-buffered drawing area
874 837
875package CFPlus::UI::Window; 838package CFPlus::UI::Window;
876 839
877our @ISA = CFPlus::UI::Bin::; 840our @ISA = CFPlus::UI::Bin::;
… …
991 $self->{view_x} = $x; 954 $self->{view_x} = $x;
992 $self->{view_y} = $y; 955 $self->{view_y} = $y;
993 956
994 $self->emit (changed => $x, $y); 957 $self->emit (changed => $x, $y);
995 $self->update; 958 $self->update;
959 }
960}
961
962sub set_center {
963 my ($self, $x, $y) = @_;
964
965 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
966}
967
968sub make_visible {
969 my ($self, $x, $y, $border) = @_;
970
971 if ( $x < $self->{view_x} + $self->{w} * $border
972 || $x > $self->{view_x} + $self->{w} * (1 - $border)
973 || $y < $self->{view_y} + $self->{h} * $border
974 || $y > $self->{view_y} + $self->{h} * (1 - $border)
975 ) {
976 $self->set_center ($x, $y);
996 } 977 }
997} 978}
998 979
999# hmm, this does not work for topleft of $self... but we should not ask for that 980# hmm, this does not work for topleft of $self... but we should not ask for that
1000sub coord2local { 981sub coord2local {
… …
1047 my $child = delete $arg{child}; 1028 my $child = delete $arg{child};
1048 1029
1049 my $self; 1030 my $self;
1050 1031
1051 my $hslider = new CFPlus::UI::Slider 1032 my $hslider = new CFPlus::UI::Slider
1052 col => 0, 1033 c_col => 0,
1053 row => 1, 1034 c_row => 1,
1054 vertical => 0, 1035 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1036 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1037 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1038 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1039 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1040 },
1060 ; 1041 ;
1061 1042
1062 my $vslider = new CFPlus::UI::Slider 1043 my $vslider = new CFPlus::UI::Slider
1063 col => 1, 1044 c_col => 1,
1064 row => 0, 1045 c_row => 0,
1065 vertical => 1, 1046 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1047 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1048 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1049 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1050 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1061 row_expand => [1, 0],
1081 %arg, 1062 %arg,
1082 ); 1063 );
1083 1064
1084 $self->{vp} = new CFPlus::UI::ViewPort 1065 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0, 1066 c_col => 0,
1086 row => 0, 1067 c_row => 0,
1087 expand => 1, 1068 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1069 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1070 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1071 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1072 my ($vp, $x, $y) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1074 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1075 $vp->{parent}{vslider}->set_value ($y);
1095 1076
1096 0 1077 0
1097 }, 1078 },
1079 on_size_allocate => sub {
1080 my ($vp, $w, $h) = @_;
1081 $vp->{parent}->update_slider;
1082 0
1083 },
1098 ; 1084 ;
1099 1085
1100 $self->SUPER::add ($self->{vp}); 1086 $self->SUPER::add ($self->{vp});
1101 1087
1102 $self->add ($child) if $child; 1088 $self->add ($child) if $child;
… …
1108 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1109 1095
1110 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1111} 1097}
1112 1098
1099sub set_offset { shift->{vp}->set_offset (@_) }
1100sub set_center { shift->{vp}->set_center (@_) }
1101sub make_visible { shift->{vp}->make_visible (@_) }
1102
1113sub update_slider { 1103sub update_slider {
1114 my ($self) = @_; 1104 my ($self) = @_;
1115 1105
1116 my $child = ($self->{vp} or return)->child; 1106 my $child = ($self->{vp} or return)->child;
1117 1107
1108 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1109 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1111
1121 my $visible = $w1 > $w2; 1112 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) { 1113 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible; 1114 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider}) 1115 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider}); 1116 : $self->SUPER::remove ($self->{hslider});
1117 }
1126 } 1118 }
1127 1119
1120 if ($self->{scroll_y}) {
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1121 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130 1123
1131 my $visible = $h1 > $h2; 1124 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) { 1125 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible; 1126 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1127 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1128 : $self->SUPER::remove ($self->{vslider});
1129 }
1130 }
1131}
1132
1133sub start_dragging {
1134 my ($self, $ev) = @_;
1135
1136 $self->grab_focus;
1137
1138 my $ox = $self->{vp}{view_x};
1139 my $oy = $self->{vp}{view_y};
1140
1141 $self->{motion} = sub {
1142 my ($ev, $x, $y) = @_;
1143
1144 $ox -= $ev->{xrel};
1145 $oy -= $ev->{yrel};
1146
1147 $self->{vp}->set_offset ($ox, $oy);
1136 } 1148 };
1137} 1149}
1138 1150
1139sub invoke_mouse_wheel { 1151sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1152 my ($self, $ev) = @_;
1141 1153
1142 $self->{vslider}->emit (mouse_wheel => $ev) 1154 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev) 1155 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146 if $ev->{dx};
1147 1156
1148 1 1157 1
1149} 1158}
1150 1159
1151sub invoke_button_down { 1160sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1153 1162
1154 if ($ev->{button} == 2) { 1163 if ($ev->{button} == 2) {
1155 $self->grab_focus; 1164 $self->start_dragging ($ev);
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1; 1165 return 1;
1168 } 1166 }
1169 1167
1170 0 1168 0
1171} 1169}
… …
1222 my ($w, $h) = @$self{qw(w h)}; 1220 my ($w, $h) = @$self{qw(w h)};
1223 1221
1224 glEnable GL_BLEND; 1222 glEnable GL_BLEND;
1225 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1223 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1226 glColor_premultiply @{ $self->{bg} }; 1224 glColor_premultiply @{ $self->{bg} };
1227
1228 glBegin GL_QUADS;
1229 glVertex 0 , 0;
1230 glVertex 0 , $h;
1231 glVertex $w, $h; 1225 glRect 0, 0, $w, $h;
1232 glVertex $w, 0;
1233 glEnd;
1234
1235 glDisable GL_BLEND; 1226 glDisable GL_BLEND;
1236 } 1227 }
1237 1228
1238 $self->SUPER::_draw; 1229 $self->SUPER::_draw;
1239} 1230}
… …
1400 1391
1401sub border { 1392sub border {
1402 int $_[0]{border} * $::FONTSIZE 1393 int $_[0]{border} * $::FONTSIZE
1403} 1394}
1404 1395
1396sub get_max_wh {
1397 my ($self) = @_;
1398
1399 return ($self->{w}, $self->{h})
1400 if $self->{visible} && $self->{w};
1401
1402 $self->SUPER::get_max_wh
1403}
1404
1405sub size_request { 1405sub size_request {
1406 my ($self) = @_; 1406 my ($self) = @_;
1407 1407
1408 $self->{title_widget}->size_request 1408 $self->{title_widget}->size_request
1409 if $self->{title_widget}; 1409 if $self->{title_widget};
… …
1601 1601
1602sub add { 1602sub add {
1603 my ($self, @widgets) = @_; 1603 my ($self, @widgets) = @_;
1604 1604
1605 for my $child (@widgets) { 1605 for my $child (@widgets) {
1606 $child->{rowspan} ||= 1; 1606 $child->{c_rowspan} ||= 1;
1607 $child->{colspan} ||= 1; 1607 $child->{c_colspan} ||= 1;
1608 } 1608 }
1609 1609
1610 $self->SUPER::add (@widgets); 1610 $self->SUPER::add (@widgets);
1611} 1611}
1612 1612
… …
1616 my @widgets; 1616 my @widgets;
1617 1617
1618 while (@_) { 1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620 1620
1621 $child->{row} = $row; 1621 $child->{c_row} = $row;
1622 $child->{col} = $col; 1622 $child->{c_col} = $col;
1623 1623
1624 push @widgets, $child; 1624 push @widgets, $child;
1625 } 1625 }
1626 1626
1627 $self->add (@widgets); 1627 $self->add (@widgets);
… …
1633 my (@w, @h); 1633 my (@w, @h);
1634 1634
1635 my @children = $self->children; 1635 my @children = $self->children;
1636 1636
1637 # first pass, columns 1637 # first pass, columns
1638 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1638 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1639 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640 1640
1641 my $sw = sum @w[$c .. $c + $cs - 1]; 1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642 1642
1643 if ($w > $sw) { 1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 } 1645 }
1646 } 1646 }
1647 1647
1648 # second pass, rows 1648 # second pass, rows
1649 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1649 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1650 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1651 1651
1652 my $sh = sum @h[$r .. $r + $rs - 1]; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1653 1653
1654 if ($h > $sh) { 1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1697 1697
1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1700 1700
1701 for my $widget ($self->children) { 1701 for my $widget ($self->children) {
1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1703 1703
1704 $widget->configure ( 1704 $widget->configure (
1705 $x[$c], $y[$r], 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1707 ); 1707 );
… …
1716 1716
1717use List::Util qw(min max); 1717use List::Util qw(min max);
1718 1718
1719our @ISA = CFPlus::UI::Container::; 1719our @ISA = CFPlus::UI::Container::;
1720 1720
1721sub add {
1722 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1723
1724 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1725 $self->SUPER::add ($child);
1726}
1727
1728sub _scale($$$) { 1721sub _scale($$$) {
1729 my ($mode, $val, $max) = @_; 1722 my ($rel, $val, $max) = @_;
1730 1723
1731 $mode eq "abs" ? $val 1724 $rel ? $val * $max : $val
1732 : $mode eq "rel" ? $val * $max
1733 : 0
1734} 1725}
1735 1726
1736sub size_request { 1727sub size_request {
1737 my ($self) = @_; 1728 my ($self) = @_;
1738 1729
1739 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1730 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1740 1731
1741 # determine overall size by querying abs widgets 1732 # determine overall size by querying abs widgets
1742 for my $child ($self->visible_children) { 1733 for my $child ($self->visible_children) {
1743 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1734 unless ($child->{c_rel}) {
1735 my $x = $child->{c_x};
1736 my $y = $child->{c_y};
1744 1737
1745 if ($pos eq "abs") {
1746 $w = _scale $size, $w, $child->{req_w};
1747 $h = _scale $size, $h, $child->{req_h};
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1738 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1739 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 } 1740 }
1752 } 1741 }
1753 1742
1754 my $W = $x2 - $x1; 1743 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1; 1744 my $H = $y2 - $y1;
1756 1745
1757 # now layout remaining widgets 1746 # now layout remaining widgets
1758 for my $child ($self->visible_children) { 1747 for my $child ($self->visible_children) {
1759 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1748 if ($child->{c_rel}) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1760 1751
1761 if ($pos ne "abs") {
1762 $x = _scale $pos, $x, $W;
1763 $y = _scale $pos, $x, $H;
1764 $w = _scale $size, $w, $child->{req_w};
1765 $h = _scale $size, $h, $child->{req_h};
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1752 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1753 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1769 } 1754 }
1770 } 1755 }
1771 1756
1772 my $W = $x2 - $x1; 1757 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1; 1758 my $H = $y2 - $y1;
… …
1777 1762
1778sub invoke_size_allocate { 1763sub invoke_size_allocate {
1779 my ($self, $W, $H) = @_; 1764 my ($self, $W, $H) = @_;
1780 1765
1781 for my $child ($self->visible_children) { 1766 for my $child ($self->visible_children) {
1782 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1767 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1768 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1783 1769
1784 $x = _scale $pos, $x, $W; 1770 $x += $child->{c_halign} * $child->{req_w};
1785 $y = _scale $pos, $x, $H; 1771 $y += $child->{c_valign} * $child->{req_h};
1786 $w = _scale $size, $w, $child->{req_w};
1787 $h = _scale $size, $h, $child->{req_h};
1788 1772
1789 $child->configure ($x, $y, $w, $h); 1773 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1790 } 1774 }
1791 1775
1792 1 1776 1
1793} 1777}
1794 1778
… …
1798 1782
1799our @ISA = CFPlus::UI::Container::; 1783our @ISA = CFPlus::UI::Container::;
1800 1784
1801sub size_request { 1785sub size_request {
1802 my ($self) = @_; 1786 my ($self) = @_;
1787
1788 my @children = $self->visible_children;
1803 1789
1804 $self->{vertical} 1790 $self->{vertical}
1805 ? ( 1791 ? (
1806 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::max map $_->{req_w}, @children),
1807 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_h}, @children),
1808 ) 1794 )
1809 : ( 1795 : (
1810 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1796 (List::Util::sum map $_->{req_w}, @children),
1811 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1797 (List::Util::max map $_->{req_h}, @children),
1812 ) 1798 )
1813} 1799}
1814 1800
1815sub invoke_size_allocate { 1801sub invoke_size_allocate {
1816 my ($self, $w, $h) = @_; 1802 my ($self, $w, $h) = @_;
… …
1940 1926
1941 delete $self->{ox}; 1927 delete $self->{ox};
1942 $self->SUPER::realloc; 1928 $self->SUPER::realloc;
1943} 1929}
1944 1930
1931sub clear {
1932 my ($self) = @_;
1933
1934 $self->set_text ("");
1935}
1936
1945sub set_text { 1937sub set_text {
1946 my ($self, $text) = @_; 1938 my ($self, $text) = @_;
1947 1939
1948 return if $self->{text} eq "T$text"; 1940 return if $self->{text} eq "T$text";
1949 $self->{text} = "T$text"; 1941 $self->{text} = "T$text";
… …
1972 1964
1973sub size_request { 1965sub size_request {
1974 my ($self) = @_; 1966 my ($self) = @_;
1975 1967
1976 $self->{size_req} ||= do { 1968 $self->{size_req} ||= do {
1969 my ($max_w, $max_h) = $self->get_max_wh;
1970
1977 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1971 $self->{layout}->set_font ($self->{font}) if $self->{font};
1978 $self->{layout}->set_width ($self->{max_w} || -1); 1972 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1979 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1973 $self->{layout}->set_ellipsise ($self->{ellipsise});
1980 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1974 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1981 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1975 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1982 1976
1983 my ($w, $h) = $self->{layout}->size; 1977 my ($w, $h) = $self->{layout}->size;
… …
2055 : ($self->{w} - $size->[0]) * 0.5); 2049 : ($self->{w} - $size->[0]) * 0.5);
2056 2050
2057 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2051 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2058 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2052 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2059 : ($self->{h} - $size->[1]) * 0.5); 2053 : ($self->{h} - $size->[1]) * 0.5);
2054
2055 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2060 }; 2056 };
2061 2057
2062 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2058# unless ($self->{list}) {
2063 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2059# $self->{list} = CFPlus::OpenGL::glGenList;
2064 2060# CFPlus::OpenGL::glNewList $self->{list};
2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2061# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2062# CFPlus::OpenGL::glEndList;
2063# }
2064#
2065# CFPlus::OpenGL::glCallList $self->{list};
2066
2067 $self->{layout}->draw;
2066} 2068}
2069
2070#sub destroy {
2071# my ($self) = @_;
2072#
2073# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2074#
2075# $self->SUPER::destroy;
2076#}
2067 2077
2068############################################################################# 2078#############################################################################
2069 2079
2070package CFPlus::UI::EntryBase; 2080package CFPlus::UI::EntryBase;
2071 2081
… …
2077 my $class = shift; 2087 my $class = shift;
2078 2088
2079 $class->SUPER::new ( 2089 $class->SUPER::new (
2080 fg => [1, 1, 1], 2090 fg => [1, 1, 1],
2081 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
2092 outline => [0.6, 0.3, 0.1],
2082 active_bg => [1, 1, 1, 0.5], 2093 active_bg => [0, 0, 1, .2],
2083 active_fg => [0, 0, 0], 2094 active_fg => [1, 1, 1],
2095 active_outline => [1, 1, 0],
2084 can_hover => 1, 2096 can_hover => 1,
2085 can_focus => 1, 2097 can_focus => 1,
2086 valign => 0, 2098 valign => 0,
2087 can_events => 1, 2099 can_events => 1,
2088 ellipsise => 0, 2100 ellipsise => 0,
… …
2228 glColor_premultiply @{$self->{bg}}; 2240 glColor_premultiply @{$self->{bg}};
2229 } 2241 }
2230 2242
2231 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2232 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glBegin GL_QUADS;
2234 glVertex 0 , 0;
2235 glVertex 0 , $self->{h};
2236 glVertex $self->{w}, $self->{h}; 2245 glRect 0, 0, $self->{w}, $self->{h};
2237 glVertex $self->{w}, 0;
2238 glEnd;
2239 glDisable GL_BLEND; 2246 glDisable GL_BLEND;
2240 2247
2241 $self->SUPER::_draw; 2248 $self->SUPER::_draw;
2242 2249
2243 #TODO: force update every cursor change :( 2250 #TODO: force update every cursor change :(
… …
2245 2252
2246 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2247 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2248 utf8::encode $text; 2255 utf8::encode $text;
2249 2256
2250 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2251 } 2258 }
2252 2259
2260 glColor_premultiply @{$self->{active_fg}};
2253 glBegin GL_LINES; 2261 glBegin GL_LINES;
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2264 glEnd;
2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2269 glLineWidth 1;
2270
2271 } else {
2272 glColor @{$self->{outline}};
2273 glBegin GL_LINE_STRIP;
2274 glVertex .5, $self->{h} * .5;
2275 glVertex .5, $self->{h} - 2.5;
2276 glVertex $self->{w} - .5, $self->{h} - 2.5;
2277 glVertex $self->{w} - .5, $self->{h} * .5;
2256 glEnd; 2278 glEnd;
2257 } 2279 }
2258} 2280}
2259 2281
2260############################################################################# 2282#############################################################################
… …
2347 1 2369 1
2348} 2370}
2349 2371
2350############################################################################# 2372#############################################################################
2351 2373
2374package CFPlus::UI::ButtonBin;
2375
2376our @ISA = CFPlus::UI::Bin::;
2377
2378use CFPlus::OpenGL;
2379
2380my @tex =
2381 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2382 qw(b1_button_inactive.png b1_button_active.png);
2383
2384sub new {
2385 my $class = shift;
2386
2387 $class->SUPER::new (
2388 can_hover => 1,
2389 align => 0,
2390 valign => 0,
2391 can_events => 1,
2392 @_
2393 )
2394}
2395
2396sub invoke_button_up {
2397 my ($self, $ev, $x, $y) = @_;
2398
2399 $self->emit ("activate")
2400 if $x >= 0 && $x < $self->{w}
2401 && $y >= 0 && $y < $self->{h};
2402
2403 1
2404}
2405
2406sub _draw {
2407 my ($self) = @_;
2408
2409 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411 glColor 0, 0, 0, 1;
2412
2413 my $tex = $tex[$GRAB == $self];
2414 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2415
2416 glDisable GL_TEXTURE_2D;
2417
2418 $self->SUPER::_draw;
2419}
2420
2421#############################################################################
2422
2352package CFPlus::UI::Button; 2423package CFPlus::UI::Button;
2353 2424
2354our @ISA = CFPlus::UI::Label::; 2425our @ISA = CFPlus::UI::Label::;
2355 2426
2356use CFPlus::OpenGL; 2427use CFPlus::OpenGL;
… …
2460sub _draw { 2531sub _draw {
2461 my ($self) = @_; 2532 my ($self) = @_;
2462 2533
2463 $self->SUPER::_draw; 2534 $self->SUPER::_draw;
2464 2535
2465 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2536 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2466 2537
2467 my ($w, $h) = @$self{qw(w h)}; 2538 my ($w, $h) = @$self{qw(w h)};
2468 2539
2469 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2540 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2470 2541
… …
2490sub new { 2561sub new {
2491 my $class = shift; 2562 my $class = shift;
2492 2563
2493 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2494 can_events => 0, 2565 can_events => 0,
2566 scale => 1,
2495 @_, 2567 @_,
2496 ); 2568 );
2497 2569
2498 $self->{path} || $self->{tex} 2570 $self->{path} || $self->{tex}
2499 or Carp::croak "'path' or 'tex' attributes required"; 2571 or Carp::croak "'path' or 'tex' attributes required";
… …
2524} 2596}
2525 2597
2526sub size_request { 2598sub size_request {
2527 my ($self) = @_; 2599 my ($self) = @_;
2528 2600
2529 ($self->{tex}{w}, $self->{tex}{h}) 2601 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2530} 2602}
2531 2603
2532sub _draw { 2604sub _draw {
2533 my ($self) = @_; 2605 my ($self) = @_;
2534 2606
… …
2544 } 2616 }
2545 2617
2546 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2548 2620
2549 $tex->draw_quad (0, 0, $w, $h); 2621 $tex->draw_quad_alpha (0, 0, $w, $h);
2550 2622
2551 glDisable GL_TEXTURE_2D; 2623 glDisable GL_TEXTURE_2D;
2552} 2624}
2553 2625
2554############################################################################# 2626#############################################################################
… …
2573 align => 0, 2645 align => 0,
2574 valign => 0, 2646 valign => 0,
2575 can_events => 1, 2647 can_events => 1,
2576 @_ 2648 @_
2577 ); 2649 );
2650}
2651
2652sub invoke_button_down {
2653 my ($self, $ev, $x, $y) = @_;
2654
2655 1
2578} 2656}
2579 2657
2580sub invoke_button_up { 2658sub invoke_button_up {
2581 my ($self, $ev, $x, $y) = @_; 2659 my ($self, $ev, $x, $y) = @_;
2582 2660
… …
2722 glDisable GL_TEXTURE_2D; 2800 glDisable GL_TEXTURE_2D;
2723} 2801}
2724 2802
2725############################################################################# 2803#############################################################################
2726 2804
2805package CFPlus::UI::Progress;
2806
2807our @ISA = CFPlus::UI::Label::;
2808
2809use CFPlus::OpenGL;
2810
2811sub new {
2812 my ($class, %arg) = @_;
2813
2814 my $self = $class->SUPER::new (
2815 fg => [1, 1, 1],
2816 bg => [0, 0, 1, 0.2],
2817 bar => [0.7, 0.5, 0.1, 0.8],
2818 outline => [0.4, 0.3, 0],
2819 fontsize => 0.9,
2820 valign => 0,
2821 align => 0,
2822 can_events => 1,
2823 ellipsise => 1,
2824 label => "%d%%",
2825 %arg,
2826 );
2827
2828 $self->set_value ($arg{value} || -1);
2829
2830 $self
2831}
2832
2833sub set_label {
2834 my ($self, $label) = @_;
2835
2836 return if $self->{label} eq $label;
2837 $self->{label} = $label;
2838
2839 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2840}
2841
2842sub set_value {
2843 my ($self, $value) = @_;
2844
2845 if ($self->{value} ne $value) {
2846 $self->{value} = $value;
2847
2848 if ($value < 0) {
2849 $self->set_text ("-");
2850 } else {
2851 $self->set_text (sprintf $self->{label}, $value * 100);
2852 }
2853
2854 $self->update;
2855 }
2856}
2857
2858sub _draw {
2859 my ($self) = @_;
2860
2861 glEnable GL_BLEND;
2862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2863
2864 if ($self->{value} >= 0) {
2865 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2866
2867 glColor_premultiply @{$self->{bar}};
2868 glRect 2, 2, $s, $self->{h} - 2;
2869 glColor_premultiply @{$self->{bg}};
2870 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2871 }
2872
2873 glColor_premultiply @{$self->{outline}};
2874 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2875
2876 glDisable GL_BLEND;
2877
2878 {
2879 local $self->{bg}; # do not draw background
2880 $self->SUPER::_draw;
2881 }
2882}
2883
2884#############################################################################
2885
2886package CFPlus::UI::ExperienceProgress;
2887
2888our @ISA = CFPlus::UI::Progress::;
2889
2890sub new {
2891 my ($class, %arg) = @_;
2892
2893 my $self = $class->SUPER::new (
2894 tooltip => sub {
2895 my ($self) = @_;
2896
2897 sprintf "level %d\n%s points\n%s next level\n%s to go",
2898 $self->{lvl},
2899 ::formsep ($self->{exp}),
2900 ::formsep ($self->{nxt}),
2901 ::formsep ($self->{nxt} - $self->{exp}),
2902 },
2903 %arg
2904 );
2905
2906 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2907 if $::CONN;
2908
2909 $self
2910}
2911
2912sub DESTROY {
2913 my ($self) = @_;
2914
2915 delete $::CONN->{on_exp_update}{$self+0}
2916 if $::CONN;
2917
2918 $self->SUPER::DESTROY;
2919}
2920
2921sub set_value {
2922 my ($self, $lvl, $exp) = @_;
2923
2924 $self->{lvl} = $lvl;
2925 $self->{exp} = $exp;
2926
2927 my $v = -1;
2928
2929 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2930 my $l0 = $table->[$lvl - 1];
2931 my $l1 = $table->[$lvl];
2932
2933 $self->{nxt} = $l1;
2934
2935 $v = ($exp - $l0) / ($l1 - $l0);
2936 }
2937
2938 $self->SUPER::set_value ($v);
2939}
2940
2941#############################################################################
2942
2727package CFPlus::UI::Gauge; 2943package CFPlus::UI::Gauge;
2728 2944
2729our @ISA = CFPlus::UI::VBox::; 2945our @ISA = CFPlus::UI::VBox::;
2730 2946
2731sub new { 2947sub new {
… …
2856 3072
2857 $self->SUPER::invoke_button_down ($ev, $x, $y); 3073 $self->SUPER::invoke_button_down ($ev, $x, $y);
2858 3074
2859 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3075 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2860 3076
2861 $self->invoke_mouse_motion ($ev, $x, $y) 3077 $self->invoke_mouse_motion ($ev, $x, $y);
3078
3079 1
2862} 3080}
2863 3081
2864sub invoke_mouse_motion { 3082sub invoke_mouse_motion {
2865 my ($self, $ev, $x, $y) = @_; 3083 my ($self, $ev, $x, $y) = @_;
2866 3084
… …
2886 3104
2887 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3105 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2888 3106
2889 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3107 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2890 3108
2891 ! ! $delta 3109 1
2892} 3110}
2893 3111
2894sub update { 3112sub update {
2895 my ($self) = @_; 3113 my ($self) = @_;
2896 3114
… …
3027} 3245}
3028 3246
3029sub size_request { 3247sub size_request {
3030 my ($self) = @_; 3248 my ($self) = @_;
3031 3249
3032 my ($empty, $slider) = @{ $self->{children} }; 3250 my ($empty, $slider) = $self->visible_children;
3033 3251
3034 local $self->{children} = [$empty, $slider]; 3252 local $self->{children} = [$empty, $slider];
3035 $self->SUPER::size_request 3253 $self->SUPER::size_request
3036} 3254}
3037 3255
… …
3226 3444
3227 if ($y0 < $y + $h && $y < $y1) { 3445 if ($y0 < $y + $h && $y < $y1) {
3228 my $layout = $self->get_layout ($para); 3446 my $layout = $self->get_layout ($para);
3229 3447
3230 $layout->render ($para->{indent}, $y - $y0); 3448 $layout->render ($para->{indent}, $y - $y0);
3449 $layout->draw;
3231 3450
3232 if (my @w = @{ $para->{widget} }) { 3451 if (my @w = @{ $para->{widget} }) {
3233 my @s = $layout->get_shapes; 3452 my @s = $layout->get_shapes;
3234 3453
3235 for (@w) { 3454 for (@w) {
… …
3357} 3576}
3358 3577
3359sub set_tooltip_from { 3578sub set_tooltip_from {
3360 my ($self, $widget) = @_; 3579 my ($self, $widget) = @_;
3361 3580
3362 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3363 if $widget->{tooltip} =~ /^#(.*)$/;
3364
3365 my $tooltip = $widget->{tooltip}; 3581 my $tip = $widget->{tooltip};
3582 $tip = $tip->($widget) if "CODE" eq ref $tip;
3583
3584 $tip = CFPlus::Pod::section_label tooltip => $1
3585 if $tip =~ /^#(.*)$/;
3366 3586
3367 if ($ENV{CFPLUS_DEBUG} & 2) { 3587 if ($ENV{CFPLUS_DEBUG} & 2) {
3368 $tooltip .= "\n\n" . (ref $widget) . "\n" 3588 $tip .= "\n\n" . (ref $widget) . "\n"
3369 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3589 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3370 . "req $widget->{req_w} $widget->{req_h}\n" 3590 . "req $widget->{req_w} $widget->{req_h}\n"
3371 . "visible $widget->{visible}"; 3591 . "visible $widget->{visible}";
3372 } 3592 }
3373 3593
3374 $tooltip =~ s/^\n+//; 3594 $tip =~ s/^\n+//;
3375 $tooltip =~ s/\n+$//; 3595 $tip =~ s/\n+$//;
3376 3596
3377 $self->add (new CFPlus::UI::Label 3597 $self->add (new CFPlus::UI::Label
3378 markup => $tooltip, 3598 markup => $tip,
3379 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3380 fontsize => 0.8, 3600 fontsize => 0.8,
3381 style => 1, # FLAG_INVERSE 3601 style => 1, # FLAG_INVERSE
3382 ellipsise => 0, 3602 ellipsise => 0,
3383 font => ($widget->{tooltip_font} || $::FONT_PROP), 3603 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3421} 3641}
3422 3642
3423sub _draw { 3643sub _draw {
3424 my ($self) = @_; 3644 my ($self) = @_;
3425 3645
3426 glTranslate 0.375, 0.375;
3427
3428 my ($w, $h) = @$self{qw(w h)}; 3646 my ($w, $h) = @$self{qw(w h)};
3429 3647
3430 glColor 1, 0.8, 0.4; 3648 glColor 1, 0.8, 0.4;
3431 glBegin GL_QUADS; 3649 glRect 0, 0, $w, $h;
3432 glVertex 0 , 0;
3433 glVertex 0 , $h;
3434 glVertex $w, $h;
3435 glVertex $w, 0;
3436 glEnd;
3437 3650
3438 glColor 0, 0, 0; 3651 glColor 0, 0, 0;
3439 glBegin GL_LINE_LOOP; 3652 glRect_lineloop .5, .5, $w + .5, $h + .5;
3440 glVertex 0 , 0;
3441 glVertex 0 , $h;
3442 glVertex $w, $h;
3443 glVertex $w, 0;
3444 glEnd;
3445 3653
3446 glTranslate 2 - 0.375, 2 - 0.375; 3654 glTranslate 2, 2;
3447 3655
3448 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3449} 3657}
3450 3658
3451############################################################################# 3659#############################################################################
… …
3468 ); 3676 );
3469 3677
3470 if ($self->{anim} && $self->{animspeed}) { 3678 if ($self->{anim} && $self->{animspeed}) {
3471 CFPlus::weaken (my $widget = $self); 3679 CFPlus::weaken (my $widget = $self);
3472 3680
3473 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3681 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3474 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3682 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3475 $self->{timer} = Event->timer (
3476 parked => 1,
3477 cb => sub {
3478 return unless $::CONN && $widget; 3683 return unless $::CONN;
3479 3684
3685 my $w = $widget
3686 or return;
3687
3480 ++$widget->{frame}; 3688 ++$w->{frame};
3481 $widget->update_face; 3689 $w->update_face;
3690
3691 # somehow, $widget can go away
3482 $widget->update; 3692 $w->update;
3483
3484 $widget->update_timer; 3693 $w->update_timer;
3485 },
3486 ); 3694 };
3487 3695
3488 $self->update_face; 3696 $self->update_face;
3489 $self->update_timer; 3697 $self->update_timer;
3490 } 3698 }
3491 3699
… …
3496 my ($self) = @_; 3704 my ($self) = @_;
3497 3705
3498 return unless $self->{timer}; 3706 return unless $self->{timer};
3499 3707
3500 if ($self->{visible}) { 3708 if ($self->{visible}) {
3501 $self->{timer}->at (
3502 $self->{anim_start}
3503 + $self->{animspeed}
3504 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3505 );
3506 $self->{timer}->start; 3709 $self->{timer}->start;
3507 } else { 3710 } else {
3508 $self->{timer}->stop; 3711 $self->{timer}->stop;
3509 } 3712 }
3510} 3713}
3511 3714
3512sub update_face { 3715sub update_face {
3513 my ($self) = @_; 3716 my ($self) = @_;
3514 3717
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
3525sub size_request {
3526 my ($self) = @_;
3527
3528 if ($::CONN) { 3718 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3719 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) { 3720 if ($anim && @$anim) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3721 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3532 } else { 3722 delete $self->{face_change_cb};
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3723
3534 $self->realloc; 3724 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3725 unless ($tex->{name} || $tex->{loading}) {
3726 $tex->upload (sub { $self->reconfigure });
3727 }
3535 }); 3728 }
3536 } 3729 }
3537 } 3730 }
3538 } 3731 }
3732}
3733
3734sub size_request {
3735 my ($self) = @_;
3736
3737 if ($::CONN) {
3738 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3739 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3740 if ($tex->{name}) {
3741 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3742 } elsif (!$tex->{loading}) {
3743 $tex->upload (sub { $self->reconfigure });
3744 }
3745 }
3746
3747 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3748 }
3749 }
3539 3750
3540 ($self->{size_w} || 8, $self->{size_h} || 8) 3751 ($self->{size_w} || 8, $self->{size_h} || 8)
3541} 3752}
3542 3753
3543sub update { 3754sub update {
… …
3557} 3768}
3558 3769
3559sub _draw { 3770sub _draw {
3560 my ($self) = @_; 3771 my ($self) = @_;
3561 3772
3562 return unless $::CONN;
3563
3564 $self->SUPER::_draw; 3773 $self->SUPER::_draw;
3565 3774
3566 my $faceid = $::CONN->{faceid}[$self->{face}] 3775 if (my $tex = $self->{tex}) {
3567 or return;
3568
3569 my $tex = $::CONN->{texture}[$faceid];
3570
3571 if ($tex) {
3572 glEnable GL_TEXTURE_2D; 3776 glEnable GL_TEXTURE_2D;
3573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3574 glColor 0, 0, 0, 1; 3778 glColor 0, 0, 0, 1;
3575 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3779 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3576 glDisable GL_TEXTURE_2D; 3780 glDisable GL_TEXTURE_2D;
… …
3628 children => [ 3832 children => [
3629 (new CFPlus::UI::Label markup => $left, expand => 1), 3833 (new CFPlus::UI::Label markup => $left, expand => 1),
3630 (new CFPlus::UI::Label markup => $right, align => +1), 3834 (new CFPlus::UI::Label markup => $right, align => +1),
3631 ], 3835 ],
3632 ; 3836 ;
3633 3837
3634 } else { 3838 } else {
3635 $widget = new CFPlus::UI::Label 3839 $widget = new CFPlus::UI::Label
3636 can_hover => 1, 3840 can_hover => 1,
3637 can_events => 1, 3841 can_events => 1,
3638 markup => $widget, 3842 markup => $widget,
… …
3763 3967
3764############################################################################# 3968#############################################################################
3765 3969
3766package CFPlus::UI::Notebook; 3970package CFPlus::UI::Notebook;
3767 3971
3972use CFPlus::OpenGL;
3973
3768our @ISA = CFPlus::UI::VBox::; 3974our @ISA = CFPlus::UI::VBox::;
3769 3975
3770sub new { 3976sub new {
3771 my $class = shift; 3977 my $class = shift;
3772 3978
3773 my $self = $class->SUPER::new ( 3979 my $self = $class->SUPER::new (
3774 buttonbar => (new CFPlus::UI::Buttonbar), 3980 buttonbar => (new CFPlus::UI::Buttonbar),
3775 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3981 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3982 active_outline => [.7, .7, 0.2],
3776 # filter => # will be put between multiplexer and $self 3983 # filter => # will be put between multiplexer and $self
3777 @_, 3984 @_,
3778 ); 3985 );
3779 3986
3780 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3987 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3781 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3988 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3782 3989
3990 {
3991 Scalar::Util::weaken (my $wself = $self);
3992
3993 $self->{multiplexer}->connect (c_add => sub {
3994 my ($mplex, $widgets) = @_;
3995
3996 for my $child (@$widgets) {
3997 Scalar::Util::weaken $child;
3998 $child->{c_tab_} ||= do {
3999 my $tab =
4000 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4001 ? $child->{c_tab}
4002 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4003
4004 $tab->connect (activate => sub {
4005 $wself->set_current_page ($child);
4006 });
4007
4008 $tab
4009 };
4010
4011 $self->{buttonbar}->add ($child->{c_tab_});
4012 }
4013 });
4014
4015 $self->{multiplexer}->connect (c_remove => sub {
4016 my ($mplex, $widgets) = @_;
4017
4018 for my $child (@$widgets) {
4019 $wself->{buttonbar}->remove ($child->{c_tab_});
4020 }
4021 });
4022 }
4023
3783 $self 4024 $self
3784} 4025}
3785 4026
3786sub add { 4027sub add {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->add (@widgets)
4031}
4032
4033sub remove {
4034 my ($self, @widgets) = @_;
4035
4036 $self->{multiplexer}->remove (@widgets)
4037}
4038
4039sub pages {
4040 my ($self) = @_;
4041 $self->{multiplexer}->children
4042}
4043
4044sub add_tab {
3787 my ($self, $title, $widget, $tooltip) = @_; 4045 my ($self, $title, $widget, $tooltip) = @_;
3788 4046
3789 CFPlus::weaken $self; 4047 $title = [$title, $tooltip] unless ref $title;
4048 $widget->{c_tab} = $title;
3790 4049
3791 $self->{buttonbar}->add (new CFPlus::UI::Button
3792 markup => $title,
3793 tooltip => $tooltip,
3794 on_activate => sub { $self->set_current_page ($widget) },
3795 );
3796
3797 $self->{multiplexer}->add ($widget); 4050 $self->add ($widget);
3798} 4051}
3799 4052
3800sub get_current_page { 4053sub get_current_page {
3801 my ($self) = @_; 4054 my ($self) = @_;
3802 4055
… …
3806sub set_current_page { 4059sub set_current_page {
3807 my ($self, $page) = @_; 4060 my ($self, $page) = @_;
3808 4061
3809 $self->{multiplexer}->set_current_page ($page); 4062 $self->{multiplexer}->set_current_page ($page);
3810 $self->emit (page_changed => $self->{multiplexer}{current}); 4063 $self->emit (page_changed => $self->{multiplexer}{current});
4064}
4065
4066sub _draw {
4067 my ($self) = @_;
4068
4069 $self->SUPER::_draw ();
4070
4071 if (my $cur = $self->{multiplexer}{current}) {
4072 if ($cur = $cur->{c_tab_}) {
4073 glTranslate $self->{buttonbar}{x} + $cur->{x},
4074 $self->{buttonbar}{y} + $cur->{y};
4075 glLineWidth 3;
4076 #glEnable GL_BLEND;
4077 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4078 glColor @{$self->{active_outline}};
4079 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4080 glLineWidth 1;
4081 #glDisable GL_BLEND;
4082 }
4083 }
3811} 4084}
3812 4085
3813############################################################################# 4086#############################################################################
3814 4087
3815package CFPlus::UI::Selector; 4088package CFPlus::UI::Selector;
… …
3847} 4120}
3848 4121
3849sub _set_value { 4122sub _set_value {
3850 my ($self, $value) = @_; 4123 my ($self, $value) = @_;
3851 4124
3852 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4125 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4126 $item ||= $self->{options}[0]
3853 or return; 4127 or return;
3854 4128
3855 $self->{value} = $item->[0]; 4129 $self->{value} = $item->[0];
3856 $self->set_markup ("$item->[1] ⇓"); 4130 $self->set_markup ("$item->[1] ⇓");
3857 $self->set_tooltip ($item->[2]); 4131# $self->set_tooltip ($item->[2]);
3858} 4132}
3859 4133
3860sub set_value { 4134sub set_value {
3861 my ($self, $value) = @_; 4135 my ($self, $value) = @_;
3862 4136
3863 return unless $self->{value} ne $value; 4137 return unless $self->{value} ne $value;
3864 4138
3865 $self->_set_value ($value); 4139 $self->_set_value ($value);
3866 $self->emit (changed => $value); 4140 $self->emit (changed => $value);
4141}
4142
4143sub set_options {
4144 my ($self, $options) = @_;
4145
4146 $self->{options} = $options;
4147 $self->_set_value ($self->{value});
3867} 4148}
3868 4149
3869############################################################################# 4150#############################################################################
3870 4151
3871package CFPlus::UI::Statusbox; 4152package CFPlus::UI::Statusbox;
… …
3880 @_, 4161 @_,
3881 ); 4162 );
3882 4163
3883 CFPlus::weaken (my $this = $self); 4164 CFPlus::weaken (my $this = $self);
3884 4165
3885 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4166 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3886 4167
3887 $self 4168 $self
3888} 4169}
3889 4170
3890sub reorder { 4171sub reorder {
… …
3898 4179
3899 while (my ($k, $v) = each %{ $self->{item} }) { 4180 while (my ($k, $v) = each %{ $self->{item} }) {
3900 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4181 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3901 } 4182 }
3902 4183
4184 $self->{timer}->set (1, 1);
4185
3903 my @widgets; 4186 my @widgets;
3904 4187
3905 my @items = sort { 4188 my @items = sort {
3906 $a->{pri} <=> $b->{pri} 4189 $a->{pri} <=> $b->{pri}
3907 or $b->{id} <=> $a->{id} 4190 or $b->{id} <=> $a->{id}
3908 } values %{ $self->{item} }; 4191 } values %{ $self->{item} };
3909
3910 $self->{timer}->interval (1);
3911 4192
3912 my $count = 10 + 1; 4193 my $count = 10 + 1;
3913 for my $item (@items) { 4194 for my $item (@items) {
3914 last unless --$count; 4195 last unless --$count;
3915 4196
… …
3939 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3940 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3941 $label->update; 4222 $label->update;
3942 $label->set_max_size (undef, $label->{req_h} * $diff) 4223 $label->set_max_size (undef, $label->{req_h} * $diff)
3943 if $diff < 1; 4224 if $diff < 1;
3944 $self->{timer}->interval (1/30); 4225 $self->{timer}->set (1/30, 1/30);
3945 } else { 4226 } else {
3946 $label->{fg}[3] = $item->{fg}[3] || 1; 4227 $label->{fg}[3] = $item->{fg}[3] || 1;
3947 } 4228 }
3948 4229
3949 push @widgets, $label; 4230 push @widgets, $label;
… …
4085} 4366}
4086 4367
4087sub update { 4368sub update {
4088 my ($self) = @_; 4369 my ($self) = @_;
4089 4370
4090 $::WANT_REFRESH++; 4371 $::WANT_REFRESH = 1;
4091} 4372}
4092 4373
4093sub add { 4374sub add {
4094 my ($self, @children) = @_; 4375 my ($self, @children) = @_;
4095 4376
… …
4132 while ($self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
4133 $_->() 4414 $_->()
4134 for values %{delete $self->{refresh_hook}}; 4415 for values %{delete $self->{refresh_hook}};
4135 } 4416 }
4136 4417
4137 if ($self->{realloc}) { 4418 while ($self->{realloc}) {
4138 my %queue; 4419 my %queue;
4139 my @queue; 4420 my @queue;
4140 my $widget; 4421 my $widget;
4141 4422
4142 outer: 4423 outer:
… …
4189 } 4470 }
4190 } 4471 }
4191 4472
4192 delete $self->{realloc}{$widget+0}; 4473 delete $self->{realloc}{$widget+0};
4193 } 4474 }
4194 }
4195 4475
4196 while (my $size_alloc = delete $self->{size_alloc}) { 4476 while (my $size_alloc = delete $self->{size_alloc}) {
4197 my @queue = sort { $b->{visible} <=> $a->{visible} } 4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
4198 values %$size_alloc; 4478 values %$size_alloc;
4199 4479
4200 while () { 4480 while () {
4201 my $widget = pop @queue || last; 4481 my $widget = pop @queue || last;
4202 4482
4203 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4204 4484
4205 $w = 0 if $w < 0;
4206 $h = 0 if $h < 0;
4207
4208 $w = max $widget->{min_w}, $w; 4485 $w = max $widget->{min_w}, $w;
4209 $h = max $widget->{min_h}, $h; 4486 $h = max $widget->{min_h}, $h;
4210 4487
4211# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4212# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4213 4490
4214 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4215 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4216 4493
4217 $w = int $w + 0.5; 4494 $w = int $w + 0.5;
4218 $h = int $h + 0.5; 4495 $h = int $h + 0.5;
4219 4496
4220 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4497 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4221 $widget->{old_w} = $widget->{w}; 4498 $widget->{old_w} = $widget->{w};
4222 $widget->{old_h} = $widget->{h}; 4499 $widget->{old_h} = $widget->{h};
4223 4500
4224 $widget->{w} = $w; 4501 $widget->{w} = $w;
4225 $widget->{h} = $h; 4502 $widget->{h} = $h;
4226 4503
4227 $widget->emit (size_allocate => $w, $h); 4504 $widget->emit (size_allocate => $w, $h);
4505 }
4228 } 4506 }
4229 } 4507 }
4230 } 4508 }
4231 4509
4232 while ($self->{post_alloc_hook}) { 4510 while ($self->{post_alloc_hook}) {

Diff Legend

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