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.187 by root, Mon May 8 20:40:31 2006 UTC vs.
Revision 1.197 by root, Fri May 12 01:47:04 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_markup ($widget->{tooltip}); 29 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31 31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) { 34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 } 36 }
37 37
38 $TOOLTIP->move ($x, $y); 38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
39 } 41 }
40 42
41 return; 43 return;
42 } 44 }
43 } 45 }
… …
232 $self->{y} = $y; 234 $self->{y} = $y;
233 $self->update; 235 $self->update;
234 } 236 }
235 237
236 if ($self->{w} != $w || $self->{h} != $h) { 238 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 240 }
244} 241}
245 242
246sub size_allocate { 243sub size_allocate {
247 # nothing to be done 244 # nothing to be done
… …
256 253
257 $_->reconfigure 254 $_->reconfigure
258 for $self->children; 255 for $self->children;
259 256
260 $self->check_size; 257 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h}); 258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
262 $self->update; 259 $self->update;
263} 260}
264 261
265sub set_max_size { 262sub set_max_size {
266 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
267 264
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 delete $self->{max_h}; $self->{max_h} = $h if $h;
270}
271
272# return top left coordinates
273sub _topleft {
274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
278
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
280} 267}
281 268
282# translate global coordinates to local coordinate system 269# translate global coordinates to local coordinate system
283sub coord2local { 270sub coord2local {
284 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
285 272
286 my ($X, $Y) = $self->_topleft; 273 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 274}
289 275
290# translate local coordinates to global coordinate system 276# translate local coordinates to global coordinate system
291sub coord2global { 277sub coord2global {
292 my ($self, $x, $y) = @_; 278 my ($self, $x, $y) = @_;
293 279
294 my ($X, $Y) = $self->_topleft; 280 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 281}
297 282
298sub focus_in { 283sub focus_in {
299 my ($self) = @_; 284 my ($self) = @_;
300 285
… …
398 383
399sub set_parent { 384sub set_parent {
400 my ($self, $parent) = @_; 385 my ($self, $parent) = @_;
401 386
402 Scalar::Util::weaken ($self->{parent} = $parent); 387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
403} 391}
404 392
405sub check_size { 393sub check_size {
406 my ($self) = @_; 394 my ($self, $forced) = @_;
407 395
408 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
409 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 398}
430 399
431sub update { 400sub update {
432 my ($self) = @_; 401 my ($self) = @_;
433 402
… …
530 499
531 $self 500 $self
532} 501}
533 502
534sub add { 503sub add {
535 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
536 505
537 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
538 508
539 use sort 'stable'; 509 use sort 'stable';
540 510
541 $self->{children} = [ 511 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
544 ]; 514 ];
545 515
546 $child->check_size; 516 $self->check_size (1);
547 $self->update; 517 $self->update;
548} 518}
549 519
550sub children { 520sub children {
551 @{ $_[0]{children} } 521 @{ $_[0]{children} }
… …
699 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
700 670
701 my $tex = $self->{texture} 671 my $tex = $self->{texture}
702 or return; 672 or return;
703 673
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 676 glColor 0, 0, 0, 1;
709 677
710 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 679
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
714} 681}
715 682
716############################################################################# 683#############################################################################
717 684
… …
741 $self->{view_y} = int $y; 708 $self->{view_y} = int $y;
742 709
743 $self->update; 710 $self->update;
744} 711}
745 712
746# hmm, this does not work for topleft of $self... but we should not aks for that 713# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 714sub coord2local {
748 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
749 716
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
751} 727}
752 728
753sub find_widget { 729sub find_widget {
754 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
755 731
… …
811 787
812our @ISA = CFClient::UI::Bin::; 788our @ISA = CFClient::UI::Bin::;
813 789
814use CFClient::OpenGL; 790use CFClient::OpenGL;
815 791
816sub new {
817 my $class = shift;
818
819 my $self = $class->SUPER::new (
820 bg => [1, 1, 1, 1],
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_
824 );
825
826 $self
827}
828
829sub _draw {
830 my ($self) = @_;
831
832 my ($w, $h) = ($self->{w}, $self->{h});
833
834 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D;
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838
839# glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0;
842# glVertex 0 , $h;
843# glVertex $w, $h;
844# glVertex $w, 0;
845# glEnd;
846
847
848 $self->child->draw;
849 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D;
851}
852
853############################################################################# 792#############################################################################
854 793
855package CFClient::UI::FancyFrame; 794package CFClient::UI::FancyFrame;
856 795
857our @ISA = CFClient::UI::Bin::; 796our @ISA = CFClient::UI::Bin::;
… …
971 my ($self) = @_; 910 my ($self) = @_;
972 911
973 my ($w, $h ) = ($self->{w}, $self->{h}); 912 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 914
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 917
981 my $border = $self->border; 918 my $border = $self->border;
982 919
983 glColor @{ $self->{border_bg} }; 920 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 921 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 925
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 927 my $bg = $tex[0];
991 928
992 # TODO: repeat texture not scale 929 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 933 glColor @{ $self->{bg} };
997 934
998 $bg->{s} = $rep_x; 935 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 936 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 937 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 938 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 }
1002 940
1003 glDisable GL_TEXTURE_2D; 941 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 942
1007 $self->{title}->draw if $self->{title}; 943 $self->{title}->draw if $self->{title};
1008 944
1009 $self->child->draw; 945 $self->child->draw;
1010} 946}
… …
1237} 1173}
1238 1174
1239sub size_allocate { 1175sub size_allocate {
1240 my ($self, $w, $h) = @_; 1176 my ($self, $w, $h) = @_;
1241 1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1242 my $children = $self->{children}; 1180 my $children = $self->{children};
1243 1181
1244 my @h = map $_->{req_h}, @$children; 1182 my @h = map $_->{req_h}, @$children;
1245 1183
1246 my $req_h = List::Util::sum @h; 1184 my $req_h = List::Util::sum @h;
… …
1285 my ($class, %arg) = @_; 1223 my ($class, %arg) = @_;
1286 1224
1287 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1226 fg => [1, 1, 1],
1289 #font => default_font 1227 #font => default_font
1228 #text => initial text
1229 #markup => initial narkup
1230 layout => (new CFClient::Layout),
1290 fontsize => 1, 1231 fontsize => 1,
1291 text => "",
1292 align => -1, 1232 align => -1,
1293 valign => -1, 1233 valign => -1,
1294 padding => 2, 1234 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1235 can_events => 0,
1297 %arg 1236 %arg
1298 ); 1237 );
1299 1238
1300 if (exists $self->{template}) { 1239 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1240 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1241 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1242 $self->{template} = $layout;
1304 } 1243 }
1305 1244
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1245 if (exists $self->{markup}) {
1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1246 $self->set_markup (delete $self->{markup});
1247 } else {
1248 $self->set_text (delete $self->{text});
1249 }
1308 1250
1309 $self 1251 $self
1310} 1252}
1311 1253
1312sub escape { 1254sub escape {
… …
1330 my ($self, $text) = @_; 1272 my ($self, $text) = @_;
1331 1273
1332 return if $self->{text} eq "T$text"; 1274 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1275 $self->{text} = "T$text";
1334 1276
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1278 $self->{layout}->set_text ($text);
1336 1279
1337 delete $self->{texture};
1338 $self->update; 1280 $self->update;
1339 $self->check_size; 1281 $self->check_size;
1340} 1282}
1341 1283
1342sub set_markup { 1284sub set_markup {
1343 my ($self, $markup) = @_; 1285 my ($self, $markup) = @_;
1344 1286
1345 return if $self->{text} eq "M$markup"; 1287 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1288 $self->{text} = "M$markup";
1347 1289
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1293 $self->{layout}->set_markup ($markup);
1349 1294
1350 delete $self->{texture};
1351 $self->update; 1295 $self->update;
1352 $self->check_size; 1296 $self->check_size;
1353} 1297}
1354 1298
1355sub size_request { 1299sub size_request {
… …
1395 1339
1396sub _draw { 1340sub _draw {
1397 my ($self) = @_; 1341 my ($self) = @_;
1398 1342
1399 my $tex = $self->{texture} ||= do { 1343 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1345 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1346 $self->{layout}->set_width ($self->{w});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1348
1403 new_from_layout CFClient::Texture $self->{layout} 1349 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5;
1354
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5;
1358
1359 $tex
1404 }; 1360 };
1405 1361
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1362 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1364
1365 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1366 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $tex->draw_quad ($self->{ox}, $self->{oy}); 1367 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1368 } else {
1369 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1370 }
1426 1371
1427 glDisable GL_TEXTURE_2D; 1372 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1373}
1430 1374
1431############################################################################# 1375#############################################################################
1432 1376
1433package CFClient::UI::EntryBase; 1377package CFClient::UI::EntryBase;
… …
1468 $self->{layout}->set_text ("$text "); 1412 $self->{layout}->set_text ("$text ");
1469 1413
1470 $self->emit (changed => $self->{text}); 1414 $self->emit (changed => $self->{text});
1471} 1415}
1472 1416
1417sub set_text {
1418 my ($self, $text) = @_;
1419
1420 $self->{cursor} = length $text;
1421 $self->_set_text ($text);
1422 $self->check_size;
1423 $self->update;
1424}
1425
1473sub get_text { 1426sub get_text {
1474 $_[0]{text} 1427 $_[0]{text}
1475} 1428}
1476 1429
1477sub size_request { 1430sub size_request {
… …
1484 1437
1485sub size_allocate { 1438sub size_allocate {
1486 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1487 1440
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489}
1490
1491sub set_text {
1492 my ($self, $text) = @_;
1493
1494 $self->{cursor} = length $text;
1495 $self->_set_text ($text);
1496 $self->update;
1497} 1442}
1498 1443
1499sub key_down { 1444sub key_down {
1500 my ($self, $ev) = @_; 1445 my ($self, $ev) = @_;
1501 1446
… …
1689 1634
1690 if ($GRAB == $self) { 1635 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1636 $self->{fg} = $self->{active_fg};
1692 } 1637 }
1693 1638
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1641 glColor 0, 0, 0, 1;
1699 1642
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1643 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1644
1702 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1646
1705 $self->SUPER::_draw; 1647 $self->SUPER::_draw;
1706} 1648}
1707 1649
1708############################################################################# 1650#############################################################################
… …
1755 1697
1756 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1698 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1757 1699
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1701
1760 glEnable GL_BLEND; 1702 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703
1761 glEnable GL_TEXTURE_2D; 1704 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1705 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1706 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1707}
1771 1708
1772############################################################################# 1709#############################################################################
1773 1710
1774package CFClient::UI::Image; 1711package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1754 glTranslate 0, -$self->{w}, 0;
1818 1755
1819 ($w, $h) = ($h, $w); 1756 ($w, $h) = ($h, $w);
1820 } 1757 }
1821 1758
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1761
1827 $tex->draw_quad (0, 0, $w, $h); 1762 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1763
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1764 glDisable GL_TEXTURE_2D;
1831} 1765}
1832 1766
1833############################################################################# 1767#############################################################################
1834 1768
… …
2126 $page ||= 2; 2060 $page ||= 2;
2127 2061
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130 2064
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2065 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2067
2136 # draw background 2068 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2138 2070
2139 # draw handle 2071 # draw handle
2140 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2141 2073
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2074 glDisable GL_TEXTURE_2D;
2144} 2075}
2145 2076
2146############################################################################# 2077#############################################################################
2147 2078
… …
2158 fontsize => 1, 2089 fontsize => 1,
2159 can_events => 0, 2090 can_events => 0,
2160 #font => default_font 2091 #font => default_font
2161 @_, 2092 @_,
2162 2093
2163 layout => (new CFClient::Layout), 2094 layout => (new CFClient::Layout 1),
2164 par => [], 2095 par => [],
2165 height => 0, 2096 height => 0,
2166 children => [ 2097 children => [
2167 (new CFClient::UI::Empty expand => 1), 2098 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2099 (new CFClient::UI::Slider vertical => 1),
… …
2186 2117
2187 my $layout = $self->{layout}; 2118 my $layout = $self->{layout};
2188 2119
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w}); 2121 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text); 2122 $layout->set_markup ($text);
2192 2123
2193 ($layout->size)[1] 2124 ($layout->size)[1]
2194} 2125}
2195 2126
2196sub reflow { 2127sub reflow {
… …
2252 2183
2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2254 glClearColor 0, 0, 0, 0; 2185 glClearColor 0, 0, 0, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2186 glClear GL_COLOR_BUFFER_BIT;
2256 2187
2257 glEnable GL_BLEND;
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D; 2188 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261 2190
2262 my $top = int $self->{children}[1]{range}[0]; 2191 my $top = int $self->{children}[1]{range}[0];
2263 2192
… …
2272 2201
2273 for my $par (@{$self->{par}}) { 2202 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2203 my $h = $par->[0];
2275 2204
2276 if ($y0 < $y + $h && $y < $y1) { 2205 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] });
2277 $layout->set_text ($par->[2]); 2207 $layout->set_markup ($par->[2]);
2278 2208
2279 glColor @{ $par->[1] };
2280 my ($W, $H) = $layout->size; 2209 my ($W, $H) = $layout->size;
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2282 } 2211 }
2283 2212
2284 $y += $h; 2213 $y += $h;
2285 } 2214 }
2286 2215
2287 glDisable GL_TEXTURE_2D; 2216 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND;
2289 }; 2217 };
2290 }); 2218 });
2291} 2219}
2292 2220
2293sub _draw { 2221sub _draw {
2294 my ($self) = @_; 2222 my ($self) = @_;
2295 2223
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2224 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2226 glColor 1, 1, 1, 1;
2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302 glDisable GL_TEXTURE_2D; 2228 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2229
2305 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2306 2231
2307} 2232}
2308 2233
… …
2402 @_, 2327 @_,
2403 can_events => 0, 2328 can_events => 0,
2404 ) 2329 )
2405} 2330}
2406 2331
2407sub set_markup { 2332sub set_tooltip_from {
2408 my ($self, $text) = @_; 2333 my ($self, $widget) = @_;
2409 2334
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2335 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2336 markup => $widget->{tooltip},
2412 $self->add ($self->{label}); 2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8,
2339 fg => [0, 0, 0, 1],
2340 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 );
2413} 2342}
2414 2343
2415sub size_request { 2344sub size_request {
2416 my ($self) = @_; 2345 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2346
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2348
2422 ($w + 4, $h + 4) 2349 ($w + 4, $h + 4)
2423} 2350}
… …
2429} 2356}
2430 2357
2431sub _draw { 2358sub _draw {
2432 my ($self) = @_; 2359 my ($self) = @_;
2433 2360
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2361 glTranslate 0.375, 0.375;
2436 2362
2437 my ($w, $h) = @$self{qw(w h)}; 2363 my ($w, $h) = @$self{qw(w h)};
2438 2364
2439 glColor 1, 0.8, 0.4; 2365 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2376 glVertex 0 , $h;
2451 glVertex $w, $h; 2377 glVertex $w, $h;
2452 glVertex $w, 0; 2378 glVertex $w, 0;
2453 glEnd; 2379 glEnd;
2454 2380
2455 glPopMatrix; 2381 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2382 $self->SUPER::_draw;
2459} 2383}
2460 2384
2461############################################################################# 2385#############################################################################
2462 2386
… …
2485 return unless $::CONN;#d# manage and cache textures differently 2409 return unless $::CONN;#d# manage and cache textures differently
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2487 2411
2488 # TODO animation 2412 # TODO animation
2489 if ($tex) { 2413 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2414 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2416 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2418 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2419 }
2499} 2420}
2500 2421
2501############################################################################# 2422#############################################################################
2502 2423
… …
2507sub new { 2428sub new {
2508 my $class = shift; 2429 my $class = shift;
2509 2430
2510 my %args = @_; 2431 my %args = @_;
2511 2432
2512 my $item = $args{item}; 2433 my $item = delete $args{item};
2513 2434
2514 my $desc = $item->{nrof} < 2 2435 my $desc = $item->{nrof} < 2
2515 ? $item->{name} 2436 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}"; 2437 : "$item->{nrof} $item->{name_pl}";
2517 2438
… …
2546 2467
2547 1 2468 1
2548 }, 2469 },
2549 %args 2470 %args
2550 ); 2471 );
2472
2551 $self->add(new CFClient::UI::Face 2473 $self->add (new CFClient::UI::Face
2552 can_events => 0, 2474 can_events => 0,
2553 face => $item->{face}, 2475 face => $item->{face},
2554 anim => $item->{anim}, 2476 anim => $item->{anim},
2555 animspeed => $item->{animspeed}); 2477 animspeed => $item->{animspeed},
2478 );
2479
2556 $self->add(new CFClient::UI::Label 2480 $self->add (new CFClient::UI::Label
2557 can_events => 0, 2481 can_events => 0,
2558 text => $desc); 2482 text => $desc,
2483 );
2559 2484
2560 $self 2485 $self
2561} 2486}
2562 2487
2563############################################################################# 2488#############################################################################
… …
2590 for my $item (@items) { 2515 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2516 my $desc = $item->{nrof} < 2
2592 ? $item->{name} 2517 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}"; 2518 : "$item->{nrof} $item->{name_pl}";
2594 2519
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2596 } 2521 }
2597 2522
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599} 2524}
2600 2525
… …
2675 } 2600 }
2676} 2601}
2677 2602
2678############################################################################# 2603#############################################################################
2679 2604
2605package CFClient::UI::Statusbox;
2606
2607our @ISA = CFClient::UI::VBox::;
2608
2609sub reorder {
2610 my ($self) = @_;
2611 my $NOW = time;
2612
2613 while (my ($k, $v) = each %{ $self->{item} }) {
2614 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2615 }
2616
2617 my @widgets;
2618
2619 my @items = sort {
2620 $a->{pri} <=> $b->{pri}
2621 or $b->{id} <=> $a->{id}
2622 } values %{ $self->{item} };
2623
2624 my $count = 10 + 1;
2625 for my $item (@items) {
2626 last unless --$count;
2627
2628 push @widgets, $item->{label} ||= do {
2629 # TODO: doesn't handle markup well (read as: at all)
2630 my $short = $item->{count} > 1
2631 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text};
2633
2634 for ($short) {
2635 s/^\s+//;
2636 s/\012.*/…/s;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 }
2640
2641 new CFClient::UI::Label
2642 markup => $short,
2643 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize},
2647 color => $item->{color},
2648 can_events => 1,
2649 can_hover => 1
2650 };
2651 }
2652
2653 $self->clear;
2654 $self->SUPER::add (reverse @widgets);
2655}
2656
2657sub add {
2658 my ($self, $text, %arg) = @_;
2659
2660 my $timeout = time + ((delete $arg{timeout}) || 60);
2661
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663
2664 if (my $item = $self->{item}{$group}) {
2665 if ($item->{text} eq $text) {
2666 $item->{count}++;
2667 } else {
2668 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text;
2670 }
2671 $item->{timeout} = $timeout;
2672 delete $item->{label};
2673 } else {
2674 $self->{item}{$group} = {
2675 id => ++$self->{id},
2676 text => $text,
2677 timeout => $timeout,
2678 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0,
2682 count => 1,
2683 %arg,
2684 };
2685 }
2686
2687 $self->reorder;
2688}
2689
2690#############################################################################
2691
2680package CFClient::UI::Root; 2692package CFClient::UI::Root;
2681 2693
2682our @ISA = CFClient::UI::Container::; 2694our @ISA = CFClient::UI::Container::;
2683 2695
2684use CFClient::OpenGL; 2696use CFClient::OpenGL;
2685 2697
2698sub new {
2699 my $class = shift;
2700
2701 $class->SUPER::new (
2702 @_,
2703 )
2704}
2705
2706sub configure {
2707 my ($self, $x, $y, $w, $h) = @_;
2708
2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2712
2686sub check_size { 2713sub check_size {
2687 my ($self) = @_; 2714 my ($self) = @_;
2688 2715
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2716 $self->size_allocate ($self->{w}, $self->{h})
2717 if $self->{w};
2690} 2718}
2691 2719
2692sub size_request { 2720sub size_request {
2693 my ($self) = @_; 2721 my ($self) = @_;
2694 2722
… …
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h}; 2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h}; 2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 } 2742 }
2715 } 2743 }
2716 2744
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725
2726 for my $child ($self->children) { 2745 for my $child ($self->children) {
2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728 2747
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2748 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2731 $child->configure ($X, $Y, $W, $H); 2750 $child->configure ($X, $Y, $W, $H);
2732 } 2751 }
2733}
2734 2752
2735sub _topleft { 2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755}
2756
2757sub coord2local {
2736 my ($self, $x, $y) = @_; 2758 my ($self, $x, $y) = @_;
2737 2759
2738 ($x, $y) 2760 ($x, $y)
2739} 2761}
2740 2762
2763sub coord2global {
2764 my ($self, $x, $y) = @_;
2765
2766 ($x, $y)
2767}
2768
2741sub update { 2769sub update {
2742 my ($self) = @_; 2770 my ($self) = @_;
2743 2771
2744 $self->check_size; 2772 $self->check_size;
2745 ::refresh (); 2773 $::WANT_REFRESH++;
2746} 2774}
2747 2775
2748sub add { 2776sub add {
2749 my ($self, $child) = @_; 2777 my ($self, $child) = @_;
2750 2778
2751 # integerize window positions 2779 # integerise window positions
2752 $child->{x} = int $child->{x}; 2780 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 2781 $child->{y} = int $child->{y};
2754 2782
2755 $self->SUPER::add ($child); 2783 $self->SUPER::add ($child);
2756} 2784}
… …
2759 my ($self, $id, $cb) = @_; 2787 my ($self, $id, $cb) = @_;
2760 2788
2761 $self->{refresh_hook}{$id} = $cb; 2789 $self->{refresh_hook}{$id} = $cb;
2762} 2790}
2763 2791
2764sub draw { 2792sub draw {
2765 my ($self) = @_; 2793 my ($self) = @_;
2766 2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839
2767 while (my $rcb = delete $self->{refresh_hook}) { 2840 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 2841 $_->()
2842 for values %{delete $self->{refresh_hook}};
2769 } 2843 }
2770 2844
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2845 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 2847 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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