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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 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) = @_;
856 my $tex = $self->{texture} 859 my $tex = $self->{texture}
857 or return; 860 or return;
858 861
859 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
862 865
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 867
865 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
866} 869}
1035 1038
1036 if ($self->{bg}) { 1039 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
1038 1041
1039 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1042 1045
1043 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1047 glVertex 0 , 0;
1045 glVertex 0 , $h; 1048 glVertex 0 , $h;
1046 glVertex $w, $h; 1049 glVertex $w, $h;
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070 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);
1071 1074
1072sub new { 1075sub new {
1073 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1076 1077
1077 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1080 border => 0.6, 1081 border => 0.6,
1082 min_w => 16, 1083 min_w => 16,
1083 min_h => 16, 1084 min_h => 16,
1084 %arg, 1085 %arg,
1085 ); 1086 );
1086 1087
1087 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1088 align => 0, 1089 align => 0,
1089 valign => 1, 1090 valign => 1,
1090 text => $title, 1091 text => $self->{title},
1091 fontsize => $self->{border} 1092 fontsize => $self->{border},
1092 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 }
1093 1103
1094 $self 1104 $self
1095} 1105}
1096 1106
1097sub add { 1107sub add {
1098 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1099 1109
1100 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102} 1113}
1103 1114
1104sub border { 1115sub border {
1105 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1106} 1117}
1107 1118
1108sub size_request { 1119sub size_request {
1109 my ($self) = @_; 1120 my ($self) = @_;
1110 1121
1111 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1112 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1113 1127
1114 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1115 1129
1116 ( 1130 (
1117 $w + $self->border * 2, 1131 $w + $self->border * 2,
1120} 1134}
1121 1135
1122sub size_allocate { 1136sub size_allocate {
1123 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1124 1138
1125 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1126 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1127 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->size_allocate ($w, $h);
1129 } 1143 }
1130 1144
1131 my $border = $self->border; 1145 my $border = $self->border;
1132 1146
1133 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1134 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1135 1149
1136 $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};
1137} 1154}
1138 1155
1139sub button_down { 1156sub button_down {
1140 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1141 1158
1187} 1204}
1188 1205
1189sub button_up { 1206sub button_up {
1190 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1191 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1192 !!delete $self->{motion} 1212 !!delete $self->{motion}
1193} 1213}
1194 1214
1195sub mouse_motion { 1215sub mouse_motion {
1196 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1231 1251
1232 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1233 1253
1234 $child->draw; 1254 $child->draw;
1235 1255
1236 if ($self->{title}) { 1256 if ($self->{title_widget}) {
1237 glTranslate 0, $border - $self->{h}; 1257 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw; 1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1239 } 1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1240} 1265}
1241 1266
1242############################################################################# 1267#############################################################################
1243 1268
1244package CFClient::UI::Table; 1269package CFClient::UI::Table;
1267 1292
1268 $child->set_parent ($self); 1293 $child->set_parent ($self);
1269 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1270 1295
1271 $self->realloc; 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1272} 1303}
1273 1304
1274# 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?
1275sub clear { 1306sub clear {
1276 my ($self) = @_; 1307 my ($self) = @_;
1537 1568
1538 delete $self->{texture}; 1569 delete $self->{texture};
1539 $self->SUPER::update; 1570 $self->SUPER::update;
1540} 1571}
1541 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1542sub set_text { 1580sub set_text {
1543 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1544 1582
1545 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1547 1585
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1550 1588
1589 delete $self->{size_req};
1551 $self->realloc; 1590 $self->realloc;
1552 $self->update; 1591 $self->update;
1553} 1592}
1554 1593
1555sub set_markup { 1594sub set_markup {
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1601
1563 $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;
1564 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1565 1604
1605 delete $self->{size_req};
1566 $self->realloc; 1606 $self->realloc;
1567 $self->update; 1607 $self->update;
1568} 1608}
1569 1609
1570sub size_request { 1610sub size_request {
1571 my ($self) = @_; 1611 my ($self) = @_;
1572 1612
1613 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 1619
1579 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1580 1621
1581 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1582 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 1625
1585 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1586 1627
1587 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1589 } 1633 };
1590 1634
1591 ($w, $h) 1635 @{ $self->{size_req} }
1592} 1636}
1593 1637
1594sub size_allocate { 1638sub size_allocate {
1595 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1596 1640
1605 1649
1606 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1607 delete $self->{texture}; 1651 delete $self->{texture};
1608 1652
1609 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1610} 1662}
1611 1663
1612sub _draw { 1664sub _draw {
1613 my ($self) = @_; 1665 my ($self) = @_;
1614 1666
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1636 }; 1688 };
1637 1689
1638 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1639 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};
1640 1694
1641 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1642 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1644 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1646 } 1702 }
1647 1703
1648 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1649} 1705}
1650 1706
1667 can_hover => 1, 1723 can_hover => 1,
1668 can_focus => 1, 1724 can_focus => 1,
1669 valign => 0, 1725 valign => 0,
1670 can_events => 1, 1726 can_events => 1,
1671 #text => ... 1727 #text => ...
1728 #hidden => "*",
1672 @_ 1729 @_
1673 ) 1730 )
1674} 1731}
1675 1732
1676sub _set_text { 1733sub _set_text {
1683 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1741 $self->{text} = $text;
1685 1742
1686 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1688 1746
1689 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1690 $self->update; 1750 $self->update;
1691} 1751}
1692 1752
1693sub set_text { 1753sub set_text {
1694 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1695 1755
1696 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 1757 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 1758}
1701 1759
1702sub get_text { 1760sub get_text {
1703 $_[0]{text} 1761 $_[0]{text}
1704} 1762}
1784 my ($self) = @_; 1842 my ($self) = @_;
1785 1843
1786 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1787 1845
1788 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1791 } else { 1849 } else {
1792 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1793 } 1851 }
1794 1852
1795 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1798 glVertex 0 , 0; 1856 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
1911} 1969}
1912 1970
1913sub _draw { 1971sub _draw {
1914 my ($self) = @_; 1972 my ($self) = @_;
1915 1973
1916 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921 1975
1922 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1925 1979
1926 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1980 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1927 1981
1928 glDisable GL_TEXTURE_2D; 1982 glDisable GL_TEXTURE_2D;
1929 1983
1930 $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
1931} 2023}
1932 2024
1933############################################################################# 2025#############################################################################
1934 2026
1935package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
2150 2242
2151 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2152 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2153 2245
2154 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2155 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;
2156 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2251
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
2281sub set_range { 2374sub set_range {
2282 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2283 2376
2284 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2285 2378
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2288} 2383}
2289 2384
2290sub set_value { 2385sub set_value {
2291 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2292 2387
2439sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2441 2536
2442############################################################################# 2537#############################################################################
2443 2538
2444package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2445 2540
2446our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2447 2542
2448use CFClient::OpenGL; 2543use CFClient::OpenGL;
2449 2544
2451 my $class = shift; 2546 my $class = shift;
2452 2547
2453 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2454 fontsize => 1, 2549 fontsize => 1,
2455 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2456 #font => default_font 2552 #font => default_font
2457 @_, 2553 @_,
2458 2554
2459 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2460 par => [], 2556 par => [],
2483 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2484 2580
2485 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $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});
2488 2585
2489 $self->reflow; 2586 $self->reflow;
2490} 2587}
2491 2588
2492sub text_size { 2589sub text_size {
2494 2591
2495 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2496 2593
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $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});
2499 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2500 2598
2501 $layout->size 2599 $layout->size
2502} 2600}
2503 2601
2542 2640
2543 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2544 2642
2545 delete $self->{texture}; 2643 delete $self->{texture};
2546 2644
2547 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549 2647
2550 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2551 my $height = 0; 2649 my $height = 0;
2552 2650
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556 2654
2557 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2559 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2560 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2563 $_->[1] = $h; 2662 $_->[1] = $h;
2564 } 2663 }
2567 } 2666 }
2568 2667
2569 $self->{height} = $height; 2668 $self->{height} = $height;
2570 2669
2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2572 2671
2573 delete $self->{texture}; 2672 delete $self->{texture};
2574 } 2673 }
2575 2674
2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2579 2678
2580 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2581 2680
2582 my $y0 = $top; 2681 my $y0 = $top;
2596 my $h = $par->[1]; 2695 my $h = $par->[1];
2597 2696
2598 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2600 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2601 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2602 2702
2603 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2604 2704
2605 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
2617sub _draw { 2717sub _draw {
2618 my ($self) = @_; 2718 my ($self) = @_;
2619 2719
2620 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2623 $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});
2624 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2625 2725
2626 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2627 2727
2628} 2728}
2719 $tooltip .= "\n\n" . (ref $widget) . "\n" 2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n" 2821 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}"; 2822 . "visible $widget->{visible}";
2723 } 2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2724 2827
2725 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2726 markup => $tooltip, 2829 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8, 2831 fontsize => 0.8,
2756 or return; 2859 or return;
2757 2860
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759 2862
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH; 2864 if $x + $self->{w} > $self->{root}{w};
2762 2865
2763 $self->move_abs ($x, $y); 2866 $self->move_abs ($x, $y);
2764 }); 2867 });
2765} 2868}
2766 2869
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2856 2959
2857 if ($tex) { 2960 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2863 } 2966 }
2864} 2967}
2865 2968
2866sub DESTROY { 2969sub destroy {
2867 my ($self) = @_; 2970 my ($self) = @_;
2868 2971
2869 $self->{timer}->cancel 2972 $self->{timer}->cancel
2870 if $self->{timer}; 2973 if $self->{timer};
2871 2974
2872 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2873} 2976}
2874 2977
2875############################################################################# 2978#############################################################################
2876 2979
2877package CFClient::UI::Buttonbar; 2980package CFClient::UI::Buttonbar;
2898 ); 3001 );
2899 3002
2900 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2901 3004
2902 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2903 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2904 3007
2905 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2906 if (!ref $widget) { 3009 if (!ref $widget) {
2907 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2908 can_hover => 1, 3011 can_hover => 1,
2909 can_events => 1, 3012 can_events => 1,
2910 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2911 } 3015 }
2912 3016
2913 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2914 3018
2915 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
3066 $self->_emit (page_changed => $self->{multiplexer}{current}); 3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3067} 3171}
3068 3172
3069############################################################################# 3173#############################################################################
3070 3174
3071package CFClient::UI::Statusbox; 3175package CFClient::UI::Combobox;
3072 3176
3177use utf8;
3178
3073our @ISA = CFClient::UI::VBox::; 3179our @ISA = CFClient::UI::Button::;
3074 3180
3075sub new { 3181sub new {
3076 my $class = shift; 3182 my $class = shift;
3077 3183
3078 $class->SUPER::new ( 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 (
3079 fontsize => 0.8, 3239 fontsize => 0.8,
3080 @_, 3240 @_,
3081 ) 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
3082} 3248}
3083 3249
3084sub reorder { 3250sub reorder {
3085 my ($self) = @_; 3251 my ($self) = @_;
3086 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} };
3087 3258
3088 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 3261 }
3091 3262
3094 my @items = sort { 3265 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
3098 3269
3270 $self->{timer}->interval (1);
3271
3099 my $count = 10 + 1; 3272 my $count = 10 + 1;
3100 for my $item (@items) { 3273 for my $item (@items) {
3101 last unless --$count; 3274 last unless --$count;
3102 3275
3103 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 3280 : $item->{text};
3108 3281
3116 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
3122 can_events => 1, 3295 can_events => 1,
3123 can_hover => 1 3296 can_hover => 1
3124 }; 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;
3125 } 3310 }
3126 3311
3127 $self->clear; 3312 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
3129} 3314}
3134 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
3136 3321
3137 return unless $text; 3322 return unless $text;
3138 3323
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 3325
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 3327
3143 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
3145 $item->{count}++; 3330 $item->{count}++;
3146 } else { 3331 } else {
3147 $item->{count} = 1; 3332 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
3149 } 3334 }
3150 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
3151 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
3152 delete $item->{label}; 3337 delete $item->{label};
3153 } else { 3338 } else {
3154 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
3155 id => ++$self->{id}, 3340 id => ++$self->{id},
3174 3359
3175 $self->reorder; 3360 $self->reorder;
3176 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
3177} 3362}
3178 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
3179############################################################################# 3372#############################################################################
3180 3373
3181package CFClient::UI::Inventory; 3374package CFClient::UI::Inventory;
3182 3375
3183our @ISA = CFClient::UI::ScrolledWindow::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
3429 commands => [], 3622 commands => [],
3430 @_, 3623 @_,
3431 ) 3624 )
3432} 3625}
3433 3626
3434# XXX: Do sorting? Argl... 3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3628
3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3639
3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3435sub add_spell { 3712sub add_spell {
3436 my ($self, $spell) = @_; 3713 my ($self, $spell) = @_;
3714
3437 $self->{spells}->{$spell->{name}} = $spell; 3715 $self->{spell}->{$spell->{name}} = $spell;
3438 3716 $self->rebuild_spell_list;
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466} 3717}
3467 3718
3468sub remove_spell { 3719sub remove_spell {
3469 my ($self, $spell) = @_; 3720 my ($self, $spell) = @_;
3721
3470 delete $self->{spells}->{$spell->{name}}; 3722 delete $self->{spell}->{$spell->{name}};
3471 $self->rebuild_spell_list; 3723 $self->rebuild_spell_list;
3472} 3724}
3473 3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3474############################################################################# 3733#############################################################################
3475 3734
3476package CFClient::UI::Root; 3735package CFClient::UI::Root;
3477 3736
3478our @ISA = CFClient::UI::Container::; 3737our @ISA = CFClient::UI::Container::;
3738
3739use List::Util qw(min max);
3479 3740
3480use CFClient::OpenGL; 3741use CFClient::OpenGL;
3481 3742
3482sub new { 3743sub new {
3483 my $class = shift; 3744 my $class = shift;
3618 3879
3619 delete $queue{$widget+0}; 3880 delete $queue{$widget+0};
3620 3881
3621 my ($w, $h) = $widget->size_request; 3882 my ($w, $h) = $widget->size_request;
3622 3883
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625 3889
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 3890 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 3891 $h = $widget->{force_h} if exists $widget->{force_h};
3628 3892
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines