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.188 by root, Mon May 8 21:16:09 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
… …
542 $self->{children} = [ 511 $self->{children} = [
543 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
544 @{$self->{children}}, @widgets 513 @{$self->{children}}, @widgets
545 ]; 514 ];
546 515
547 $_->check_size 516 $self->check_size (1);
548 for @widgets;
549
550 $self->update; 517 $self->update;
551} 518}
552 519
553sub children { 520sub children {
554 @{ $_[0]{children} } 521 @{ $_[0]{children} }
… …
702 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
703 670
704 my $tex = $self->{texture} 671 my $tex = $self->{texture}
705 or return; 672 or return;
706 673
707 glEnable GL_BLEND;
708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1; 676 glColor 0, 0, 0, 1;
712 677
713 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714 679
715 glDisable GL_BLEND;
716 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
717} 681}
718 682
719############################################################################# 683#############################################################################
720 684
… …
744 $self->{view_y} = int $y; 708 $self->{view_y} = int $y;
745 709
746 $self->update; 710 $self->update;
747} 711}
748 712
749# 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
750sub _topleft { 714sub coord2local {
751 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
752 716
753 $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)
754} 727}
755 728
756sub find_widget { 729sub find_widget {
757 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
758 731
… …
814 787
815our @ISA = CFClient::UI::Bin::; 788our @ISA = CFClient::UI::Bin::;
816 789
817use CFClient::OpenGL; 790use CFClient::OpenGL;
818 791
819sub new {
820 my $class = shift;
821
822 my $self = $class->SUPER::new (
823 bg => [1, 1, 1, 1],
824 border_bg => [1, 1, 1, 1],
825 border => 0.8,
826 @_
827 );
828
829 $self
830}
831
832sub _draw {
833 my ($self) = @_;
834
835 my ($w, $h) = ($self->{w}, $self->{h});
836
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841
842# glBegin GL_QUADS;
843# glColor 0, 0, 0, 0;
844# glVertex 0 , 0;
845# glVertex 0 , $h;
846# glVertex $w, $h;
847# glVertex $w, 0;
848# glEnd;
849
850
851 $self->child->draw;
852 glDisable GL_BLEND;
853 glDisable GL_TEXTURE_2D;
854}
855
856############################################################################# 792#############################################################################
857 793
858package CFClient::UI::FancyFrame; 794package CFClient::UI::FancyFrame;
859 795
860our @ISA = CFClient::UI::Bin::; 796our @ISA = CFClient::UI::Bin::;
… …
974 my ($self) = @_; 910 my ($self) = @_;
975 911
976 my ($w, $h ) = ($self->{w}, $self->{h}); 912 my ($w, $h ) = ($self->{w}, $self->{h});
977 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
978 914
979 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 917
984 my $border = $self->border; 918 my $border = $self->border;
985 919
986 glColor @{ $self->{border_bg} }; 920 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad (0, 0, $w, $border); 921 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad (0, $border, $border, $ch); 922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad (0, $h - $border, $w, $border); 924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
991 925
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 927 my $bg = $tex[0];
994 928
995 # TODO: repeat texture not scale 929 # TODO: repeat texture not scale
… …
999 glColor @{ $self->{bg} }; 933 glColor @{ $self->{bg} };
1000 934
1001 $bg->{s} = $rep_x; 935 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y; 936 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1; 937 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad ($border, $border, $cw, $ch); 938 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 }
1005 940
1006 glDisable GL_TEXTURE_2D; 941 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND;
1008 }
1009 942
1010 $self->{title}->draw if $self->{title}; 943 $self->{title}->draw if $self->{title};
1011 944
1012 $self->child->draw; 945 $self->child->draw;
1013} 946}
… …
1240} 1173}
1241 1174
1242sub size_allocate { 1175sub size_allocate {
1243 my ($self, $w, $h) = @_; 1176 my ($self, $w, $h) = @_;
1244 1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1245 my $children = $self->{children}; 1180 my $children = $self->{children};
1246 1181
1247 my @h = map $_->{req_h}, @$children; 1182 my @h = map $_->{req_h}, @$children;
1248 1183
1249 my $req_h = List::Util::sum @h; 1184 my $req_h = List::Util::sum @h;
… …
1288 my ($class, %arg) = @_; 1223 my ($class, %arg) = @_;
1289 1224
1290 my $self = $class->SUPER::new ( 1225 my $self = $class->SUPER::new (
1291 fg => [1, 1, 1], 1226 fg => [1, 1, 1],
1292 #font => default_font 1227 #font => default_font
1228 #text => initial text
1229 #markup => initial narkup
1230 layout => (new CFClient::Layout),
1293 fontsize => 1, 1231 fontsize => 1,
1294 text => "",
1295 align => -1, 1232 align => -1,
1296 valign => -1, 1233 valign => -1,
1297 padding => 2, 1234 padding => 2,
1298 layout => new CFClient::Layout,
1299 can_events => 0, 1235 can_events => 0,
1300 %arg 1236 %arg
1301 ); 1237 );
1302 1238
1303 if (exists $self->{template}) { 1239 if (exists $self->{template}) {
1304 my $layout = new CFClient::Layout; 1240 my $layout = new CFClient::Layout;
1305 $layout->set_text (delete $self->{template}); 1241 $layout->set_text (delete $self->{template});
1306 $self->{template} = $layout; 1242 $self->{template} = $layout;
1307 } 1243 }
1308 1244
1309 $self->set_text (delete $self->{text}) if exists $self->{text}; 1245 if (exists $self->{markup}) {
1310 $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 }
1311 1250
1312 $self 1251 $self
1313} 1252}
1314 1253
1315sub escape { 1254sub escape {
… …
1333 my ($self, $text) = @_; 1272 my ($self, $text) = @_;
1334 1273
1335 return if $self->{text} eq "T$text"; 1274 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text"; 1275 $self->{text} = "T$text";
1337 1276
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338 $self->{layout}->set_text ($text); 1278 $self->{layout}->set_text ($text);
1339 1279
1340 delete $self->{texture};
1341 $self->update; 1280 $self->update;
1342 $self->check_size; 1281 $self->check_size;
1343} 1282}
1344 1283
1345sub set_markup { 1284sub set_markup {
1346 my ($self, $markup) = @_; 1285 my ($self, $markup) = @_;
1347 1286
1348 return if $self->{text} eq "M$markup"; 1287 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup"; 1288 $self->{text} = "M$markup";
1350 1289
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291
1292 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351 $self->{layout}->set_markup ($markup); 1293 $self->{layout}->set_markup ($markup);
1352 1294
1353 delete $self->{texture};
1354 $self->update; 1295 $self->update;
1355 $self->check_size; 1296 $self->check_size;
1356} 1297}
1357 1298
1358sub size_request { 1299sub size_request {
… …
1398 1339
1399sub _draw { 1340sub _draw {
1400 my ($self) = @_; 1341 my ($self) = @_;
1401 1342
1402 my $tex = $self->{texture} ||= do { 1343 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1345 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $self->{layout}->set_width ($self->{w}); 1346 $self->{layout}->set_width ($self->{w});
1405 $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
1406 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
1407 }; 1360 };
1408 1361
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1362 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1364
1365 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1366 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $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 }
1429 1371
1430 glDisable GL_TEXTURE_2D; 1372 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1373}
1433 1374
1434############################################################################# 1375#############################################################################
1435 1376
1436package CFClient::UI::EntryBase; 1377package CFClient::UI::EntryBase;
… …
1471 $self->{layout}->set_text ("$text "); 1412 $self->{layout}->set_text ("$text ");
1472 1413
1473 $self->emit (changed => $self->{text}); 1414 $self->emit (changed => $self->{text});
1474} 1415}
1475 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
1476sub get_text { 1426sub get_text {
1477 $_[0]{text} 1427 $_[0]{text}
1478} 1428}
1479 1429
1480sub size_request { 1430sub size_request {
… …
1487 1437
1488sub size_allocate { 1438sub size_allocate {
1489 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1490 1440
1491 $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
1492}
1493
1494sub set_text {
1495 my ($self, $text) = @_;
1496
1497 $self->{cursor} = length $text;
1498 $self->_set_text ($text);
1499 $self->update;
1500} 1442}
1501 1443
1502sub key_down { 1444sub key_down {
1503 my ($self, $ev) = @_; 1445 my ($self, $ev) = @_;
1504 1446
… …
1692 1634
1693 if ($GRAB == $self) { 1635 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1636 $self->{fg} = $self->{active_fg};
1695 } 1637 }
1696 1638
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1641 glColor 0, 0, 0, 1;
1702 1642
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1643 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1644
1705 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1646
1708 $self->SUPER::_draw; 1647 $self->SUPER::_draw;
1709} 1648}
1710 1649
1711############################################################################# 1650#############################################################################
… …
1758 1697
1759 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;
1760 1699
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1701
1763 glEnable GL_BLEND; 1702 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703
1764 glEnable GL_TEXTURE_2D; 1704 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1705 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1706 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1707}
1774 1708
1775############################################################################# 1709#############################################################################
1776 1710
1777package CFClient::UI::Image; 1711package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1754 glTranslate 0, -$self->{w}, 0;
1821 1755
1822 ($w, $h) = ($h, $w); 1756 ($w, $h) = ($h, $w);
1823 } 1757 }
1824 1758
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1759 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1761
1830 $tex->draw_quad (0, 0, $w, $h); 1762 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1763
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1764 glDisable GL_TEXTURE_2D;
1834} 1765}
1835 1766
1836############################################################################# 1767#############################################################################
1837 1768
… …
2129 $page ||= 2; 2060 $page ||= 2;
2130 2061
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133 2064
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2065 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2067
2139 # draw background 2068 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2141 2070
2142 # draw handle 2071 # draw handle
2143 $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);
2144 2073
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2074 glDisable GL_TEXTURE_2D;
2147} 2075}
2148 2076
2149############################################################################# 2077#############################################################################
2150 2078
… …
2161 fontsize => 1, 2089 fontsize => 1,
2162 can_events => 0, 2090 can_events => 0,
2163 #font => default_font 2091 #font => default_font
2164 @_, 2092 @_,
2165 2093
2166 layout => (new CFClient::Layout), 2094 layout => (new CFClient::Layout 1),
2167 par => [], 2095 par => [],
2168 height => 0, 2096 height => 0,
2169 children => [ 2097 children => [
2170 (new CFClient::UI::Empty expand => 1), 2098 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2099 (new CFClient::UI::Slider vertical => 1),
… …
2189 2117
2190 my $layout = $self->{layout}; 2118 my $layout = $self->{layout};
2191 2119
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w}); 2121 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text); 2122 $layout->set_markup ($text);
2195 2123
2196 ($layout->size)[1] 2124 ($layout->size)[1]
2197} 2125}
2198 2126
2199sub reflow { 2127sub reflow {
… …
2255 2183
2256 $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 {
2257 glClearColor 0, 0, 0, 0; 2185 glClearColor 0, 0, 0, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2186 glClear GL_COLOR_BUFFER_BIT;
2259 2187
2260 glEnable GL_BLEND;
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D; 2188 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264 2190
2265 my $top = int $self->{children}[1]{range}[0]; 2191 my $top = int $self->{children}[1]{range}[0];
2266 2192
… …
2275 2201
2276 for my $par (@{$self->{par}}) { 2202 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2203 my $h = $par->[0];
2278 2204
2279 if ($y0 < $y + $h && $y < $y1) { 2205 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] });
2280 $layout->set_text ($par->[2]); 2207 $layout->set_markup ($par->[2]);
2281 2208
2282 glColor @{ $par->[1] };
2283 my ($W, $H) = $layout->size; 2209 my ($W, $H) = $layout->size;
2284 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);
2285 } 2211 }
2286 2212
2287 $y += $h; 2213 $y += $h;
2288 } 2214 }
2289 2215
2290 glDisable GL_TEXTURE_2D; 2216 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND;
2292 }; 2217 };
2293 }); 2218 });
2294} 2219}
2295 2220
2296sub _draw { 2221sub _draw {
2297 my ($self) = @_; 2222 my ($self) = @_;
2298 2223
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2224 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2226 glColor 1, 1, 1, 1;
2304 $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});
2305 glDisable GL_TEXTURE_2D; 2228 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2229
2308 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2309 2231
2310} 2232}
2311 2233
… …
2405 @_, 2327 @_,
2406 can_events => 0, 2328 can_events => 0,
2407 ) 2329 )
2408} 2330}
2409 2331
2410sub set_markup { 2332sub set_tooltip_from {
2411 my ($self, $text) = @_; 2333 my ($self, $widget) = @_;
2412 2334
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2335 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2336 markup => $widget->{tooltip},
2415 $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 );
2416} 2342}
2417 2343
2418sub size_request { 2344sub size_request {
2419 my ($self) = @_; 2345 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2346
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2347 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2348
2425 ($w + 4, $h + 4) 2349 ($w + 4, $h + 4)
2426} 2350}
… …
2432} 2356}
2433 2357
2434sub _draw { 2358sub _draw {
2435 my ($self) = @_; 2359 my ($self) = @_;
2436 2360
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2361 glTranslate 0.375, 0.375;
2439 2362
2440 my ($w, $h) = @$self{qw(w h)}; 2363 my ($w, $h) = @$self{qw(w h)};
2441 2364
2442 glColor 1, 0.8, 0.4; 2365 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2376 glVertex 0 , $h;
2454 glVertex $w, $h; 2377 glVertex $w, $h;
2455 glVertex $w, 0; 2378 glVertex $w, 0;
2456 glEnd; 2379 glEnd;
2457 2380
2458 glPopMatrix; 2381 glTranslate 2 - 0.375, 2 - 0.375;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2382 $self->SUPER::_draw;
2462} 2383}
2463 2384
2464############################################################################# 2385#############################################################################
2465 2386
… …
2488 return unless $::CONN;#d# manage and cache textures differently 2409 return unless $::CONN;#d# manage and cache textures differently
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2490 2411
2491 # TODO animation 2412 # TODO animation
2492 if ($tex) { 2413 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D; 2414 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1; 2416 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D; 2418 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 } 2419 }
2502} 2420}
2503 2421
2504############################################################################# 2422#############################################################################
2505 2423
… …
2510sub new { 2428sub new {
2511 my $class = shift; 2429 my $class = shift;
2512 2430
2513 my %args = @_; 2431 my %args = @_;
2514 2432
2515 my $item = $args{item}; 2433 my $item = delete $args{item};
2516 2434
2517 my $desc = $item->{nrof} < 2 2435 my $desc = $item->{nrof} < 2
2518 ? $item->{name} 2436 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}"; 2437 : "$item->{nrof} $item->{name_pl}";
2520 2438
… …
2549 2467
2550 1 2468 1
2551 }, 2469 },
2552 %args 2470 %args
2553 ); 2471 );
2472
2554 $self->add(new CFClient::UI::Face 2473 $self->add (new CFClient::UI::Face
2555 can_events => 0, 2474 can_events => 0,
2556 face => $item->{face}, 2475 face => $item->{face},
2557 anim => $item->{anim}, 2476 anim => $item->{anim},
2558 animspeed => $item->{animspeed}); 2477 animspeed => $item->{animspeed},
2478 );
2479
2559 $self->add(new CFClient::UI::Label 2480 $self->add (new CFClient::UI::Label
2560 can_events => 0, 2481 can_events => 0,
2561 text => $desc); 2482 text => $desc,
2483 );
2562 2484
2563 $self 2485 $self
2564} 2486}
2565 2487
2566############################################################################# 2488#############################################################################
… …
2593 for my $item (@items) { 2515 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2 2516 my $desc = $item->{nrof} < 2
2595 ? $item->{name} 2517 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}"; 2518 : "$item->{nrof} $item->{name_pl}";
2597 2519
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2599 } 2521 }
2600 2522
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602} 2524}
2603 2525
… …
2678 } 2600 }
2679} 2601}
2680 2602
2681############################################################################# 2603#############################################################################
2682 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
2683package CFClient::UI::Root; 2692package CFClient::UI::Root;
2684 2693
2685our @ISA = CFClient::UI::Container::; 2694our @ISA = CFClient::UI::Container::;
2686 2695
2687use CFClient::OpenGL; 2696use CFClient::OpenGL;
2688 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
2689sub check_size { 2713sub check_size {
2690 my ($self) = @_; 2714 my ($self) = @_;
2691 2715
2692 $self->configure (0, 0, $self->{w}, $self->{h}); 2716 $self->size_allocate ($self->{w}, $self->{h})
2717 if $self->{w};
2693} 2718}
2694 2719
2695sub size_request { 2720sub size_request {
2696 my ($self) = @_; 2721 my ($self) = @_;
2697 2722
… …
2715 $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};
2716 $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};
2717 } 2742 }
2718 } 2743 }
2719 2744
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2722}
2723
2724sub configure {
2725 my ($self, $x, $y, $w, $h) = @_;
2726
2727 $self->SUPER::configure ($x, $y, $w, $h);
2728
2729 for my $child ($self->children) { 2745 for my $child ($self->children) {
2730 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)};
2731 2747
2732 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2748 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2734 $child->configure ($X, $Y, $W, $H); 2750 $child->configure ($X, $Y, $W, $H);
2735 } 2751 }
2736}
2737 2752
2738sub _topleft { 2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755}
2756
2757sub coord2local {
2739 my ($self, $x, $y) = @_; 2758 my ($self, $x, $y) = @_;
2740 2759
2741 ($x, $y) 2760 ($x, $y)
2742} 2761}
2743 2762
2763sub coord2global {
2764 my ($self, $x, $y) = @_;
2765
2766 ($x, $y)
2767}
2768
2744sub update { 2769sub update {
2745 my ($self) = @_; 2770 my ($self) = @_;
2746 2771
2747 $self->check_size; 2772 $self->check_size;
2748 ::refresh (); 2773 $::WANT_REFRESH++;
2749} 2774}
2750 2775
2751sub add { 2776sub add {
2752 my ($self, $child) = @_; 2777 my ($self, $child) = @_;
2753 2778
2754 # integerize window positions 2779 # integerise window positions
2755 $child->{x} = int $child->{x}; 2780 $child->{x} = int $child->{x};
2756 $child->{y} = int $child->{y}; 2781 $child->{y} = int $child->{y};
2757 2782
2758 $self->SUPER::add ($child); 2783 $self->SUPER::add ($child);
2759} 2784}
… …
2762 my ($self, $id, $cb) = @_; 2787 my ($self, $id, $cb) = @_;
2763 2788
2764 $self->{refresh_hook}{$id} = $cb; 2789 $self->{refresh_hook}{$id} = $cb;
2765} 2790}
2766 2791
2767sub draw { 2792sub draw {
2768 my ($self) = @_; 2793 my ($self) = @_;
2769 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
2770 while (my $rcb = delete $self->{refresh_hook}) { 2840 while ($self->{refresh_hook}) {
2771 $_->() for values %$rcb; 2841 $_->()
2842 for values %{delete $self->{refresh_hook}};
2772 } 2843 }
2773 2844
2774 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2845 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776 glClear GL_COLOR_BUFFER_BIT; 2847 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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