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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
314} 315}
315 316
316sub move_abs { 317sub move_abs {
317 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
318 319
319 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
322 323
323 $self->update; 324 $self->update;
324} 325}
325 326
… …
371sub size_allocate { 372sub size_allocate {
372 # nothing to be done 373 # nothing to be done
373} 374}
374 375
375sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
376} 382}
377 383
378sub set_max_size { 384sub set_max_size {
379 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
380 386
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
383} 391}
384 392
385sub set_tooltip { 393sub set_tooltip {
386 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
387 395
… …
392 400
393 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
394 402
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 406 }
399} 407}
400 408
401# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
402sub coord2local { 410sub coord2local {
… …
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 553
546 glPushMatrix; 554 glPushMatrix;
547 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
548 $self->_draw;
549 glPopMatrix;
550 556
551 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
552 my ($x, $y) = @$self{qw(x y)};
553
554 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
555 glEnable GL_BLEND; 559 glEnable GL_BLEND;
556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
557 glBegin GL_QUADS; 561 glBegin GL_QUADS;
558 glVertex $x , $y; 562 glVertex 0 , 0;
559 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
560 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
561 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
562 glEnd; 566 glEnd;
563 glDisable GL_BLEND; 567 glDisable GL_BLEND;
564 } 568 }
565 569
566 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
567 glPushMatrix; 571 glPushMatrix;
568 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
570 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
571 glVertex 0 , 0; 575 glVertex 0 , 0;
572 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
573 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
574 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
575 glEnd; 579 glEnd;
576 glPopMatrix; 580 glPopMatrix;
577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
578 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
579} 586}
580 587
581sub _draw { 588sub _draw {
582 my ($self) = @_; 589 my ($self) = @_;
583 590
… …
586 593
587sub DESTROY { 594sub DESTROY {
588 my ($self) = @_; 595 my ($self) = @_;
589 596
590 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
591 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
592} 601}
593 602
594############################################################################# 603#############################################################################
595 604
596package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
621 630
622 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
623 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
624 633
625 glEnable GL_BLEND; 634 glEnable GL_BLEND;
626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
627 glColor @$color; 636 glColor_premultiply @$color;
628 637
629 glBegin GL_QUADS; 638 glBegin GL_QUADS;
630 glVertex 0 , 0; 639 glVertex 0 , 0;
631 glVertex 0 , $h; 640 glVertex 0 , $h;
632 glVertex $w, $h; 641 glVertex $w, $h;
… …
663our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
664 673
665sub new { 674sub new {
666 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
667 676
668 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
669 678
670 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
671 children => [], 680 children => [],
672 can_events => 0, 681 can_events => 0,
673 %arg, 682 %arg,
674 ); 683 );
684
675 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
676 687
677 $self 688 $self
678} 689}
679 690
680sub add { 691sub add {
… …
728 $x -= $self->{x}; 739 $x -= $self->{x};
729 $y -= $self->{y}; 740 $y -= $self->{y};
730 741
731 my $res; 742 my $res;
732 743
733 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
734 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
735 and return $res; 746 and return $res;
736 } 747 }
737 748
738 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
759} 770}
760 771
761sub add { 772sub add {
762 my ($self, $child) = @_; 773 my ($self, $child) = @_;
763 774
764 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
765
766 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
767} 777}
768 778
769sub remove { 779sub remove {
770 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
786 796
787 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
788} 798}
789 799
790############################################################################# 800#############################################################################
801
802# back-buffered drawing area
791 803
792package CFClient::UI::Window; 804package CFClient::UI::Window;
793 805
794our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
795 807
… …
847 my $tex = $self->{texture} 859 my $tex = $self->{texture}
848 or return; 860 or return;
849 861
850 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
852 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
853 865
854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
855 867
856 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
857} 869}
… …
948package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
949 961
950our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
951 963
952sub new { 964sub new {
953 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
954 968
955 my $self; 969 my $self;
956 970
957 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
958 vertical => 1, 972 vertical => 1,
… …
963 ; 977 ;
964 978
965 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
966 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
967 slider => $slider, 981 slider => $slider,
968 @_, 982 %arg,
969 ); 983 );
970 984
971 $self->{vp}->add ($self->{scrolled});
972 $self->add ($self->{vp});
973 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
974 987
975 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
976} 995}
977 996
978sub update { 997sub update {
979 my ($self) = @_; 998 my ($self) = @_;
980 999
… …
1019 1038
1020 if ($self->{bg}) { 1039 if ($self->{bg}) {
1021 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
1022 1041
1023 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1025 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1026 1045
1027 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1028 glVertex 0 , 0; 1047 glVertex 0 , 0;
1029 glVertex 0 , $h; 1048 glVertex 0 , $h;
1030 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1055 1074
1056sub new { 1075sub new {
1057 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1058
1059 my $title = delete $arg{title};
1060 1077
1061 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1062 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1063 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1064 border => 0.6, 1081 border => 0.6,
… …
1066 min_w => 16, 1083 min_w => 16,
1067 min_h => 16, 1084 min_h => 16,
1068 %arg, 1085 %arg,
1069 ); 1086 );
1070 1087
1071 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1072 align => 0, 1089 align => 0,
1073 valign => 1, 1090 valign => 1,
1074 text => $title, 1091 text => $self->{title},
1075 fontsize => $self->{border} 1092 fontsize => $self->{border},
1076 if defined $title; 1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1077 1103
1078 $self 1104 $self
1079} 1105}
1080 1106
1081sub add { 1107sub add {
1082 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1083 1109
1084 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1086} 1113}
1087 1114
1088sub border { 1115sub border {
1089 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1090} 1117}
1091 1118
1092sub size_request { 1119sub size_request {
1093 my ($self) = @_; 1120 my ($self) = @_;
1094 1121
1095 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1096 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1097 1127
1098 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1099 1129
1100 ( 1130 (
1101 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1104} 1134}
1105 1135
1106sub size_allocate { 1136sub size_allocate {
1107 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1108 1138
1109 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1110 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1111 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->size_allocate ($w, $h);
1113 } 1143 }
1114 1144
1115 my $border = $self->border; 1145 my $border = $self->border;
1116 1146
1117 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1118 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1119 1149
1120 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1121} 1154}
1122 1155
1123sub button_down { 1156sub button_down {
1124 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1125 1158
… …
1144 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1145 1178
1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 $self->realloc; 1183 $self->realloc;
1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1151 }; 1184 };
1152 1185
1153 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1154 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1155 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1158 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1159 1192
1160 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1161 1194
1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1163 }; 1198 };
1164 } else { 1199 } else {
1165 return 0; 1200 return 0;
1166 } 1201 }
1167 1202
1168 1 1203 1
1169} 1204}
1170 1205
1171sub button_up { 1206sub button_up {
1172 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1173 1211
1174 !!delete $self->{motion} 1212 !!delete $self->{motion}
1175} 1213}
1176 1214
1177sub mouse_motion { 1215sub mouse_motion {
… …
1213 1251
1214 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1215 1253
1216 $child->draw; 1254 $child->draw;
1217 1255
1218 if ($self->{title}) { 1256 if ($self->{title_widget}) {
1219 glTranslate 0, $border - $self->{h}; 1257 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw; 1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1221 } 1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1222} 1265}
1223 1266
1224############################################################################# 1267#############################################################################
1225 1268
1226package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1249 1292
1250 $child->set_parent ($self); 1293 $child->set_parent ($self);
1251 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1252 1295
1253 $self->realloc; 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1254} 1303}
1255 1304
1256# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1257sub clear { 1306sub clear {
1258 my ($self) = @_; 1307 my ($self) = @_;
… …
1519 1568
1520 delete $self->{texture}; 1569 delete $self->{texture};
1521 $self->SUPER::update; 1570 $self->SUPER::update;
1522} 1571}
1523 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1524sub set_text { 1580sub set_text {
1525 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1526 1582
1527 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1528 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1529 1585
1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1531 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1532 1588
1589 delete $self->{size_req};
1533 $self->realloc; 1590 $self->realloc;
1534 $self->update; 1591 $self->update;
1535} 1592}
1536 1593
1537sub set_markup { 1594sub set_markup {
… …
1543 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1544 1601
1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1546 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1547 1604
1605 delete $self->{size_req};
1548 $self->realloc; 1606 $self->realloc;
1549 $self->update; 1607 $self->update;
1550} 1608}
1551 1609
1552sub size_request { 1610sub size_request {
1553 my ($self) = @_; 1611 my ($self) = @_;
1554 1612
1613 $self->{size_req} ||= do {
1555 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1556 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1560 1619
1561 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1562 1621
1563 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1564 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1565 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1625
1567 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1568 1627
1569 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1570 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1571 } 1633 };
1572 1634
1573 ($w, $h) 1635 @{ $self->{size_req} }
1574} 1636}
1575 1637
1576sub size_allocate { 1638sub size_allocate {
1577 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1578 1640
… …
1587 1649
1588 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1589 delete $self->{texture}; 1651 delete $self->{texture};
1590 1652
1591 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1592} 1662}
1593 1663
1594sub _draw { 1664sub _draw {
1595 my ($self) = @_; 1665 my ($self) = @_;
1596 1666
… …
1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1617 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1618 }; 1688 };
1619 1689
1620 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1622 1694
1623 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1624 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1625 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1626 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1627 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1628 } 1702 }
1629 1703
1630 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1631} 1705}
1632 1706
… …
1649 can_hover => 1, 1723 can_hover => 1,
1650 can_focus => 1, 1724 can_focus => 1,
1651 valign => 0, 1725 valign => 0,
1652 can_events => 1, 1726 can_events => 1,
1653 #text => ... 1727 #text => ...
1728 #hidden => "*",
1654 @_ 1729 @_
1655 ) 1730 )
1656} 1731}
1657 1732
1658sub _set_text { 1733sub _set_text {
… …
1660 1735
1661 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1662 1737
1663 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1664 1739
1665 delete $self->{texture};
1666
1667 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1668 $self->{text} = $text; 1741 $self->{text} = $text;
1669 1742
1670 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1671 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1672 1746
1673 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1674} 1751}
1675 1752
1676sub set_text { 1753sub set_text {
1677 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1678 1755
1679 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1680 $self->_set_text ($text); 1757 $self->_set_text ($text);
1681
1682 $self->realloc;
1683} 1758}
1684 1759
1685sub get_text { 1760sub get_text {
1686 $_[0]{text} 1761 $_[0]{text}
1687} 1762}
… …
1767 my ($self) = @_; 1842 my ($self) = @_;
1768 1843
1769 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1770 1845
1771 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1772 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1773 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1774 } else { 1849 } else {
1775 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1776 } 1851 }
1777 1852
1778 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1779 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1780 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1781 glVertex 0 , 0; 1856 glVertex 0 , 0;
1782 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1783 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1784 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1894} 1969}
1895 1970
1896sub _draw { 1971sub _draw {
1897 my ($self) = @_; 1972 my ($self) = @_;
1898 1973
1899 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1900
1901 if ($GRAB == $self) {
1902 $self->{fg} = $self->{active_fg};
1903 }
1904 1975
1905 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1908 1979
1909 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1980 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1910 1981
1911 glDisable GL_TEXTURE_2D; 1982 glDisable GL_TEXTURE_2D;
1912 1983
1913 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1985}
1986
1987#############################################################################
1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
1914} 2023}
1915 2024
1916############################################################################# 2025#############################################################################
1917 2026
1918package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
… …
2133 2242
2134 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2135 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2136 2245
2137 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2138 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2139 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2140 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2141 2251
2142 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2143 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2264sub set_range { 2374sub set_range {
2265 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2266 2376
2267 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2268 2378
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2271} 2383}
2272 2384
2273sub set_value { 2385sub set_value {
2274 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2275 2387
… …
2328} 2440}
2329 2441
2330sub update { 2442sub update {
2331 my ($self) = @_; 2443 my ($self) = @_;
2332 2444
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2334 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2335 2454
2336 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2338 2457
… …
2344 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2345 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2346 2465
2347 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2348 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2349 }); 2468 }
2350
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356 2469
2357 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2358 2471
2359 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2360 2473
… …
2421sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2423 2536
2424############################################################################# 2537#############################################################################
2425 2538
2426package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2427 2540
2428our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2429 2542
2430use CFClient::OpenGL; 2543use CFClient::OpenGL;
2431 2544
… …
2433 my $class = shift; 2546 my $class = shift;
2434 2547
2435 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2436 fontsize => 1, 2549 fontsize => 1,
2437 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2438 #font => default_font 2552 #font => default_font
2439 @_, 2553 @_,
2440 2554
2441 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2442 par => [], 2556 par => [],
… …
2465 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2466 2580
2467 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2468 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2469 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 2585
2471 $self->reflow; 2586 $self->reflow;
2472} 2587}
2473 2588
2474sub text_size { 2589sub text_size {
… …
2476 2591
2477 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2478 2593
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2481 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2482 2598
2483 $layout->size 2599 $layout->size
2484} 2600}
2485 2601
… …
2524 2640
2525 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2526 2642
2527 delete $self->{texture}; 2643 delete $self->{texture};
2528 2644
2529 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531 2647
2532 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2533 my $height = 0; 2649 my $height = 0;
2534 2650
… …
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538 2654
2539 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2541 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2542 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2545 $_->[1] = $h; 2662 $_->[1] = $h;
2546 } 2663 }
… …
2549 } 2666 }
2550 2667
2551 $self->{height} = $height; 2668 $self->{height} = $height;
2552 2669
2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2554 2671
2555 delete $self->{texture}; 2672 delete $self->{texture};
2556 } 2673 }
2557 2674
2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2559 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2560 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2561 2678
2562 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2563 2680
2564 my $y0 = $top; 2681 my $y0 = $top;
… …
2578 my $h = $par->[1]; 2695 my $h = $par->[1];
2579 2696
2580 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2581 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2583 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2584 2702
2585 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2586 2704
2587 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2599sub _draw { 2717sub _draw {
2600 my ($self) = @_; 2718 my ($self) = @_;
2601 2719
2602 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2604 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2606 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2607 2725
2608 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2609 2727
2610} 2728}
… …
2701 $tooltip .= "\n\n" . (ref $widget) . "\n" 2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n" 2821 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}"; 2822 . "visible $widget->{visible}";
2705 } 2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2706 2827
2707 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2708 markup => $tooltip, 2829 markup => $tooltip,
2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2710 fontsize => 0.8, 2831 fontsize => 0.8,
… …
2738 or return; 2859 or return;
2739 2860
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741 2862
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH; 2864 if $x + $self->{w} > $self->{root}{w};
2744 2865
2745 $self->move_abs ($x, $y); 2866 $self->move_abs ($x, $y);
2746 }); 2867 });
2747} 2868}
2748 2869
… …
2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2838 2959
2839 if ($tex) { 2960 if ($tex) {
2840 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2842 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2844 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2845 } 2966 }
2846} 2967}
2847 2968
2848sub DESTROY { 2969sub destroy {
2849 my ($self) = @_; 2970 my ($self) = @_;
2850 2971
2851 $self->{timer}->cancel 2972 $self->{timer}->cancel
2852 if $self->{timer}; 2973 if $self->{timer};
2853 2974
2854 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2855} 2976}
2977
2978#############################################################################
2979
2980package CFClient::UI::Buttonbar;
2981
2982our @ISA = CFClient::UI::HBox::;
2983
2984# TODO: should actualyl wrap buttons and other goodies.
2856 2985
2857############################################################################# 2986#############################################################################
2858 2987
2859package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2860 2989
… …
2872 ); 3001 );
2873 3002
2874 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2875 3004
2876 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2877 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2878 3007
2879 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2880 if (!ref $widget) { 3009 if (!ref $widget) {
2881 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2882 can_hover => 1, 3011 can_hover => 1,
2883 can_events => 1, 3012 can_events => 1,
2884 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2885 } 3015 }
2886 3016
2887 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2888 3018
2889 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2932 1 3062 1
2933} 3063}
2934 3064
2935############################################################################# 3065#############################################################################
2936 3066
2937package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2938 3068
2939our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2940 3070
2941sub new { 3071sub new {
2942 my $class = shift; 3072 my $class = shift;
2943 3073
2944 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2945 fontsize => 0.8, 3239 fontsize => 0.8,
2946 @_, 3240 @_,
2947 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2948} 3248}
2949 3249
2950sub reorder { 3250sub reorder {
2951 my ($self) = @_; 3251 my ($self) = @_;
2952 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2953 3258
2954 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2955 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2956 } 3261 }
2957 3262
… …
2960 my @items = sort { 3265 my @items = sort {
2961 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2962 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2963 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2964 3269
3270 $self->{timer}->interval (1);
3271
2965 my $count = 10 + 1; 3272 my $count = 10 + 1;
2966 for my $item (@items) { 3273 for my $item (@items) {
2967 last unless --$count; 3274 last unless --$count;
2968 3275
2969 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2970 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2971 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2972 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2973 : $item->{text}; 3280 : $item->{text};
2974 3281
… …
2982 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2983 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2984 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2985 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2987 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2988 can_events => 1, 3295 can_events => 1,
2989 can_hover => 1 3296 can_hover => 1
2990 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2991 } 3310 }
2992 3311
2993 $self->clear; 3312 $self->clear;
2994 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2995} 3314}
… …
3000 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
3001 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
3002 3321
3003 return unless $text; 3322 return unless $text;
3004 3323
3005 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3006 3325
3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3008 3327
3009 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
3010 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
3011 $item->{count}++; 3330 $item->{count}++;
3012 } else { 3331 } else {
3013 $item->{count} = 1; 3332 $item->{count} = 1;
3014 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
3015 } 3334 }
3016 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
3017 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
3018 delete $item->{label}; 3337 delete $item->{label};
3019 } else { 3338 } else {
3020 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
3021 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
3040 3359
3041 $self->reorder; 3360 $self->reorder;
3042 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
3043} 3362}
3044 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
3045############################################################################# 3372#############################################################################
3046 3373
3047package CFClient::UI::Inventory; 3374package CFClient::UI::Inventory;
3048 3375
3049our @ISA = CFClient::UI::ScrolledWindow::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
3050 3377
3051sub new { 3378sub new {
3052 my $class = shift; 3379 my $class = shift;
3053 3380
3054 my $self = $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3056 @_, 3383 @_,
3057 ); 3384 );
3058 3385
3059 $self 3386 $self
3060} 3387}
3061 3388
3062sub set_items { 3389sub set_items {
3063 my ($self, $items) = @_; 3390 my ($self, $items) = @_;
3064 3391
3065 $self->{scrolled}->clear; 3392 $self->{child}->clear;
3066 return unless $items; 3393 return unless $items;
3067 3394
3068 my @items = sort { 3395 my @items = sort {
3069 ($a->{type} <=> $b->{type}) 3396 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name}) 3397 or ($a->{name} cmp $b->{name})
… …
3074 3401
3075 my $row = 0; 3402 my $row = 0;
3076 for my $item (@items) { 3403 for my $item (@items) {
3077 CFClient::Item::update_widgets $item; 3404 CFClient::Item::update_widgets $item;
3078 3405
3079 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3406 $self->{child}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3407 $self->{child}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3408 $self->{child}->add (2, $row, $item->{weight_widget});
3082 3409
3083 $row++; 3410 $row++;
3084 } 3411 }
3085} 3412}
3086 3413
… …
3191 my ($self) = @_; 3518 my ($self) = @_;
3192 $self->ask_for_bind (1); 3519 $self->ask_for_bind (1);
3193} 3520}
3194 3521
3195sub ask_for_bind { 3522sub ask_for_bind {
3196 my ($self, $commit) = @_; 3523 my ($self, $commit, $end_cb) = @_;
3197 3524
3198 CFClient::Binder::open_binding_dialog (sub { 3525 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_; 3526 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets; 3528 $self->update_binding_widgets;
3202 $self->commit if $commit; 3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3203 }); 3531 });
3204} 3532}
3205 3533
3206# $mod and $sym are the modifiers and key symbol 3534# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands) 3535# $cmds is a array ref of strings (the commands)
… …
3225} 3553}
3226 3554
3227# this is a shortcut method that asks for a binding 3555# this is a shortcut method that asks for a binding
3228# and then just binds it. 3556# and then just binds it.
3229sub do_quick_binding { 3557sub do_quick_binding {
3230 my ($self, $cmds) = @_; 3558 my ($self, $cmds, $end_cb) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub { 3559 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 }); 3561 });
3234 $self->ask_for_bind (1); 3562 $self->ask_for_bind (1, $end_cb);
3235} 3563}
3236 3564
3237sub update_binding_widgets { 3565sub update_binding_widgets {
3238 my ($self) = @_; 3566 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding; 3567 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3283 3611
3284############################################################################# 3612#############################################################################
3285 3613
3286package CFClient::UI::SpellList; 3614package CFClient::UI::SpellList;
3287 3615
3288our @ISA = CFClient::UI::FancyFrame::; 3616our @ISA = CFClient::UI::Table::;
3289 3617
3290sub new { 3618sub new {
3291 my $class = shift; 3619 my $class = shift;
3292 3620
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3621 my $self = $class->SUPER::new (
3294 3622 binding => [],
3295 $self->add (new CFClient::UI::ScrolledWindow 3623 commands => [],
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3624 @_,
3297 3625 )
3298 $self;
3299} 3626}
3300 3627
3301# XXX: Do sorting? Argl... 3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3302sub add_spell { 3713sub add_spell {
3303 my ($self, $spell) = @_; 3714 my ($self, $spell) = @_;
3715
3304 $self->{spells}->{$spell->{name}} = $spell; 3716 $self->{spell}->{$spell->{name}} = $spell;
3305 3717 $self->rebuild_spell_list;
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333} 3718}
3334 3719
3335sub remove_spell { 3720sub remove_spell {
3336 my ($self, $spell) = @_; 3721 my ($self, $spell) = @_;
3722
3337 delete $self->{spells}->{$spell->{name}}; 3723 delete $self->{spell}->{$spell->{name}};
3338 $self->rebuild_spell_list; 3724 $self->rebuild_spell_list;
3339} 3725}
3340 3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3341############################################################################# 3734#############################################################################
3342 3735
3343package CFClient::UI::Root; 3736package CFClient::UI::Root;
3344 3737
3345our @ISA = CFClient::UI::Container::; 3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3346 3741
3347use CFClient::OpenGL; 3742use CFClient::OpenGL;
3348 3743
3349sub new { 3744sub new {
3350 my $class = shift; 3745 my $class = shift;
… …
3485 3880
3486 delete $queue{$widget+0}; 3881 delete $queue{$widget+0};
3487 3882
3488 my ($w, $h) = $widget->size_request; 3883 my ($w, $h) = $widget->size_request;
3489 3884
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3492 3890
3493 $w = $widget->{force_w} if exists $widget->{force_w}; 3891 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h}; 3892 $h = $widget->{force_h} if exists $widget->{force_h};
3495 3893
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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