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.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.199 by root, Fri May 12 15:45:42 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
… …
255 my ($self) = @_; 252 my ($self) = @_;
256 253
257 $_->reconfigure 254 $_->reconfigure
258 for $self->children; 255 for $self->children;
259 256
260 $_->check_size; 257 $self->check_size (1);
258 $self->update;
261} 259}
262 260
263sub set_max_size { 261sub set_max_size {
264 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
265 263
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
268}
269
270# return top left coordinates
271sub _topleft {
272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
276
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
278} 266}
279 267
280# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
281sub coord2local { 269sub coord2local {
282 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
283 271
284 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 273}
287 274
288# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
289sub coord2global { 276sub coord2global {
290 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
291 278
292 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 280}
295 281
296sub focus_in { 282sub focus_in {
297 my ($self) = @_; 283 my ($self) = @_;
298 284
… …
396 382
397sub set_parent { 383sub set_parent {
398 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
399 385
400 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
401} 391}
402 392
403sub check_size { 393sub check_size {
404 my ($self) = @_; 394 my ($self, $forced) = @_;
405 395
406 $self->{parent} 396 $self->{force_alloc} = 1 if $forced;
407 or return 1; 397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427} 398}
428 399
429sub update { 400sub update {
430 my ($self) = @_; 401 my ($self) = @_;
431 402
… …
528 499
529 $self 500 $self
530} 501}
531 502
532sub add { 503sub add {
533 my ($self, $child) = @_; 504 my ($self, @widgets) = @_;
534 505
535 $child->set_parent ($self); 506 $_->set_parent ($self)
507 for @widgets;
536 508
537 use sort 'stable'; 509 use sort 'stable';
538 510
539 $self->{children} = [ 511 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 512 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 513 @{$self->{children}}, @widgets
542 ]; 514 ];
543 515
544 $child->check_size; 516 $self->check_size (1);
545 $self->update; 517 $self->update;
546} 518}
547 519
548sub children { 520sub children {
549 @{ $_[0]{children} } 521 @{ $_[0]{children} }
… …
656} 628}
657 629
658sub update { 630sub update {
659 my ($self) = @_; 631 my ($self) = @_;
660 632
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 633 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 634 $self->SUPER::update;
663} 635}
664 636
665sub size_allocate { 637sub size_allocate {
666 my ($self, $w, $h) = @_; 638 my ($self, $w, $h) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 669 my ($w, $h) = ($self->w, $self->h);
698 670
699 my $tex = $self->{texture} 671 my $tex = $self->{texture}
700 or return; 672 or return;
701 673
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 676 glColor 0, 0, 0, 1;
707 677
708 $tex->draw_quad (0, 0, $w, $h); 678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 679
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 680 glDisable GL_TEXTURE_2D;
712} 681}
713 682
714############################################################################# 683#############################################################################
715 684
… …
739 $self->{view_y} = int $y; 708 $self->{view_y} = int $y;
740 709
741 $self->update; 710 $self->update;
742} 711}
743 712
744# 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
745sub _topleft { 714sub coord2local {
746 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
747 716
748 $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)
749} 727}
750 728
751sub find_widget { 729sub find_widget {
752 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
753 731
… …
798 $self->add ($self->{slider}); 776 $self->add ($self->{slider});
799 777
800 $self 778 $self
801} 779}
802 780
803#TODO# update range on size_allocate depeneing on child 781#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll 782# update viewport offset on scroll
805 783
806############################################################################# 784#############################################################################
807 785
808package CFClient::UI::Frame; 786package CFClient::UI::Frame;
… …
812use CFClient::OpenGL; 790use CFClient::OpenGL;
813 791
814sub new { 792sub new {
815 my $class = shift; 793 my $class = shift;
816 794
817 my $self = $class->SUPER::new ( 795 $class->SUPER::new (
818 bg => [1, 1, 1, 1], 796 bg => undef,
819 border_bg => [1, 1, 1, 1],
820 border => 0.8,
821 @_ 797 @_,
822 ); 798 )
823
824 $self
825} 799}
826 800
827sub _draw { 801sub _draw {
828 my ($self) = @_; 802 my ($self) = @_;
829 803
830 my ($w, $h) = ($self->{w}, $self->{h}); 804 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)};
831 806
832 glEnable GL_BLEND; 807 glEnable GL_BLEND;
833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
834 glEnable GL_TEXTURE_2D; 809 glColor @{ $self->{bg} };
835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836 810
837# glBegin GL_QUADS; 811 glBegin GL_QUADS;
838# glColor 0, 0, 0, 0;
839# glVertex 0 , 0; 812 glVertex 0 , 0;
840# glVertex 0 , $h; 813 glVertex 0 , $h;
841# glVertex $w, $h; 814 glVertex $w, $h;
842# glVertex $w, 0; 815 glVertex $w, 0;
843# glEnd; 816 glEnd;
844 817
845
846 $self->child->draw;
847 glDisable GL_BLEND; 818 glDisable GL_BLEND;
848 glDisable GL_TEXTURE_2D; 819 }
820
821 $self->SUPER::_draw;
849} 822}
850 823
851############################################################################# 824#############################################################################
852 825
853package CFClient::UI::FancyFrame; 826package CFClient::UI::FancyFrame;
… …
969 my ($self) = @_; 942 my ($self) = @_;
970 943
971 my ($w, $h ) = ($self->{w}, $self->{h}); 944 my ($w, $h ) = ($self->{w}, $self->{h});
972 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
973 946
974 glEnable GL_BLEND;
975 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
976 glEnable GL_TEXTURE_2D; 947 glEnable GL_TEXTURE_2D;
977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
978 949
979 my $border = $self->border; 950 my $border = $self->border;
980 951
981 glColor @{ $self->{border_bg} }; 952 glColor @{ $self->{border_bg} };
982 $tex[1]->draw_quad (0, 0, $w, $border); 953 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
983 $tex[3]->draw_quad (0, $border, $border, $ch); 954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
985 $tex[4]->draw_quad (0, $h - $border, $w, $border); 956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
986 957
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
988 my $bg = $tex[0]; 959 my $bg = $tex[0];
989 960
990 # TODO: repeat texture not scale 961 # TODO: repeat texture not scale
… …
994 glColor @{ $self->{bg} }; 965 glColor @{ $self->{bg} };
995 966
996 $bg->{s} = $rep_x; 967 $bg->{s} = $rep_x;
997 $bg->{t} = $rep_y; 968 $bg->{t} = $rep_y;
998 $bg->{wrap_mode} = 1; 969 $bg->{wrap_mode} = 1;
999 $bg->draw_quad ($border, $border, $cw, $ch); 970 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 }
1000 972
1001 glDisable GL_TEXTURE_2D; 973 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003 }
1004 974
1005 $self->{title}->draw if $self->{title}; 975 $self->{title}->draw if $self->{title};
1006 976
1007 $self->child->draw; 977 $self->child->draw;
1008} 978}
… …
1235} 1205}
1236 1206
1237sub size_allocate { 1207sub size_allocate {
1238 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1239 1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1240 my $children = $self->{children}; 1212 my $children = $self->{children};
1241 1213
1242 my @h = map $_->{req_h}, @$children; 1214 my @h = map $_->{req_h}, @$children;
1243 1215
1244 my $req_h = List::Util::sum @h; 1216 my $req_h = List::Util::sum @h;
… …
1283 my ($class, %arg) = @_; 1255 my ($class, %arg) = @_;
1284 1256
1285 my $self = $class->SUPER::new ( 1257 my $self = $class->SUPER::new (
1286 fg => [1, 1, 1], 1258 fg => [1, 1, 1],
1287 #font => default_font 1259 #font => default_font
1260 #text => initial text
1261 #markup => initial narkup
1262 layout => (new CFClient::Layout),
1288 fontsize => 1, 1263 fontsize => 1,
1289 text => "",
1290 align => -1, 1264 align => -1,
1291 valign => -1, 1265 valign => -1,
1292 padding => 2, 1266 padding => 2,
1293 layout => new CFClient::Layout,
1294 can_events => 0, 1267 can_events => 0,
1295 %arg 1268 %arg
1296 ); 1269 );
1297 1270
1298 if (exists $self->{template}) { 1271 if (exists $self->{template}) {
1299 my $layout = new CFClient::Layout; 1272 my $layout = new CFClient::Layout;
1300 $layout->set_text (delete $self->{template}); 1273 $layout->set_text (delete $self->{template});
1301 $self->{template} = $layout; 1274 $self->{template} = $layout;
1302 } 1275 }
1303 1276
1304 $self->set_text (delete $self->{text}) if exists $self->{text}; 1277 if (exists $self->{markup}) {
1305 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1278 $self->set_markup (delete $self->{markup});
1279 } else {
1280 $self->set_text (delete $self->{text});
1281 }
1306 1282
1307 $self 1283 $self
1308} 1284}
1309 1285
1310sub escape { 1286sub escape {
… …
1322 1298
1323 delete $self->{texture}; 1299 delete $self->{texture};
1324 $self->SUPER::update; 1300 $self->SUPER::update;
1325} 1301}
1326 1302
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1333sub set_text { 1303sub set_text {
1334 my ($self, $text) = @_; 1304 my ($self, $text) = @_;
1335 1305
1336 return if $self->{text} eq "T$text"; 1306 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text"; 1307 $self->{text} = "T$text";
1338 1308
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1339 $self->{layout}->set_text ($text); 1310 $self->{layout}->set_text ($text);
1340 1311
1341 delete $self->{texture};
1342 $self->update; 1312 $self->update;
1343 $self->check_size; 1313 $self->check_size;
1344} 1314}
1345 1315
1346sub set_markup { 1316sub set_markup {
1347 my ($self, $markup) = @_; 1317 my ($self, $markup) = @_;
1348 1318
1349 return if $self->{text} eq "M$markup"; 1319 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup"; 1320 $self->{text} = "M$markup";
1351 1321
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323
1324 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1352 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1353 1326
1354 delete $self->{texture};
1355 $self->update; 1327 $self->update;
1356 $self->check_size; 1328 $self->check_size;
1357} 1329}
1358 1330
1359sub size_request { 1331sub size_request {
… …
1390sub set_fontsize { 1362sub set_fontsize {
1391 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1392 1364
1393 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1394 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1395 $self->check_size; 1369 $self->check_size;
1396 $self->update;
1397} 1370}
1398 1371
1399sub _draw { 1372sub _draw {
1400 my ($self) = @_; 1373 my ($self) = @_;
1401 1374
1402 my $tex = $self->{texture} ||= do { 1375 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1377 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $self->{layout}->set_width ($self->{w}); 1378 $self->{layout}->set_width ($self->{w});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1380
1406 new_from_layout CFClient::Texture $self->{layout} 1381 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1407 }; 1392 };
1408 1393
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1394 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1396
1397 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1398 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}); 1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1400 } else {
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1402 }
1429 1403
1430 glDisable GL_TEXTURE_2D; 1404 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1405}
1433 1406
1434############################################################################# 1407#############################################################################
1435 1408
1436package CFClient::UI::EntryBase; 1409package CFClient::UI::EntryBase;
… …
1471 $self->{layout}->set_text ("$text "); 1444 $self->{layout}->set_text ("$text ");
1472 1445
1473 $self->emit (changed => $self->{text}); 1446 $self->emit (changed => $self->{text});
1474} 1447}
1475 1448
1449sub set_text {
1450 my ($self, $text) = @_;
1451
1452 $self->{cursor} = length $text;
1453 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456}
1457
1476sub get_text { 1458sub get_text {
1477 $_[0]{text} 1459 $_[0]{text}
1478} 1460}
1479 1461
1480sub size_request { 1462sub size_request {
… …
1487 1469
1488sub size_allocate { 1470sub size_allocate {
1489 my ($self, $w, $h) = @_; 1471 my ($self, $w, $h) = @_;
1490 1472
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1473 $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} 1474}
1501 1475
1502sub key_down { 1476sub key_down {
1503 my ($self, $ev) = @_; 1477 my ($self, $ev) = @_;
1504 1478
… …
1692 1666
1693 if ($GRAB == $self) { 1667 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1668 $self->{fg} = $self->{active_fg};
1695 } 1669 }
1696 1670
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1671 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1673 glColor 0, 0, 0, 1;
1702 1674
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1675 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1676
1705 glDisable GL_TEXTURE_2D; 1677 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1678
1708 $self->SUPER::_draw; 1679 $self->SUPER::_draw;
1709} 1680}
1710 1681
1711############################################################################# 1682#############################################################################
… …
1758 1729
1759 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760 1731
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1733
1763 glEnable GL_BLEND; 1734 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735
1764 glEnable GL_TEXTURE_2D; 1736 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); 1737 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1738 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1739}
1774 1740
1775############################################################################# 1741#############################################################################
1776 1742
1777package CFClient::UI::Image; 1743package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1786 glTranslate 0, -$self->{w}, 0;
1821 1787
1822 ($w, $h) = ($h, $w); 1788 ($w, $h) = ($h, $w);
1823 } 1789 }
1824 1790
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1793
1830 $tex->draw_quad (0, 0, $w, $h); 1794 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1795
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1796 glDisable GL_TEXTURE_2D;
1834} 1797}
1835 1798
1836############################################################################# 1799#############################################################################
1837 1800
… …
2129 $page ||= 2; 2092 $page ||= 2;
2130 2093
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133 2096
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2097 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2099
2139 # draw background 2100 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
2141 2102
2142 # draw handle 2103 # draw handle
2143 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
2144 2105
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2106 glDisable GL_TEXTURE_2D;
2147} 2107}
2148 2108
2149############################################################################# 2109#############################################################################
2150 2110
… …
2161 fontsize => 1, 2121 fontsize => 1,
2162 can_events => 0, 2122 can_events => 0,
2163 #font => default_font 2123 #font => default_font
2164 @_, 2124 @_,
2165 2125
2166 layout => (new CFClient::Layout), 2126 layout => (new CFClient::Layout 1),
2167 par => [], 2127 par => [],
2168 height => 0, 2128 height => 0,
2169 children => [ 2129 children => [
2170 (new CFClient::UI::Empty expand => 1), 2130 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2131 (new CFClient::UI::Slider vertical => 1),
… …
2189 2149
2190 my $layout = $self->{layout}; 2150 my $layout = $self->{layout};
2191 2151
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w}); 2153 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text); 2154 $layout->set_markup ($text);
2195 2155
2196 ($layout->size)[1] 2156 ($layout->size)[1]
2197} 2157}
2198 2158
2199sub reflow { 2159sub reflow {
… …
2237 2197
2238 return unless $self->{h} > 0; 2198 return unless $self->{h} > 0;
2239 2199
2240 delete $self->{texture}; 2200 delete $self->{texture};
2241 2201
2242 $ROOT->on_refresh ($self, sub { 2202 $ROOT->on_post_alloc ($self, sub {
2243 if (delete $self->{need_reflow}) { 2203 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2204 my $height = 0;
2245 2205
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2206 $height += $_->[0] = $self->text_height ($_->[2])
2247 for @{$self->{par}}; 2207 for @{$self->{par}};
… …
2255 2215
2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2257 glClearColor 0, 0, 0, 0; 2217 glClearColor 0, 0, 0, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2218 glClear GL_COLOR_BUFFER_BIT;
2259 2219
2260 glEnable GL_BLEND;
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264 2222
2265 my $top = int $self->{children}[1]{range}[0]; 2223 my $top = int $self->{children}[1]{range}[0];
2266 2224
… …
2275 2233
2276 for my $par (@{$self->{par}}) { 2234 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2235 my $h = $par->[0];
2278 2236
2279 if ($y0 < $y + $h && $y < $y1) { 2237 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2280 $layout->set_text ($par->[2]); 2239 $layout->set_markup ($par->[2]);
2281 2240
2282 glColor @{ $par->[1] };
2283 my ($W, $H) = $layout->size; 2241 my ($W, $H) = $layout->size;
2284 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2285 } 2243 }
2286 2244
2287 $y += $h; 2245 $y += $h;
2288 } 2246 }
2289 2247
2290 glDisable GL_TEXTURE_2D; 2248 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND;
2292 }; 2249 };
2293 }); 2250 });
2294} 2251}
2295 2252
2296sub _draw { 2253sub _draw {
2297 my ($self) = @_; 2254 my ($self) = @_;
2298 2255
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2258 glColor 1, 1, 1, 1;
2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305 glDisable GL_TEXTURE_2D; 2260 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2261
2308 $self->{children}[1]->draw; 2262 $self->{children}[1]->draw;
2309 2263
2310} 2264}
2311 2265
… …
2405 @_, 2359 @_,
2406 can_events => 0, 2360 can_events => 0,
2407 ) 2361 )
2408} 2362}
2409 2363
2410sub set_markup { 2364sub set_tooltip_from {
2411 my ($self, $text) = @_; 2365 my ($self, $widget) = @_;
2412 2366
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2367 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2368 markup => $widget->{tooltip},
2415 $self->add ($self->{label}); 2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8,
2371 fg => [0, 0, 0, 1],
2372 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 );
2416} 2374}
2417 2375
2418sub size_request { 2376sub size_request {
2419 my ($self) = @_; 2377 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2378
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2380
2425 ($w + 4, $h + 4) 2381 ($w + 4, $h + 4)
2426} 2382}
… …
2432} 2388}
2433 2389
2434sub _draw { 2390sub _draw {
2435 my ($self) = @_; 2391 my ($self) = @_;
2436 2392
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2393 glTranslate 0.375, 0.375;
2439 2394
2440 my ($w, $h) = @$self{qw(w h)}; 2395 my ($w, $h) = @$self{qw(w h)};
2441 2396
2442 glColor 1, 0.8, 0.4; 2397 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2408 glVertex 0 , $h;
2454 glVertex $w, $h; 2409 glVertex $w, $h;
2455 glVertex $w, 0; 2410 glVertex $w, 0;
2456 glEnd; 2411 glEnd;
2457 2412
2458 glPopMatrix; 2413 glTranslate 2 - 0.375, 2 - 0.375;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2414 $self->SUPER::_draw;
2462} 2415}
2463 2416
2464############################################################################# 2417#############################################################################
2465 2418
… …
2483} 2436}
2484 2437
2485sub _draw { 2438sub _draw {
2486 my ($self) = @_; 2439 my ($self) = @_;
2487 2440
2441 return unless $::CONN;#d# manage and cache textures differently
2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2489 2443
2490 # TODO animation 2444 # TODO animation
2491 if ($tex) { 2445 if ($tex) {
2492 glEnable GL_BLEND;
2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494 glEnable GL_TEXTURE_2D; 2446 glEnable GL_TEXTURE_2D;
2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496 glColor 1, 1, 1, 1; 2448 glColor 1, 1, 1, 1;
2497 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2498 glDisable GL_TEXTURE_2D; 2450 glDisable GL_TEXTURE_2D;
2499 glDisable GL_BLEND;
2500 } 2451 }
2501} 2452}
2502 2453
2503############################################################################# 2454#############################################################################
2504 2455
2505package CFClient::UI::Menu; 2456package CFClient::UI::InventoryItem;
2506 2457
2507our @ISA = CFClient::UI::FancyFrame::; 2458our @ISA = CFClient::UI::HBox::;
2508
2509use CFClient::OpenGL;
2510 2459
2511sub new { 2460sub new {
2512 my $class = shift; 2461 my $class = shift;
2513 2462
2514 my $self = $class->SUPER::new (
2515 items => [],
2516 z => 100,
2517 @_,
2518 );
2519
2520 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2521
2522 for my $item (@{ $self->{items} }) {
2523 my ($widget, $cb) = @$item;
2524
2525 # handle various types of items, only text for now
2526 if (!ref $widget) {
2527 $widget = new CFClient::UI::Label
2528 can_hover => 1,
2529 can_events => 1,
2530 text => $widget;
2531 }
2532
2533 $self->{item}{$widget} = $item;
2534
2535 $self->{vbox}->add ($widget);
2536 }
2537
2538 $self
2539}
2540
2541# popup given the event (must be a mouse button down event currently)
2542sub popup {
2543 my ($self, $ev) = @_;
2544
2545 $self->emit ("popdown");
2546
2547 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self;
2549 $self->{button} = $ev->{button};
2550
2551 $self->show;
2552 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2553}
2554
2555sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_;
2557
2558 # TODO: should use vbox->find_widget or so
2559 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560 $self->{hover} = $self->{item}{$HOVER};
2561}
2562
2563sub button_up {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB;
2568 $self->hide;
2569
2570 $self->emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover};
2572 }
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::Root;
2578
2579our @ISA = CFClient::UI::Container::;
2580
2581use CFClient::OpenGL;
2582
2583sub check_size {
2584 my ($self) = @_;
2585
2586 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2587}
2588
2589sub size_request {
2590 ($::WIDTH, $::HEIGHT)
2591}
2592
2593sub configure {
2594 my ($self, $x, $y, $w, $h) = @_;
2595
2596 $self->SUPER::configure ($x, $y, $w, $h);
2597
2598 for my $child (@{$self->{children}}) {
2599 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2600
2601 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2602 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2603 $child->configure ($X, $Y, $W,$H);
2604 }
2605}
2606
2607sub _topleft {
2608 my ($self, $x, $y) = @_;
2609
2610 ($x, $y)
2611}
2612
2613sub update {
2614 my ($self) = @_;
2615
2616 $self->check_size;
2617 ::refresh ();
2618}
2619
2620sub add {
2621 my ($self, $child) = @_;
2622
2623 # integerize window positions
2624 $child->{x} = int $child->{x};
2625 $child->{y} = int $child->{y};
2626
2627 $self->SUPER::add ($child);
2628}
2629
2630sub on_refresh {
2631 my ($self, $id, $cb) = @_;
2632
2633 $self->{refresh_hook}{$id} = $cb;
2634}
2635
2636sub draw {
2637 my ($self) = @_;
2638
2639 while (my $rcb = delete $self->{refresh_hook}) {
2640 $_->() for values %$rcb;
2641 }
2642
2643 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2644 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2645 glClear GL_COLOR_BUFFER_BIT;
2646
2647 glMatrixMode GL_PROJECTION;
2648 glLoadIdentity;
2649 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2650 glMatrixMode GL_MODELVIEW;
2651 glLoadIdentity;
2652
2653 $self->_draw;
2654}
2655
2656#############################################################################
2657
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_; 2463 my %args = @_;
2666 2464
2667 my $item = $args{item}; 2465 my $item = delete $args{item};
2668 2466
2669 my $desc = $item->{nrof} < 2 2467 my $desc = $item->{nrof} < 2
2670 ? $item->{name} 2468 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}"; 2469 : "$item->{nrof} $item->{name_pl}";
2672 2470
… …
2701 2499
2702 1 2500 1
2703 }, 2501 },
2704 %args 2502 %args
2705 ); 2503 );
2504
2706 $self->add(new CFClient::UI::Face 2505 $self->add (new CFClient::UI::Face
2707 can_events => 0, 2506 can_events => 0,
2708 face => $item->{face}, 2507 face => $item->{face},
2709 anim => $item->{anim}, 2508 anim => $item->{anim},
2710 animspeed => $item->{animspeed}); 2509 animspeed => $item->{animspeed},
2510 );
2511
2711 $self->add(new CFClient::UI::Label 2512 $self->add (new CFClient::UI::Label
2712 can_events => 0, 2513 can_events => 0,
2713 text => $desc); 2514 text => $desc,
2515 );
2714 2516
2715 $self 2517 $self
2716} 2518}
2717 2519
2718############################################################################# 2520#############################################################################
… …
2745 for my $item (@items) { 2547 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2 2548 my $desc = $item->{nrof} < 2
2747 ? $item->{name} 2549 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}"; 2550 : "$item->{nrof} $item->{name_pl}";
2749 2551
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2552 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2751 } 2553 }
2752 2554
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2555# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754} 2556}
2755 2557
2756sub size_request { 2558sub size_request {
2757 my ($self) = @_; 2559 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h}); 2560 ($self->{req_w}, $self->{req_h});
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Menu;
2566
2567our @ISA = CFClient::UI::FancyFrame::;
2568
2569use CFClient::OpenGL;
2570
2571sub new {
2572 my $class = shift;
2573
2574 my $self = $class->SUPER::new (
2575 items => [],
2576 z => 100,
2577 @_,
2578 );
2579
2580 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2581
2582 for my $item (@{ $self->{items} }) {
2583 my ($widget, $cb) = @$item;
2584
2585 # handle various types of items, only text for now
2586 if (!ref $widget) {
2587 $widget = new CFClient::UI::Label
2588 can_hover => 1,
2589 can_events => 1,
2590 text => $widget;
2591 }
2592
2593 $self->{item}{$widget} = $item;
2594
2595 $self->{vbox}->add ($widget);
2596 }
2597
2598 $self
2599}
2600
2601# popup given the event (must be a mouse button down event currently)
2602sub popup {
2603 my ($self, $ev) = @_;
2604
2605 $self->emit ("popdown");
2606
2607 # maybe save $GRAB? must be careful about events...
2608 $GRAB = $self;
2609 $self->{button} = $ev->{button};
2610
2611 $self->show;
2612 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2613}
2614
2615sub mouse_motion {
2616 my ($self, $ev, $x, $y) = @_;
2617
2618 # TODO: should use vbox->find_widget or so
2619 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2620 $self->{hover} = $self->{item}{$HOVER};
2621}
2622
2623sub button_up {
2624 my ($self, $ev, $x, $y) = @_;
2625
2626 if ($ev->{button} == $self->{button}) {
2627 undef $GRAB;
2628 $self->hide;
2629
2630 $self->emit ("popdown");
2631 $self->{hover}[1]->() if $self->{hover};
2632 }
2633}
2634
2635#############################################################################
2636
2637package CFClient::UI::Statusbox;
2638
2639our @ISA = CFClient::UI::VBox::;
2640
2641sub reorder {
2642 my ($self) = @_;
2643 my $NOW = time;
2644
2645 while (my ($k, $v) = each %{ $self->{item} }) {
2646 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2647 }
2648
2649 my @widgets;
2650
2651 my @items = sort {
2652 $a->{pri} <=> $b->{pri}
2653 or $b->{id} <=> $a->{id}
2654 } values %{ $self->{item} };
2655
2656 my $count = 10 + 1;
2657 for my $item (@items) {
2658 last unless --$count;
2659
2660 push @widgets, $item->{label} ||= do {
2661 # TODO: doesn't handle markup well (read as: at all)
2662 my $short = $item->{count} > 1
2663 ? "<b>$item->{count} ×</b> $item->{text}"
2664 : $item->{text};
2665
2666 for ($short) {
2667 s/^\s+//;
2668 s/\012.*/…/s;
2669 my $len = int 40 / $item->{fontsize};
2670 substr $_, $len, length, "…" if $len < length;
2671 }
2672
2673 new CFClient::UI::Label
2674 markup => $short,
2675 tooltip => $item->{tooltip},
2676 tooltip_font => $::FONT_PROP,
2677 tooltip_width => 0.67,
2678 fontsize => $item->{fontsize},
2679 color => $item->{color},
2680 can_events => 1,
2681 can_hover => 1
2682 };
2683 }
2684
2685 $self->clear;
2686 $self->SUPER::add (reverse @widgets);
2687}
2688
2689sub add {
2690 my ($self, $text, %arg) = @_;
2691
2692 $text =~ s/^\s+//;
2693 $text =~ s/\s+$//;
2694
2695 my $timeout = time + ((delete $arg{timeout}) || 60);
2696
2697 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2698
2699 if (my $item = $self->{item}{$group}) {
2700 if ($item->{text} eq $text) {
2701 $item->{count}++;
2702 } else {
2703 $item->{count} = 1;
2704 $item->{text} = $item->{tooltip} = $text;
2705 }
2706 $item->{id} = ++$self->{id};
2707 $item->{timeout} = $timeout;
2708 delete $item->{label};
2709 } else {
2710 $self->{item}{$group} = {
2711 id => ++$self->{id},
2712 text => $text,
2713 timeout => $timeout,
2714 tooltip => $text,
2715 fontsize => 0.8,
2716 color => [0.8, 0.8, 0.8, 0.8],
2717 pri => 0,
2718 count => 1,
2719 %arg,
2720 };
2721 }
2722
2723 $self->reorder;
2724}
2725
2726#############################################################################
2727
2728package CFClient::UI::Root;
2729
2730our @ISA = CFClient::UI::Container::;
2731
2732use CFClient::OpenGL;
2733
2734sub new {
2735 my $class = shift;
2736
2737 $class->SUPER::new (
2738 @_,
2739 )
2740}
2741
2742sub configure {
2743 my ($self, $x, $y, $w, $h) = @_;
2744
2745 $self->{w} = $w;
2746 $self->{h} = $h;
2747}
2748
2749sub check_size {
2750 my ($self) = @_;
2751
2752 $self->size_allocate ($self->{w}, $self->{h})
2753 if $self->{w};
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758
2759 ($self->{w}, $self->{h})
2760}
2761
2762sub size_allocate {
2763 my ($self, $w, $h) = @_;
2764
2765 my $old_w = $self->{old_w};
2766 my $old_h = $self->{old_h};
2767
2768 if ($old_w && $old_h) {
2769 for my $child ($self->children) {
2770 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2771 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2772 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2773 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2774 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2775 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2776 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2777 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2778 }
2779 }
2780
2781 for my $child ($self->children) {
2782 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2783
2784 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2785 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2786 $child->configure ($X, $Y, $W, $H);
2787 }
2788
2789 $self->{old_w} = $w;
2790 $self->{old_h} = $h;
2791}
2792
2793sub coord2local {
2794 my ($self, $x, $y) = @_;
2795
2796 ($x, $y)
2797}
2798
2799sub coord2global {
2800 my ($self, $x, $y) = @_;
2801
2802 ($x, $y)
2803}
2804
2805sub update {
2806 my ($self) = @_;
2807
2808 $self->check_size;
2809 $::WANT_REFRESH++;
2810}
2811
2812sub add {
2813 my ($self, $child) = @_;
2814
2815 # integerise window positions
2816 $child->{x} = int $child->{x};
2817 $child->{y} = int $child->{y};
2818
2819 $self->SUPER::add ($child);
2820}
2821
2822sub on_refresh {
2823 my ($self, $id, $cb) = @_;
2824
2825 $self->{refresh_hook}{$id} = $cb;
2826}
2827
2828sub on_post_alloc {
2829 my ($self, $id, $cb) = @_;
2830
2831 $self->{post_alloc_hook}{$id} = $cb;
2832}
2833
2834sub draw {
2835 my ($self) = @_;
2836
2837 while ($self->{refresh_hook}) {
2838 $_->()
2839 for values %{delete $self->{refresh_hook}};
2840 }
2841
2842 if ($self->{check_size}) {
2843 my @queue = ([], []);
2844
2845 for (;;) {
2846 if ($self->{check_size}) {
2847 # heuristic: check containers last
2848 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2849 for values %{delete $self->{check_size}}
2850 }
2851
2852 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2853
2854 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2855 ? @$widget{qw(user_w user_h)}
2856 : $widget->size_request;
2857
2858 if (delete $widget->{force_alloc}
2859 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2860 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2861
2862 $widget->{req_w} = $w;
2863 $widget->{req_h} = $h;
2864
2865 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2866
2867 $widget->{parent}->check_size
2868 if $widget->{parent};
2869 }
2870 }
2871 }
2872
2873 while ($self->{size_alloc}) {
2874 for (values %{delete $self->{size_alloc}}) {
2875 my ($widget, $w, $h) = @$_;
2876
2877 $w = 0 if $w < 0;
2878 $h = 0 if $h < 0;
2879
2880 $widget->{w} = $w;
2881 $widget->{h} = $h;
2882 $widget->size_allocate ($w, $h);
2883 $widget->emit (size_allocate => $w, $h);
2884 }
2885 }
2886
2887 while ($self->{post_alloc_hook}) {
2888 $_->()
2889 for values %{delete $self->{post_alloc_hook}};
2890 }
2891
2892 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2893 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2894 glClear GL_COLOR_BUFFER_BIT;
2895
2896 glMatrixMode GL_PROJECTION;
2897 glLoadIdentity;
2898 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2899 glMatrixMode GL_MODELVIEW;
2900 glLoadIdentity;
2901
2902 $self->_draw;
2759} 2903}
2760 2904
2761############################################################################# 2905#############################################################################
2762 2906
2763package CFClient::UI; 2907package CFClient::UI;

Diff Legend

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