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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.219 by root, Sun May 21 00:34:59 2006 UTC

… …
140 140
141# call when resolution changes etc. 141# call when resolution changes etc.
142sub rescale_widgets { 142sub rescale_widgets {
143 my ($sx, $sy) = @_; 143 my ($sx, $sy) = @_;
144 144
145 # make a copy, otherwise for complains about freed values.
145 for my $widget (values %WIDGET) { 146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
146 if ($widget->{toplevel}) { 149 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
… …
280sub set_max_size { 283sub set_max_size {
281 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
282 285
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
288}
289
290sub set_tooltip {
291 my ($self, $tooltip) = @_;
292
293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
285} 299}
286 300
287# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
288sub coord2local { 302sub coord2local {
289 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
455 my $class = shift; 469 my $class = shift;
456 470
457 # range [value, low, high, page] 471 # range [value, low, high, page]
458 472
459 $class->SUPER::new ( 473 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
462 @_ 476 @_
463 ) 477 )
464} 478}
465 479
466sub _draw { 480sub _draw {
467 my ($self) = @_; 481 my ($self) = @_;
468 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
470 489
471 glEnable GL_BLEND; 490 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
474 493
475 glBegin GL_QUADS; 494 glBegin GL_QUADS;
476 glVertex 0 , 0; 495 glVertex 0 , 0;
477 glVertex 0 , $h; 496 glVertex 0 , $h;
478 glVertex $w, $h; 497 glVertex $w, $h;
479 glVertex $w, 0; 498 glVertex $w, 0;
480 glEnd; 499 glEnd;
481 500
482 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
483} 503}
484 504
485############################################################################# 505#############################################################################
486 506
487package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
674 694
675 $self->_render; 695 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 696 };
684} 697}
685 698
686sub _draw { 699sub _draw {
687 my ($self) = @_; 700 my ($self) = @_;
… …
691 my $tex = $self->{texture} 704 my $tex = $self->{texture}
692 or return; 705 or return;
693 706
694 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
697 710
698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 712
700 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
701} 714}
… …
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 }, 798 },
786 ; 799 ;
787 800
788 $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 802 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 803 slider => $slider,
791 @_, 804 @_,
792 ); 805 );
793 806
794 $self->{vp}->add ($self->{scrolled}); 807 $self->{vp}->add ($self->{scrolled});
… …
895 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
896 909
897 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
899 912
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901 if $self->{title}; 914 if $self->{title};
902 915
903 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
904} 917}
905 918
… …
1266 1279
1267############################################################################# 1280#############################################################################
1268 1281
1269package CFClient::UI::Label; 1282package CFClient::UI::Label;
1270 1283
1271our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1272 1285
1273use CFClient::OpenGL; 1286use CFClient::OpenGL;
1274 1287
1275sub new { 1288sub new {
1276 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1277 1290
1278 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1280 #font => default_font 1295 #font => default_font
1281 #text => initial text 1296 #text => initial text
1282 #markup => initial narkup 1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1300 layout => (new CFClient::Layout),
1284 fontsize => 1, 1301 fontsize => 1,
1285 align => -1, 1302 align => -1,
1286 valign => -1, 1303 valign => -1,
1287 padding => 2, 1304 padding => 2,
… …
1302 } 1319 }
1303 1320
1304 $self 1321 $self
1305} 1322}
1306 1323
1307sub escape { 1324sub escape($) {
1308 local $_ = $_[1]; 1325 local $_ = $_[0];
1309 1326
1310 s/&/&amp;/g; 1327 s/&/&amp;/g;
1311 s/>/&gt;/g; 1328 s/>/&gt;/g;
1312 s/</&lt;/g; 1329 s/</&lt;/g;
1313 1330
1314 $_[1] 1331 $_
1315} 1332}
1316 1333
1317sub update { 1334sub update {
1318 my ($self) = @_; 1335 my ($self) = @_;
1319 1336
… …
1352sub size_request { 1369sub size_request {
1353 my ($self) = @_; 1370 my ($self) = @_;
1354 1371
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1377
1359 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1360 1379
1361 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1391} 1410}
1392 1411
1393sub _draw { 1412sub _draw {
1394 my ($self) = @_; 1413 my ($self) = @_;
1395 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1396 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1424
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1426
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5; 1429 : ($self->{w} - $tex->{w}) * 0.5);
1407 1430
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5; 1433 : ($self->{h} - $tex->{h}) * 0.5);
1411 1434
1412 $tex 1435 $tex
1413 }; 1436 };
1414 1437
1415 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
… …
1470sub set_text { 1493sub set_text {
1471 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1472 1495
1473 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1497 $self->_set_text ($text);
1498 $self->update;
1475 $self->check_size; 1499 $self->check_size;
1476 $self->update;
1477} 1500}
1478 1501
1479sub get_text { 1502sub get_text {
1480 $_[0]{text} 1503 $_[0]{text}
1481} 1504}
… …
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1545 }
1523 1546
1524 $self->_set_text ($text); 1547 $self->_set_text ($text);
1525 $self->update; 1548 $self->update;
1549 $self->check_size;
1526} 1550}
1527 1551
1528sub focus_in { 1552sub focus_in {
1529 my ($self) = @_; 1553 my ($self) = @_;
1530 1554
… …
1659 my $class = shift; 1683 my $class = shift;
1660 1684
1661 $class->SUPER::new ( 1685 $class->SUPER::new (
1662 padding => 4, 1686 padding => 4,
1663 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1666 can_hover => 1, 1689 can_hover => 1,
1667 align => 0, 1690 align => 0,
1668 valign => 0, 1691 valign => 0,
1669 can_events => 1, 1692 can_events => 1,
… …
1717 1740
1718 $class->SUPER::new ( 1741 $class->SUPER::new (
1719 padding => 2, 1742 padding => 2,
1720 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1721 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1722 state => 0, 1747 state => 0,
1723 can_hover => 1, 1748 can_hover => 1,
1724 @_ 1749 @_
1725 ) 1750 )
1726} 1751}
… …
2018 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2044 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2022 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2023 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2024 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2026 vertical => 0, 2053 vertical => 0,
2027 can_hover => 1, 2054 can_hover => 1,
2028 inner_pad => .05, 2055 inner_pad => 0.02,
2029 @_ 2056 @_
2030 ); 2057 );
2031 2058
2032 $self->set_value ($self->{range}[0]); 2059 $self->set_value ($self->{range}[0]);
2033 $self->update; 2060 $self->update;
… …
2123 glScale $self->{w}, $self->{h}; 2150 glScale $self->{w}, $self->{h};
2124 2151
2125 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2127 2154
2155 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2157 }
2131 2158
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2161
… …
2250 2277
2251 delete $self->{texture}; 2278 delete $self->{texture};
2252 } 2279 }
2253 2280
2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2255 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2257 2284
2258 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260 2287
… …
2292 my ($self) = @_; 2319 my ($self) = @_;
2293 2320
2294 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2299 2326
2300 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2301 2328
2302} 2329}
… …
2401 2428
2402sub set_tooltip_from { 2429sub set_tooltip_from {
2403 my ($self, $widget) = @_; 2430 my ($self, $widget) = @_;
2404 2431
2405 $self->add (new CFClient::UI::Label 2432 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip}, 2433 markup => $widget->{tooltip},
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 2435 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 2439 );
2412} 2440}
2413 2441
2414sub size_request { 2442sub size_request {
2415 my ($self) = @_; 2443 my ($self) = @_;
… …
2461use CFClient::OpenGL; 2489use CFClient::OpenGL;
2462 2490
2463sub new { 2491sub new {
2464 my $class = shift; 2492 my $class = shift;
2465 2493
2466 $class->SUPER::new ( 2494 my $self = $class->SUPER::new (
2467 aspect => 1, 2495 aspect => 1,
2468 @_, 2496 @_,
2469 ) 2497 );
2498
2499 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self);
2501
2502 $self->{timer} = Event->timer (
2503 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2504 hard => 1,
2505 interval => $self->{animspeed},
2506 cb => sub {
2507 ++$widget->{frame};
2508 $widget->update;
2509 },
2510 );
2511 }
2512
2513 $self
2470} 2514}
2471 2515
2472sub size_request { 2516sub size_request {
2473 (32, 8) 2517 (32, 8)
2474} 2518}
2475 2519
2476sub _draw { 2520sub _draw {
2477 my ($self) = @_; 2521 my ($self) = @_;
2478 2522
2479 return unless $::CONN;#d# manage and cache textures differently 2523 return unless $::CONN;#d# manage and cache textures differently
2524
2525 my $face;
2526
2527 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}];
2529
2530 $face = $anim->[ $self->{frame} % @$anim ]
2531 if $anim && @$anim;
2532 }
2533
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481 2535
2482 # TODO animation
2483 if ($tex) { 2536 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 2537 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 2539 glColor 1, 1, 1, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 2541 glDisable GL_TEXTURE_2D;
2489 } 2542 }
2490} 2543}
2491 2544
2545sub DESTROY {
2546 my ($self) = @_;
2547
2548 $self->{timer}->cancel
2549 if $self->{timer};
2550
2551 $self->SUPER::DESTROY;
2552}
2553
2492############################################################################# 2554#############################################################################
2493 2555
2494package CFClient::UI::InventoryItem; 2556package CFClient::UI::InventoryItem;
2495 2557
2496our @ISA = CFClient::UI::HBox::; 2558our @ISA = CFClient::UI::HBox::;
2497 2559
2498sub new { 2560sub _item_to_desc {
2499 my $class = shift; 2561 my ($item) = @_;
2500 2562
2501 my %args = @_; 2563 my $desc =
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2 2564 $item->{nrof} < 2
2506 ? $item->{name} 2565 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}"; 2566 : "$item->{nrof} × $item->{name_pl}";
2508 2567
2509 $item->{flags} & Crossfire::Protocol::F_OPEN 2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)"; 2569 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED 2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)"; 2571 and $desc .= " (applied)";
… …
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED 2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)"; 2579 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED 2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *"; 2581 and $desc .= " *";
2523 2582
2583 $desc
2584}
2585
2586sub new {
2587 my $class = shift;
2588
2589 my %args = @_;
2590
2591 my $item = delete $args{item};
2592
2593 my $desc = _item_to_desc ($item);
2594
2524 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
2525 can_hover => 1, 2596 can_hover => 1,
2526 can_events => 1, 2597 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc) 2598 tooltip => ((CFClient::UI::Label::escape $desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub { 2600 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_; 2601 my ($self, $ev, $x, $y) = @_;
2531 2602
2532 # todo: maybe put examine on 1? but should just be a tooltip :( 2603 # todo: maybe put examine on 1? but should just be a tooltip :(
2533 if ($ev->{button} == 1) { 2604 if ($ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag};
2606
2607 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT;
2609 }
2610
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2611 $::CONN->send ("move $targ $item->{tag} 0");
2535 } elsif ($ev->{button} == 2) { 2612 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}"); 2613 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) { 2614 } elsif ($ev->{button} == 3) {
2538 my @menu_items = ( 2615 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2617 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 (
2620 $item->{flags} & Crossfire::Protocol::F_LOCKED
2621 ? (
2622 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2623 )
2624 : (
2625 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2626 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [ 2627 )
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ], 2628 ),
2547 ); 2629 );
2548 2630
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2631 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 } 2632 }
2551 2633
2552 1 2634 1
2553 }, 2635 },
2554 %args 2636 %args
2555 ); 2637 );
2638
2556 2639
2557 $self->add (new CFClient::UI::Face 2640 $self->add (new CFClient::UI::Face
2558 can_events => 0, 2641 can_events => 0,
2559 face => $item->{face}, 2642 face => $item->{face},
2560 anim => $item->{anim}, 2643 anim => $item->{anim},
2561 animspeed => $item->{animspeed}, 2644 animspeed => $item->{animspeed},
2562 ); 2645 );
2563 2646
2564 $self->add (new CFClient::UI::Label 2647 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2565 can_events => 0, 2648
2566 text => $desc, 2649 $self->{item} = $item;
2567 ); 2650
2651 $self->update_item;
2568 2652
2569 $self 2653 $self
2654}
2655
2656sub update_item {
2657 my ($self) = @_;
2658
2659 my $desc = _item_to_desc ($self->{item});
2660
2661 $self->{name_lbl}->set_text ($desc);
2570} 2662}
2571 2663
2572############################################################################# 2664#############################################################################
2573 2665
2574package CFClient::UI::Inventory; 2666package CFClient::UI::Inventory;
… …
2598 } @$items; 2690 } @$items;
2599 2691
2600 $self->{real_items} = \@items; 2692 $self->{real_items} = \@items;
2601 2693
2602 for my $item (@items) { 2694 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2695 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2696 $item->update_item ();
2608 } 2697 }
2609 2698
2610 $self->{scrolled}->add (@items); 2699 $self->{scrolled}->add (@items);
2611 2700
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2701# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
… …
2693 2782
2694package CFClient::UI::Statusbox; 2783package CFClient::UI::Statusbox;
2695 2784
2696our @ISA = CFClient::UI::VBox::; 2785our @ISA = CFClient::UI::VBox::;
2697 2786
2787sub new {
2788 my $class = shift;
2789
2790 $class->SUPER::new (
2791 fontsize => 0.8,
2792 @_,
2793 )
2794}
2795
2698sub reorder { 2796sub reorder {
2699 my ($self) = @_; 2797 my ($self) = @_;
2700 my $NOW = time; 2798 my $NOW = time;
2701 2799
2702 while (my ($k, $v) = each %{ $self->{item} }) { 2800 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2721 : $item->{text}; 2819 : $item->{text};
2722 2820
2723 for ($short) { 2821 for ($short) {
2724 s/^\s+//; 2822 s/^\s+//;
2725 s/\s+/ /g; 2823 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 } 2824 }
2729 2825
2730 new CFClient::UI::Label 2826 new CFClient::UI::Label
2731 markup => $short, 2827 markup => $short,
2732 tooltip => $item->{tooltip}, 2828 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP, 2829 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67, 2830 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize}, 2831 fontsize => $item->{fontsize} || $self->{fontsize},
2832 max_w => $::WIDTH * 0.44,
2736 fg => $item->{fg}, 2833 fg => $item->{fg},
2737 can_events => 1, 2834 can_events => 1,
2738 can_hover => 1 2835 can_hover => 1
2739 }; 2836 };
2740 } 2837 }
… …
2767 $self->{item}{$group} = { 2864 $self->{item}{$group} = {
2768 id => ++$self->{id}, 2865 id => ++$self->{id},
2769 text => $text, 2866 text => $text,
2770 timeout => $timeout, 2867 timeout => $timeout,
2771 tooltip => $text, 2868 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8], 2869 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0, 2870 pri => 0,
2775 count => 1, 2871 count => 1,
2776 %arg, 2872 %arg,
2777 }; 2873 };
2778 } 2874 }
2779 2875
2780 $self->reorder; 2876 $self->reorder;
2877}
2878
2879sub reconfigure {
2880 my ($self) = @_;
2881
2882 delete $_->{label}
2883 for values %{ $self->{item} || {} };
2884
2885 $self->reorder;
2886 $self->SUPER::reconfigure;
2781} 2887}
2782 2888
2783############################################################################# 2889#############################################################################
2784 2890
2785package CFClient::UI::Root; 2891package CFClient::UI::Root;
… …
2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3054 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949 glClear GL_COLOR_BUFFER_BIT; 3055 glClear GL_COLOR_BUFFER_BIT;
2950 3056
2951 glMatrixMode GL_PROJECTION; 3057 glMatrixMode GL_PROJECTION;
2952 glLoadIdentity; 3058 glLoadIdentity;
2953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954 glMatrixMode GL_MODELVIEW; 3060 glMatrixMode GL_MODELVIEW;
2955 glLoadIdentity; 3061 glLoadIdentity;
2956 3062
2957 $self->_draw; 3063 $self->_draw;
2958} 3064}
… …
2960############################################################################# 3066#############################################################################
2961 3067
2962package CFClient::UI; 3068package CFClient::UI;
2963 3069
2964$ROOT = new CFClient::UI::Root; 3070$ROOT = new CFClient::UI::Root;
2965$TOOLTIP = new CFClient::UI::Tooltip; 3071$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2966 3072
29671 30731
2968 3074

Diff Legend

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