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.176 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.194 by root, Thu May 11 23:41:47 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
… …
232 $self->{y} = $y; 233 $self->{y} = $y;
233 $self->update; 234 $self->update;
234 } 235 }
235 236
236 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 239 }
243} 240}
244 241
245sub size_allocate { 242sub size_allocate {
246 # nothing to be done 243 # nothing to be done
247} 244}
248 245
249sub children { 246sub children {
250} 247}
251 248
252# call when resoltuion changes etc. 249# call when resolution changes etc.
253sub reconfigure { 250sub reconfigure {
254 my ($self) = @_; 251 my ($self) = @_;
255 252
256 $_->reconfigure 253 $_->reconfigure
257 for $self->children; 254 for $self->children;
258 255
259 $_->check_size; 256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
260} 259}
261 260
262sub set_max_size { 261sub set_max_size {
263 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
264 263
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
269# return top left coordinates
270sub _topleft {
271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
275
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
277} 266}
278 267
279# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
280sub coord2local { 269sub coord2local {
281 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
282 271
283 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 273}
286 274
287# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
288sub coord2global { 276sub coord2global {
289 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
290 278
291 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 280}
294 281
295sub focus_in { 282sub focus_in {
296 my ($self) = @_; 283 my ($self) = @_;
297 284
… …
395 382
396sub set_parent { 383sub set_parent {
397 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
398 385
399 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
400} 390}
401 391
402sub check_size { 392sub check_size {
403 my ($self) = @_; 393 my ($self) = @_;
404 394
405 $self->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 396}
427 397
428sub update { 398sub update {
429 my ($self) = @_; 399 my ($self) = @_;
430 400
… …
527 497
528 $self 498 $self
529} 499}
530 500
531sub add { 501sub add {
532 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
533 503
534 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
535 506
536 use sort 'stable'; 507 use sort 'stable';
537 508
538 $self->{children} = [ 509 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
541 ]; 512 ];
542 513
543 $child->check_size; 514 $self->check_size;
515 $self->update;
544} 516}
545 517
546sub children { 518sub children {
547 @{ $_[0]{children} } 519 @{ $_[0]{children} }
548} 520}
… …
567 539
568 for (@$children) { 540 for (@$children) {
569 delete $_->{parent}; 541 delete $_->{parent};
570 $_->hide; 542 $_->hide;
571 } 543 }
544
545 $self->check_size;
546 $self->update;
572} 547}
573 548
574sub find_widget { 549sub find_widget {
575 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
576 551
… …
662 637
663 $self->SUPER::size_allocate ($w, $h); 638 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 639 $self->update;
665} 640}
666 641
642sub _render {
643 $_[0]{children}[0]->draw;
644}
645
667sub render_child { 646sub render_child {
668 my ($self) = @_; 647 my ($self) = @_;
669 648
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 650 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 651 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 652
653 $self->_render;
674# glColorMask 1, 1, 1, 0; 654# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND; 655# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO; 656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0; 657# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h}; 658# glCopyPixels 0, 0, $self->{w}, $self->{h};
… …
687 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
688 668
689 my $tex = $self->{texture} 669 my $tex = $self->{texture}
690 or return; 670 or return;
691 671
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 674 glColor 0, 0, 0, 1;
697 675
698 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 677
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
702} 679}
703 680
704############################################################################# 681#############################################################################
705 682
706package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
707 684
708our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
709 686
710sub new { die }
711
712sub size_request { 687sub size_request {
713 my ($self) = @_; 688 my ($self) = @_;
714 689
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 692
718 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
719} 694}
720 695
721sub _draw { 696sub size_allocate {
722 my ($self) = @_; 697 my ($self, $w, $h) = @_;
723 698
724 $self->{children}[1]->draw; 699 $self->update;
725} 700}
726 701
702sub set_offset {
703 my ($self, $x, $y) = @_;
704
705 $self->{view_x} = int $x;
706 $self->{view_y} = int $y;
707
708 $self->update;
709}
710
711# hmm, this does not work for topleft of $self... but we should not ask for that
712sub coord2local {
713 my ($self, $x, $y) = @_;
714
715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
725}
726
727sub find_widget {
728 my ($self, $x, $y) = @_;
729
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y)
736 }
737}
738
739sub _render {
740 my ($self) = @_;
741
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743
744 $self->SUPER::_render;
745}
746
747#############################################################################
748
749package CFClient::UI::ScrolledWindow;
750
751our @ISA = CFClient::UI::HBox::;
752
753sub new {
754 my $class = shift;
755
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort),
768 slider => $slider,
769 @_,
770 );
771
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
727 781
728############################################################################# 782#############################################################################
729 783
730package CFClient::UI::Frame; 784package CFClient::UI::Frame;
731 785
… …
904 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
908 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
909 my $bg = $tex[0]; 964 my $bg = $tex[0];
910 965
911 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
912 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
913 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
914 969
915 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
916 971
917 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
918 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
919 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
920 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
921 976
922 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
923 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
924 980
925 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
926 $self->child->draw; 983 $self->child->draw;
927} 984}
928 985
929############################################################################# 986#############################################################################
930 987
… …
1154} 1211}
1155 1212
1156sub size_allocate { 1213sub size_allocate {
1157 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1158 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1159 my $children = $self->{children}; 1218 my $children = $self->{children};
1160 1219
1161 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1162 1221
1163 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1202 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1203 1262
1204 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1205 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1206 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1207 fontsize => 1, 1269 fontsize => 1,
1208 text => "",
1209 align => -1, 1270 align => -1,
1210 valign => -1, 1271 valign => -1,
1211 padding => 2, 1272 padding => 2,
1212 layout => new CFClient::Layout,
1213 can_events => 0, 1273 can_events => 0,
1214 %arg 1274 %arg
1215 ); 1275 );
1216 1276
1217 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1218 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1219 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1220 $self->{template} = $layout; 1280 $self->{template} = $layout;
1221 } 1281 }
1222 1282
1223 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1224 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1225 1288
1226 $self 1289 $self
1227} 1290}
1228 1291
1229sub escape { 1292sub escape {
… …
1241 1304
1242 delete $self->{texture}; 1305 delete $self->{texture};
1243 $self->SUPER::update; 1306 $self->SUPER::update;
1244} 1307}
1245 1308
1246sub reconfigure {
1247 my ($self) = @_;
1248
1249 delete $self->{texture};
1250}
1251
1252sub set_text { 1309sub set_text {
1253 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1254 1311
1255 return if $self->{text} eq "T$text"; 1312 return if $self->{text} eq "T$text";
1256 $self->{text} = "T$text"; 1313 $self->{text} = "T$text";
1257 1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1258 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1259 1317
1260 delete $self->{texture};
1261 $self->update; 1318 $self->update;
1262 $self->check_size; 1319 $self->check_size;
1263} 1320}
1264 1321
1265sub set_markup { 1322sub set_markup {
1266 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1267 1324
1268 return if $self->{text} eq "M$markup"; 1325 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup"; 1326 $self->{text} = "M$markup";
1270 1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1271 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1272 1332
1273 delete $self->{texture};
1274 $self->update; 1333 $self->update;
1275 $self->check_size; 1334 $self->check_size;
1276} 1335}
1277 1336
1278sub size_request { 1337sub size_request {
… …
1309sub set_fontsize { 1368sub set_fontsize {
1310 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1311 1370
1312 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1313 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1314 $self->check_size; 1375 $self->check_size;
1315 $self->update;
1316} 1376}
1317 1377
1318sub _draw { 1378sub _draw {
1319 my ($self) = @_; 1379 my ($self) = @_;
1320 1380
1321 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1323 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1324 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1325 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1326 }; 1398 };
1327 1399
1328 glEnable GL_BLEND;
1329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1330 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1332 1402
1403 if ($tex->{format} == GL_ALPHA) {
1333 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1334
1335 $self->{ox} = int (
1336 $self->{align} < 0 ? $self->{padding}
1337 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1338 : ($self->{w} - $tex->{w}) * 0.5
1339 );
1340
1341 $self->{oy} = int (
1342 $self->{valign} < 0 ? $self->{padding}
1343 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1344 : ($self->{h} - $tex->{h}) * 0.5
1345 );
1346
1347 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1348 1409
1349 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1350 glDisable GL_BLEND;
1351} 1411}
1352 1412
1353############################################################################# 1413#############################################################################
1354 1414
1355package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1390 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1391 1451
1392 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1393} 1453}
1394 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1395sub get_text { 1464sub get_text {
1396 $_[0]{text} 1465 $_[0]{text}
1397} 1466}
1398 1467
1399sub size_request { 1468sub size_request {
… …
1406 1475
1407sub size_allocate { 1476sub size_allocate {
1408 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1409 1478
1410 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1411}
1412
1413sub set_text {
1414 my ($self, $text) = @_;
1415
1416 $self->{cursor} = length $text;
1417 $self->_set_text ($text);
1418 $self->update;
1419} 1480}
1420 1481
1421sub key_down { 1482sub key_down {
1422 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1423 1484
… …
1954 # TODO: calculations are off 2015 # TODO: calculations are off
1955 my $self = $class->SUPER::new ( 2016 my $self = $class->SUPER::new (
1956 fg => [1, 1, 1], 2017 fg => [1, 1, 1],
1957 active_fg => [0, 0, 0], 2018 active_fg => [0, 0, 0],
1958 range => [0, 0, 100, 10], 2019 range => [0, 0, 100, 10],
1959 req_w => 20, 2020 req_w => $::WIDTH / 80,
1960 req_h => 20, 2021 req_h => $::WIDTH / 80,
1961 vertical => 0, 2022 vertical => 0,
1962 can_hover => 1, 2023 can_hover => 1,
1963 inner_pad => 5, 2024 inner_pad => 5,
1964 @_ 2025 @_
1965 ); 2026 );
… …
2399 2460
2400sub size_request { 2461sub size_request {
2401 (32, 8) 2462 (32, 8)
2402} 2463}
2403 2464
2404sub draw { 2465sub _draw {
2405 my ($self) = @_; 2466 my ($self) = @_;
2406 2467
2468 return unless $::CONN;#d# manage and cache textures differently
2407 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2408 2470
2471 # TODO animation
2409 if ($tex) { 2472 if ($tex) {
2410 glEnable GL_BLEND; 2473 glEnable GL_BLEND;
2411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412 glEnable GL_TEXTURE_2D; 2475 glEnable GL_TEXTURE_2D;
2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2418 } 2481 }
2419} 2482}
2420 2483
2421############################################################################# 2484#############################################################################
2422 2485
2486package CFClient::UI::InventoryItem;
2487
2488our @ISA = CFClient::UI::HBox::;
2489
2490sub new {
2491 my $class = shift;
2492
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new (
2503 can_hover => 1,
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_,
2562 );
2563
2564 $self
2565}
2566
2567sub set_items {
2568 my ($self, $items) = @_;
2569
2570 $self->{scrolled}->clear;
2571 return unless $items;
2572
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2574
2575 $self->{real_items} = \@items;
2576
2577 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2583 }
2584
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591}
2592
2593#############################################################################
2594
2595package CFClient::UI::Menu;
2596
2597our @ISA = CFClient::UI::FancyFrame::;
2598
2599use CFClient::OpenGL;
2600
2601sub new {
2602 my $class = shift;
2603
2604 my $self = $class->SUPER::new (
2605 items => [],
2606 z => 100,
2607 @_,
2608 );
2609
2610 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2611
2612 for my $item (@{ $self->{items} }) {
2613 my ($widget, $cb) = @$item;
2614
2615 # handle various types of items, only text for now
2616 if (!ref $widget) {
2617 $widget = new CFClient::UI::Label
2618 can_hover => 1,
2619 can_events => 1,
2620 text => $widget;
2621 }
2622
2623 $self->{item}{$widget} = $item;
2624
2625 $self->{vbox}->add ($widget);
2626 }
2627
2628 $self
2629}
2630
2631# popup given the event (must be a mouse button down event currently)
2632sub popup {
2633 my ($self, $ev) = @_;
2634
2635 $self->emit ("popdown");
2636
2637 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self;
2639 $self->{button} = $ev->{button};
2640
2641 $self->show;
2642 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2643}
2644
2645sub mouse_motion {
2646 my ($self, $ev, $x, $y) = @_;
2647
2648 # TODO: should use vbox->find_widget or so
2649 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2650 $self->{hover} = $self->{item}{$HOVER};
2651}
2652
2653sub button_up {
2654 my ($self, $ev, $x, $y) = @_;
2655
2656 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB;
2658 $self->hide;
2659
2660 $self->emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover};
2662 }
2663}
2664
2665#############################################################################
2666
2667package CFClient::UI::Statusbox;
2668
2669our @ISA = CFClient::UI::VBox::;
2670
2671sub reorder {
2672 my ($self) = @_;
2673 my $NOW = time;
2674
2675 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 }
2678
2679 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2681 my $count = 10 + 1;
2682 for my $item (@items) {
2683 last unless --$count;
2684
2685 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text};
2688 for ($short) {
2689 s/^\s+//;
2690 s/\012.*//s;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 }
2694
2695 new CFClient::UI::Label
2696 markup => $short,
2697 tooltip => delete $item->{tooltip},
2698 fontsize => delete $item->{fontsize},
2699 color => delete $item->{color},
2700 can_events => 1,
2701 can_hover => 1,
2702 };
2703 }
2704
2705 $self->clear;
2706 $self->SUPER::add (@widgets);
2707}
2708
2709sub add {
2710 my ($self, $text, %arg) = @_;
2711
2712 my $item = {
2713 time => time,
2714 text => $text,
2715 timeout => 60,
2716 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8],
2719 %arg,
2720 };
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726
2727 $self->reorder;
2728}
2729
2730#############################################################################
2731
2423package CFClient::UI::Root; 2732package CFClient::UI::Root;
2424 2733
2425our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2426 2735
2427use CFClient::OpenGL; 2736use CFClient::OpenGL;
2428 2737
2429sub check_size { 2738sub new {
2430 my ($self) = @_; 2739 my $class = shift;
2431 2740
2432 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2741 $class->SUPER::new (
2433} 2742 @_,
2434 2743 )
2435sub size_request {
2436 ($::WIDTH, $::HEIGHT)
2437} 2744}
2438 2745
2439sub configure { 2746sub configure {
2440 my ($self, $x, $y, $w, $h) = @_; 2747 my ($self, $x, $y, $w, $h) = @_;
2441 2748
2442 $self->SUPER::configure ($x, $y, $w, $h); 2749 $self->{w} = $w;
2750 $self->{h} = $h;
2751}
2443 2752
2753sub check_size {
2754 my ($self) = @_;
2755
2756 $self->size_allocate ($self->{w}, $self->{h})
2757 if $self->{w};
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762
2763 ($self->{w}, $self->{h})
2764}
2765
2766sub size_allocate {
2767 my ($self, $w, $h) = @_;
2768
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784
2444 for my $child (@{$self->{children}}) { 2785 for my $child ($self->children) {
2445 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2446 2787
2447 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2448 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2449 $child->configure ($X, $Y, $W,$H); 2790 $child->configure ($X, $Y, $W, $H);
2450 } 2791 }
2451}
2452 2792
2453sub _topleft { 2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2454 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2455 2799
2456 ($x, $y) 2800 ($x, $y)
2457} 2801}
2458 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2459sub update { 2809sub update {
2460 my ($self) = @_; 2810 my ($self) = @_;
2461 2811
2462 $self->check_size; 2812 $self->check_size;
2463 ::refresh (); 2813 $::WANT_REFRESH++;
2464} 2814}
2465 2815
2466sub add { 2816sub add {
2467 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2468 2818
2469 # integerize window positions 2819 # integerise window positions
2470 $child->{x} = int $child->{x}; 2820 $child->{x} = int $child->{x};
2471 $child->{y} = int $child->{y}; 2821 $child->{y} = int $child->{y};
2472 2822
2473 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2474} 2824}
… …
2477 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2478 2828
2479 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2480} 2830}
2481 2831
2482sub draw { 2832sub draw {
2483 my ($self) = @_; 2833 my ($self) = @_;
2484 2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878
2485 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2486 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2487 } 2882 }
2488 2883
2489 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2490 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2491 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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