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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.214 by root, Wed May 17 22:59:13 2006 UTC

… …
31 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 32 $TOOLTIP->show;
33 33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35 35
36 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
39 38
40 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size; 40 $TOOLTIP->check_size;
42 $TOOLTIP->update; 41 $TOOLTIP->update;
43 } 42 }
… …
141 140
142# call when resolution changes etc. 141# call when resolution changes etc.
143sub rescale_widgets { 142sub rescale_widgets {
144 my ($sx, $sy) = @_; 143 my ($sx, $sy) = @_;
145 144
145 # make a copy, otherwise for complains about freed values.
146 for my $widget (values %WIDGET) { 146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
147 if ($widget->{toplevel}) { 149 if ($widget->{toplevel}) {
148 $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};
149 $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};
150 $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};
151 $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};
… …
281sub set_max_size { 283sub set_max_size {
282 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
283 285
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
285 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 }
286} 299}
287 300
288# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
289sub coord2local { 302sub coord2local {
290 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
376 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
377 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
378 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
379 glEnd; 392 glEnd;
380 glPopMatrix; 393 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 } 395 }
383} 396}
384 397
385sub _draw { 398sub _draw {
386 my ($self) = @_; 399 my ($self) = @_;
… …
456 my $class = shift; 469 my $class = shift;
457 470
458 # range [value, low, high, page] 471 # range [value, low, high, page]
459 472
460 $class->SUPER::new ( 473 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
463 @_ 476 @_
464 ) 477 )
465} 478}
466 479
467sub _draw { 480sub _draw {
468 my ($self) = @_; 481 my ($self) = @_;
469 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
471 489
472 glEnable GL_BLEND; 490 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
475 493
476 glBegin GL_QUADS; 494 glBegin GL_QUADS;
477 glVertex 0 , 0; 495 glVertex 0 , 0;
478 glVertex 0 , $h; 496 glVertex 0 , $h;
479 glVertex $w, $h; 497 glVertex $w, $h;
480 glVertex $w, 0; 498 glVertex $w, 0;
481 glEnd; 499 glEnd;
482 500
483 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
484} 503}
485 504
486############################################################################# 505#############################################################################
487 506
488package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
896 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
897 916
898 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
900 919
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902 if $self->{title}; 921 if $self->{title};
903 922
904 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
905} 924}
906 925
… …
1267 1286
1268############################################################################# 1287#############################################################################
1269 1288
1270package CFClient::UI::Label; 1289package CFClient::UI::Label;
1271 1290
1272our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1273 1292
1274use CFClient::OpenGL; 1293use CFClient::OpenGL;
1275 1294
1276sub new { 1295sub new {
1277 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1278 1297
1279 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1281 #font => default_font 1302 #font => default_font
1282 #text => initial text 1303 #text => initial text
1283 #markup => initial narkup 1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1307 layout => (new CFClient::Layout),
1285 fontsize => 1, 1308 fontsize => 1,
1286 align => -1, 1309 align => -1,
1287 valign => -1, 1310 valign => -1,
1288 padding => 2, 1311 padding => 2,
… …
1303 } 1326 }
1304 1327
1305 $self 1328 $self
1306} 1329}
1307 1330
1308sub escape { 1331sub escape($) {
1309 local $_ = $_[1]; 1332 local $_ = $_[0];
1310 1333
1311 s/&/&amp;/g; 1334 s/&/&amp;/g;
1312 s/>/&gt;/g; 1335 s/>/&gt;/g;
1313 s/</&lt;/g; 1336 s/</&lt;/g;
1314 1337
1315 $_[1] 1338 $_
1316} 1339}
1317 1340
1318sub update { 1341sub update {
1319 my ($self) = @_; 1342 my ($self) = @_;
1320 1343
… …
1353sub size_request { 1376sub size_request {
1354 my ($self) = @_; 1377 my ($self) = @_;
1355 1378
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 1380 $self->{layout}->set_width ($self->{max_w} || -1);
1381 $self->{layout}->set_ellipsise ($self->{ellipsise});
1382 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1384
1360 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1361 1386
1362 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1392} 1417}
1393 1418
1394sub _draw { 1419sub _draw {
1395 my ($self) = @_; 1420 my ($self) = @_;
1396 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1397 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1425 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $self->{layout}->set_width ($self->{w}); 1427 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1431
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404 1433
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1436 : ($self->{w} - $tex->{w}) * 0.5);
1408 1437
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1440 : ($self->{h} - $tex->{h}) * 0.5);
1412 1441
1413 $tex 1442 $tex
1414 }; 1443 };
1415 1444
1416 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
… …
1471sub set_text { 1500sub set_text {
1472 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1473 1502
1474 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1504 $self->_set_text ($text);
1505 $self->update;
1476 $self->check_size; 1506 $self->check_size;
1477 $self->update;
1478} 1507}
1479 1508
1480sub get_text { 1509sub get_text {
1481 $_[0]{text} 1510 $_[0]{text}
1482} 1511}
… …
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1523 } 1552 }
1524 1553
1525 $self->_set_text ($text); 1554 $self->_set_text ($text);
1526 $self->update; 1555 $self->update;
1556 $self->check_size;
1527} 1557}
1528 1558
1529sub focus_in { 1559sub focus_in {
1530 my ($self) = @_; 1560 my ($self) = @_;
1531 1561
… …
1660 my $class = shift; 1690 my $class = shift;
1661 1691
1662 $class->SUPER::new ( 1692 $class->SUPER::new (
1663 padding => 4, 1693 padding => 4,
1664 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1667 can_hover => 1, 1696 can_hover => 1,
1668 align => 0, 1697 align => 0,
1669 valign => 0, 1698 valign => 0,
1670 can_events => 1, 1699 can_events => 1,
… …
1718 1747
1719 $class->SUPER::new ( 1748 $class->SUPER::new (
1720 padding => 2, 1749 padding => 2,
1721 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1751 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1754 state => 0,
1724 can_hover => 1, 1755 can_hover => 1,
1725 @_ 1756 @_
1726 ) 1757 )
1727} 1758}
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
2012 2043
2013sub new { 2044sub new {
2014 my $class = shift; 2045 my $class = shift;
2015 2046
2016 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
2017 2048
2018 # TODO: 0-width page 2049 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2051 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2054 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
2025 req_w => $::WIDTH / 80, 2058 req_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2059 req_h => $::WIDTH / 80,
2027 vertical => 0, 2060 vertical => 0,
2028 can_hover => 1, 2061 can_hover => 1,
2029 inner_pad => 5, 2062 inner_pad => .05,
2030 @_ 2063 @_
2031 ); 2064 );
2032 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
2033 $self 2069 $self
2070}
2071
2072sub set_value {
2073 my ($self, $value) = @_;
2074
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076
2077 $hi = $lo + 1 if $hi <= $lo;
2078
2079 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi;
2081
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit;
2084
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088
2089 if ($value != $old_value) {
2090 $self->emit (changed => $value);
2091 $self->update;
2092 }
2034} 2093}
2035 2094
2036sub size_request { 2095sub size_request {
2037 my ($self) = @_; 2096 my ($self) = @_;
2038 2097
… …
2051 2110
2052sub mouse_motion { 2111sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
2054 2113
2055 if ($GRAB == $self) { 2114 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116
2117 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2120
2121 $self->set_value ($x * ($hi - $lo) + $lo);
2122 }
2123}
2124
2125sub update {
2126 my ($self) = @_;
2127
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]);
2130
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
2057 2132
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
2059 2134
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2062 2136
2063 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2139
2069 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2070 $self->update; 2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value;
2146 $self->{knob_w} = $page;
2071 } 2147 });
2072}
2073 2148
2074# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080} 2150}
2081 2151
2082sub _draw { 2152sub _draw {
2083 my ($self) = @_; 2153 my ($self) = @_;
2084 2154
2085 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2086 2156
2087 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2088 2158
2089 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2091 2161
2162 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2163 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2164 }
2097 2165
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2168
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2171
2122 # draw background 2172 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2174
2125 # draw handle 2175 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2177
2128 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2129} 2179}
2130 2180
2131############################################################################# 2181#############################################################################
… …
2385 2435
2386sub set_tooltip_from { 2436sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2437 my ($self, $widget) = @_;
2388 2438
2389 $self->add (new CFClient::UI::Label 2439 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2440 markup => $widget->{tooltip},
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2442 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2446 );
2396} 2447}
2397 2448
2398sub size_request { 2449sub size_request {
2399 my ($self) = @_; 2450 my ($self) = @_;
… …
2477 2528
2478package CFClient::UI::InventoryItem; 2529package CFClient::UI::InventoryItem;
2479 2530
2480our @ISA = CFClient::UI::HBox::; 2531our @ISA = CFClient::UI::HBox::;
2481 2532
2533sub _item_to_desc {
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2482sub new { 2559sub new {
2483 my $class = shift; 2560 my $class = shift;
2484 2561
2485 my %args = @_; 2562 my %args = @_;
2486 2563
2487 my $item = delete $args{item}; 2564 my $item = delete $args{item};
2488 2565
2489 my $desc = $item->{nrof} < 2 2566 my $desc = _item_to_desc ($item);
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493 2567
2494 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2495 can_hover => 1, 2569 can_hover => 1,
2496 can_events => 1, 2570 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc) 2571 tooltip => ((CFClient::UI::Label::escape $desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub { 2573 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_; 2574 my ($self, $ev, $x, $y) = @_;
2501 2575
2502 # todo: maybe put examine on 1? but should just be a tooltip :( 2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) { 2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2584 $::CONN->send ("move $targ $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) { 2585 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}"); 2586 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) { 2587 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new ( 2588 my @menu_items = (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2511 [ 2593 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") }, 2595 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ], 2596 ],
2519 )->popup ($ev); 2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2520 } 2600 }
2521 2601
2522 1 2602 1
2523 }, 2603 },
2524 %args 2604 %args
2525 ); 2605 );
2606
2526 2607
2527 $self->add (new CFClient::UI::Face 2608 $self->add (new CFClient::UI::Face
2528 can_events => 0, 2609 can_events => 0,
2529 face => $item->{face}, 2610 face => $item->{face},
2530 anim => $item->{anim}, 2611 anim => $item->{anim},
2531 animspeed => $item->{animspeed}, 2612 animspeed => $item->{animspeed},
2532 ); 2613 );
2533 2614
2534 $self->add (new CFClient::UI::Label 2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2535 can_events => 0, 2616
2536 text => $desc, 2617 $self->{item} = $item;
2537 ); 2618
2619 $self->update_item;
2538 2620
2539 $self 2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2540} 2630}
2541 2631
2542############################################################################# 2632#############################################################################
2543 2633
2544package CFClient::UI::Inventory; 2634package CFClient::UI::Inventory;
… …
2568 } @$items; 2658 } @$items;
2569 2659
2570 $self->{real_items} = \@items; 2660 $self->{real_items} = \@items;
2571 2661
2572 for my $item (@items) { 2662 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2578 } 2665 }
2579 2666
2580 $self->{scrolled}->add (@items); 2667 $self->{scrolled}->add (@items);
2581 2668
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
… …
2663 2750
2664package CFClient::UI::Statusbox; 2751package CFClient::UI::Statusbox;
2665 2752
2666our @ISA = CFClient::UI::VBox::; 2753our @ISA = CFClient::UI::VBox::;
2667 2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2761 )
2762}
2763
2668sub reorder { 2764sub reorder {
2669 my ($self) = @_; 2765 my ($self) = @_;
2670 my $NOW = time; 2766 my $NOW = time;
2671 2767
2672 while (my ($k, $v) = each %{ $self->{item} }) { 2768 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 2786 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 2787 : $item->{text};
2692 2788
2693 for ($short) { 2789 for ($short) {
2694 s/^\s+//; 2790 s/^\s+//;
2695 s/\012.*/…/s; 2791 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 2792 }
2699 2793
2700 new CFClient::UI::Label 2794 new CFClient::UI::Label
2701 markup => $short, 2795 markup => $short,
2702 tooltip => $item->{tooltip}, 2796 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 2797 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 2798 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 2801 fg => $item->{fg},
2707 can_events => 1, 2802 can_events => 1,
2708 can_hover => 1 2803 can_hover => 1
2709 }; 2804 };
2710 } 2805 }
2711 2806
… …
2737 $self->{item}{$group} = { 2832 $self->{item}{$group} = {
2738 id => ++$self->{id}, 2833 id => ++$self->{id},
2739 text => $text, 2834 text => $text,
2740 timeout => $timeout, 2835 timeout => $timeout,
2741 tooltip => $text, 2836 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 2837 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 2838 pri => 0,
2745 count => 1, 2839 count => 1,
2746 %arg, 2840 %arg,
2747 }; 2841 };
2748 } 2842 }
2749 2843
2750 $self->reorder; 2844 $self->reorder;
2751} 2845}
2752 2846
2847sub reconfigure {
2848 my ($self) = @_;
2849
2850 delete $_->{label}
2851 for values %{ $self->{item} || {} };
2852
2853 $self->reorder;
2854 $self->SUPER::reconfigure;
2855}
2856
2753############################################################################# 2857#############################################################################
2754 2858
2755package CFClient::UI::Root; 2859package CFClient::UI::Root;
2756 2860
2757our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
… …
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797 2901
2798 for my $child ($self->children) { 2902 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 2904
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906 if exists $child->{req_x};
2907
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909 if exists $child->{req_y};
2910
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913
2803 $child->configure ($X, $Y, $W, $H); 2914 $child->configure ($X, $Y, $W, $H);
2804 } 2915 }
2805} 2916}
2806 2917
2807sub coord2local { 2918sub coord2local {
… …
2923############################################################################# 3034#############################################################################
2924 3035
2925package CFClient::UI; 3036package CFClient::UI;
2926 3037
2927$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3040
29301 30411
2931 3042

Diff Legend

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