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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 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
… …
381} 382}
382 383
383sub set_max_size { 384sub set_max_size {
384 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
385 386
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
388} 391}
389 392
390sub set_tooltip { 393sub set_tooltip {
391 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
392 395
… …
397 400
398 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
399 402
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 406 }
404} 407}
405 408
406# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
407sub coord2local { 410sub coord2local {
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 553
551 glPushMatrix; 554 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 556
556 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 559 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 561 glBegin GL_QUADS;
563 glVertex $x , $y; 562 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
567 glEnd; 566 glEnd;
568 glDisable GL_BLEND; 567 glDisable GL_BLEND;
569 } 568 }
570 569
571 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 571 glPushMatrix;
573 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 575 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
580 glEnd; 579 glEnd;
581 glPopMatrix; 580 glPopMatrix;
582 #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;
583 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
584} 586}
585 587
586sub _draw { 588sub _draw {
587 my ($self) = @_; 589 my ($self) = @_;
588 590
… …
591 593
592sub DESTROY { 594sub DESTROY {
593 my ($self) = @_; 595 my ($self) = @_;
594 596
595 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
596 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 601}
598 602
599############################################################################# 603#############################################################################
600 604
601package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
626 630
627 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
629 633
630 glEnable GL_BLEND; 634 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 636 glColor_premultiply @$color;
633 637
634 glBegin GL_QUADS; 638 glBegin GL_QUADS;
635 glVertex 0 , 0; 639 glVertex 0 , 0;
636 glVertex 0 , $h; 640 glVertex 0 , $h;
637 glVertex $w, $h; 641 glVertex $w, $h;
… …
766} 770}
767 771
768sub add { 772sub add {
769 my ($self, $child) = @_; 773 my ($self, $child) = @_;
770 774
771 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
774} 777}
775 778
776sub remove { 779sub remove {
777 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
793 796
794 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
795} 798}
796 799
797############################################################################# 800#############################################################################
801
802# back-buffered drawing area
798 803
799package CFClient::UI::Window; 804package CFClient::UI::Window;
800 805
801our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
802 807
… …
854 my $tex = $self->{texture} 859 my $tex = $self->{texture}
855 or return; 860 or return;
856 861
857 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
860 865
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 867
863 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
864} 869}
… …
955package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
956 961
957our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
958 963
959sub new { 964sub new {
960 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
961 968
962 my $self; 969 my $self;
963 970
964 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
965 vertical => 1, 972 vertical => 1,
… …
970 ; 977 ;
971 978
972 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 981 slider => $slider,
975 @_, 982 %arg,
976 ); 983 );
977 984
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
981 987
982 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
983} 995}
984 996
985sub update { 997sub update {
986 my ($self) = @_; 998 my ($self) = @_;
987 999
… …
1026 1038
1027 if ($self->{bg}) { 1039 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
1029 1041
1030 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1033 1045
1034 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1047 glVertex 0 , 0;
1036 glVertex 0 , $h; 1048 glVertex 0 , $h;
1037 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061 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);
1062 1074
1063sub new { 1075sub new {
1064 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1065
1066 my $title = delete $arg{title};
1067 1077
1068 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1081 border => 0.6,
… …
1073 min_w => 16, 1083 min_w => 16,
1074 min_h => 16, 1084 min_h => 16,
1075 %arg, 1085 %arg,
1076 ); 1086 );
1077 1087
1078 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1079 align => 0, 1089 align => 0,
1080 valign => 1, 1090 valign => 1,
1081 text => $title, 1091 text => $self->{title},
1082 fontsize => $self->{border} 1092 fontsize => $self->{border},
1083 if defined $title; 1093 if exists $self->{title};
1084 1094
1085 $self 1095 $self
1086} 1096}
1087 1097
1088sub add { 1098sub add {
1089 my ($self, @widgets) = @_; 1099 my ($self, @widgets) = @_;
1090 1100
1091 $self->SUPER::add (@widgets); 1101 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1103}
1094 1104
1095sub border { 1105sub border {
1096 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1097} 1107}
1098 1108
1099sub size_request { 1109sub size_request {
1100 my ($self) = @_; 1110 my ($self) = @_;
1101 1111
1102 $self->{title}->size_request 1112 $self->{title_widget}->size_request
1103 if $self->{title}; 1113 if $self->{title_widget};
1104 1114
1105 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1106 1116
1107 ( 1117 (
1108 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1111} 1121}
1112 1122
1113sub size_allocate { 1123sub size_allocate {
1114 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1115 1125
1116 if ($self->{title}) { 1126 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1127 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1128 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1129 $self->{title_widget}->size_allocate ($w, $h);
1120 } 1130 }
1121 1131
1122 my $border = $self->border; 1132 my $border = $self->border;
1123 1133
1124 $h -= List::Util::max 0, $border * 2; 1134 $h -= List::Util::max 0, $border * 2;
… …
1151 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1152 1162
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1167 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1168 };
1159 1169
1160 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1166 1176
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1178
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1182 };
1171 } else { 1183 } else {
1172 return 0; 1184 return 0;
1173 } 1185 }
1174 1186
… …
1220 1232
1221 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1222 1234
1223 $child->draw; 1235 $child->draw;
1224 1236
1225 if ($self->{title}) { 1237 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1238 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1239 $self->{title_widget}->_draw;
1228 } 1240 }
1229} 1241}
1230 1242
1231############################################################################# 1243#############################################################################
1232 1244
… …
1256 1268
1257 $child->set_parent ($self); 1269 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1259 1271
1260 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1261} 1279}
1262 1280
1263# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1282sub clear {
1265 my ($self) = @_; 1283 my ($self) = @_;
… …
1526 1544
1527 delete $self->{texture}; 1545 delete $self->{texture};
1528 $self->SUPER::update; 1546 $self->SUPER::update;
1529} 1547}
1530 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1531sub set_text { 1556sub set_text {
1532 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1533 1558
1534 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1536 1561
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1539 1564
1565 delete $self->{size_req};
1540 $self->realloc; 1566 $self->realloc;
1541 $self->update; 1567 $self->update;
1542} 1568}
1543 1569
1544sub set_markup { 1570sub set_markup {
… …
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1577
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1554 1580
1581 delete $self->{size_req};
1555 $self->realloc; 1582 $self->realloc;
1556 $self->update; 1583 $self->update;
1557} 1584}
1558 1585
1559sub size_request { 1586sub size_request {
1560 my ($self) = @_; 1587 my ($self) = @_;
1561 1588
1589 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1595
1568 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1569 1597
1570 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1601
1574 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1575 1603
1576 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1578 } 1609 };
1579 1610
1580 ($w, $h) 1611 @{ $self->{size_req} }
1581} 1612}
1582 1613
1583sub size_allocate { 1614sub size_allocate {
1584 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1585 1616
… …
1594 1625
1595 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1596 delete $self->{texture}; 1627 delete $self->{texture};
1597 1628
1598 $self->realloc; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1599} 1638}
1600 1639
1601sub _draw { 1640sub _draw {
1602 my ($self) = @_; 1641 my ($self) = @_;
1603 1642
… …
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1625 }; 1664 };
1626 1665
1627 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1629 1670
1630 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1631 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1633 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1635 } 1678 }
1636 1679
1637 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1638} 1681}
1639 1682
… …
1656 can_hover => 1, 1699 can_hover => 1,
1657 can_focus => 1, 1700 can_focus => 1,
1658 valign => 0, 1701 valign => 0,
1659 can_events => 1, 1702 can_events => 1,
1660 #text => ... 1703 #text => ...
1704 #hidden => "*",
1661 @_ 1705 @_
1662 ) 1706 )
1663} 1707}
1664 1708
1665sub _set_text { 1709sub _set_text {
… …
1667 1711
1668 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1669 1713
1670 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1671 1715
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1717 $self->{text} = $text;
1676 1718
1677 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1679 1722
1680 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1681} 1727}
1682 1728
1683sub set_text { 1729sub set_text {
1684 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1685 1731
1686 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1733 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1734}
1691 1735
1692sub get_text { 1736sub get_text {
1693 $_[0]{text} 1737 $_[0]{text}
1694} 1738}
… …
1774 my ($self) = @_; 1818 my ($self) = @_;
1775 1819
1776 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1777 1821
1778 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1781 } else { 1825 } else {
1782 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1783 } 1827 }
1784 1828
1785 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1832 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1901} 1945}
1902 1946
1903sub _draw { 1947sub _draw {
1904 my ($self) = @_; 1948 my ($self) = @_;
1905 1949
1906 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 1951
1912 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1915 1955
… …
2140 2180
2141 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2143 2183
2144 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2189
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2271sub set_range { 2312sub set_range {
2272 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2273 2314
2274 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2275 2316
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2278} 2321}
2279 2322
2280sub set_value { 2323sub set_value {
2281 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2282 2325
… …
2335} 2378}
2336 2379
2337sub update { 2380sub update {
2338 my ($self) = @_; 2381 my ($self) = @_;
2339 2382
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2342 2392
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2345 2395
… …
2351 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2353 2403
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2356 }); 2406 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2407
2364 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2365 2409
2366 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2367 2411
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2430 2474
2431############################################################################# 2475#############################################################################
2432 2476
2433package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2434 2478
2435our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2436 2480
2437use CFClient::OpenGL; 2481use CFClient::OpenGL;
2438 2482
… …
2440 my $class = shift; 2484 my $class = shift;
2441 2485
2442 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2443 fontsize => 1, 2487 fontsize => 1,
2444 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2445 #font => default_font 2490 #font => default_font
2446 @_, 2491 @_,
2447 2492
2448 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2449 par => [], 2494 par => [],
… …
2472 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2473 2518
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2523
2478 $self->reflow; 2524 $self->reflow;
2479} 2525}
2480 2526
2481sub text_size { 2527sub text_size {
… …
2483 2529
2484 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2485 2531
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2489 2536
2490 $layout->size 2537 $layout->size
2491} 2538}
2492 2539
… …
2531 2578
2532 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2533 2580
2534 delete $self->{texture}; 2581 delete $self->{texture};
2535 2582
2536 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2585
2539 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2587 my $height = 0;
2541 2588
… …
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545 2592
2546 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2549 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h; 2600 $_->[1] = $h;
2553 } 2601 }
… …
2556 } 2604 }
2557 2605
2558 $self->{height} = $height; 2606 $self->{height} = $height;
2559 2607
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2561 2609
2562 delete $self->{texture}; 2610 delete $self->{texture};
2563 } 2611 }
2564 2612
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2568 2616
2569 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2570 2618
2571 my $y0 = $top; 2619 my $y0 = $top;
… …
2585 my $h = $par->[1]; 2633 my $h = $par->[1];
2586 2634
2587 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2591 2640
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2593 2642
2594 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2606sub _draw { 2655sub _draw {
2607 my ($self) = @_; 2656 my ($self) = @_;
2608 2657
2609 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2614 2663
2615 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2616 2665
2617} 2666}
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2759 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2760 . "visible $widget->{visible}";
2712 } 2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2713 2765
2714 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2767 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2769 fontsize => 0.8,
… …
2745 or return; 2797 or return;
2746 2798
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 2800
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 2802 if $x + $self->{w} > $self->{root}{w};
2751 2803
2752 $self->move_abs ($x, $y); 2804 $self->move_abs ($x, $y);
2753 }); 2805 });
2754} 2806}
2755 2807
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 2897
2846 if ($tex) { 2898 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2852 } 2904 }
2853} 2905}
2854 2906
2855sub DESTROY { 2907sub destroy {
2856 my ($self) = @_; 2908 my ($self) = @_;
2857 2909
2858 $self->{timer}->cancel 2910 $self->{timer}->cancel
2859 if $self->{timer}; 2911 if $self->{timer};
2860 2912
2861 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2862} 2914}
2863 2915
2864############################################################################# 2916#############################################################################
2865 2917
2866package CFClient::UI::Buttonbar; 2918package CFClient::UI::Buttonbar;
… …
2887 ); 2939 );
2888 2940
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 2942
2891 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2893 2945
2894 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2895 if (!ref $widget) { 2947 if (!ref $widget) {
2896 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2897 can_hover => 1, 2949 can_hover => 1,
2898 can_events => 1, 2950 can_events => 1,
2899 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2900 } 2953 }
2901 2954
2902 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2903 2956
2904 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
3022 my $class = shift; 3075 my $class = shift;
3023 3076
3024 my $self = $class->SUPER::new ( 3077 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3078 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3027 @_, 3081 @_,
3028 ); 3082 );
3029 3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3086
3032 $self 3087 $self
3033} 3088}
3034 3089
3035sub add { 3090sub add {
… …
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3054} 3109}
3055 3110
3056############################################################################# 3111#############################################################################
3057 3112
3058package CFClient::UI::Statusbox; 3113package CFClient::UI::Combobox;
3059 3114
3115use utf8;
3116
3060our @ISA = CFClient::UI::VBox::; 3117our @ISA = CFClient::UI::Button::;
3061 3118
3062sub new { 3119sub new {
3063 my $class = shift; 3120 my $class = shift;
3064 3121
3065 $class->SUPER::new ( 3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3177 fontsize => 0.8,
3067 @_, 3178 @_,
3068 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
3069} 3186}
3070 3187
3071sub reorder { 3188sub reorder {
3072 my ($self) = @_; 3189 my ($self) = @_;
3073 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
3074 3196
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3199 }
3078 3200
… …
3081 my @items = sort { 3203 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
3085 3207
3208 $self->{timer}->interval (1);
3209
3086 my $count = 10 + 1; 3210 my $count = 10 + 1;
3087 for my $item (@items) { 3211 for my $item (@items) {
3088 last unless --$count; 3212 last unless --$count;
3089 3213
3090 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3218 : $item->{text};
3095 3219
… …
3103 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3233 can_events => 1,
3110 can_hover => 1 3234 can_hover => 1
3111 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
3112 } 3248 }
3113 3249
3114 $self->clear; 3250 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
3116} 3252}
… …
3121 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
3123 3259
3124 return unless $text; 3260 return unless $text;
3125 3261
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3263
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3265
3130 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
3132 $item->{count}++; 3268 $item->{count}++;
3133 } else { 3269 } else {
3134 $item->{count} = 1; 3270 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
3136 } 3272 }
3137 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3275 delete $item->{label};
3140 } else { 3276 } else {
3141 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
3161 3297
3162 $self->reorder; 3298 $self->reorder;
3163 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
3164} 3300}
3165 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
3166############################################################################# 3310#############################################################################
3167 3311
3168package CFClient::UI::Inventory; 3312package CFClient::UI::Inventory;
3169 3313
3170our @ISA = CFClient::UI::ScrolledWindow::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
3171 3315
3172sub new { 3316sub new {
3173 my $class = shift; 3317 my $class = shift;
3174 3318
3175 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3321 @_,
3178 ); 3322 );
3179 3323
3180 $self 3324 $self
3181} 3325}
3182 3326
3183sub set_items { 3327sub set_items {
3184 my ($self, $items) = @_; 3328 my ($self, $items) = @_;
3185 3329
3186 $self->{scrolled}->clear; 3330 $self->{child}->clear;
3187 return unless $items; 3331 return unless $items;
3188 3332
3189 my @items = sort { 3333 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3334 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3335 or ($a->{name} cmp $b->{name})
… …
3195 3339
3196 my $row = 0; 3340 my $row = 0;
3197 for my $item (@items) { 3341 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3342 CFClient::Item::update_widgets $item;
3199 3343
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3344 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3345 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3346 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3347
3204 $row++; 3348 $row++;
3205 } 3349 }
3206} 3350}
3207 3351
… …
3404 3548
3405############################################################################# 3549#############################################################################
3406 3550
3407package CFClient::UI::SpellList; 3551package CFClient::UI::SpellList;
3408 3552
3409our @ISA = CFClient::UI::ScrolledWindow::; 3553our @ISA = CFClient::UI::Table::;
3410 3554
3411sub new { 3555sub new {
3412 my $class = shift; 3556 my $class = shift;
3413 3557
3414 my $self = $class->SUPER::new ( 3558 my $self = $class->SUPER::new (
3415 binding => [], 3559 binding => [],
3416 commands => [], 3560 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3561 @_,
3419 ) 3562 )
3420} 3563}
3421 3564
3422# XXX: Do sorting? Argl... 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3423sub add_spell { 3650sub add_spell {
3424 my ($self, $spell) = @_; 3651 my ($self, $spell) = @_;
3652
3425 $self->{spells}->{$spell->{name}} = $spell; 3653 $self->{spell}->{$spell->{name}} = $spell;
3426 3654 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3655}
3455 3656
3456sub remove_spell { 3657sub remove_spell {
3457 my ($self, $spell) = @_; 3658 my ($self, $spell) = @_;
3659
3458 delete $self->{spells}->{$spell->{name}}; 3660 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3661 $self->rebuild_spell_list;
3460} 3662}
3461 3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3462############################################################################# 3671#############################################################################
3463 3672
3464package CFClient::UI::Root; 3673package CFClient::UI::Root;
3465 3674
3466our @ISA = CFClient::UI::Container::; 3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3467 3678
3468use CFClient::OpenGL; 3679use CFClient::OpenGL;
3469 3680
3470sub new { 3681sub new {
3471 my $class = shift; 3682 my $class = shift;
… …
3606 3817
3607 delete $queue{$widget+0}; 3818 delete $queue{$widget+0};
3608 3819
3609 my ($w, $h) = $widget->size_request; 3820 my ($w, $h) = $widget->size_request;
3610 3821
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3827
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3828 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3829 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3830
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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