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.204 by root, Sun May 14 22:24:16 2006 UTC vs.
Revision 1.213 by root, Wed May 17 15:18:57 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) = @_;
… …
375 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
378 glEnd; 392 glEnd;
379 glPopMatrix; 393 glPopMatrix;
380 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;
381 } 395 }
382} 396}
383 397
384sub _draw { 398sub _draw {
385 my ($self) = @_; 399 my ($self) = @_;
… …
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;
… …
895 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
896 916
897 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
899 919
900 $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)
901 if $self->{title}; 921 if $self->{title};
902 922
903 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
904} 924}
905 925
… …
1266 1286
1267############################################################################# 1287#############################################################################
1268 1288
1269package CFClient::UI::Label; 1289package CFClient::UI::Label;
1270 1290
1271our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1272 1292
1273use CFClient::OpenGL; 1293use CFClient::OpenGL;
1274 1294
1275sub new { 1295sub new {
1276 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1277 1297
1278 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1280 #font => default_font 1302 #font => default_font
1281 #text => initial text 1303 #text => initial text
1282 #markup => initial narkup 1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1307 layout => (new CFClient::Layout),
1284 fontsize => 1, 1308 fontsize => 1,
1285 align => -1, 1309 align => -1,
1286 valign => -1, 1310 valign => -1,
1287 padding => 2, 1311 padding => 2,
… …
1302 } 1326 }
1303 1327
1304 $self 1328 $self
1305} 1329}
1306 1330
1307sub escape { 1331sub escape($) {
1308 local $_ = $_[1]; 1332 local $_ = $_[0];
1309 1333
1310 s/&/&amp;/g; 1334 s/&/&amp;/g;
1311 s/>/&gt;/g; 1335 s/>/&gt;/g;
1312 s/</&lt;/g; 1336 s/</&lt;/g;
1313 1337
1314 $_[1] 1338 $_
1315} 1339}
1316 1340
1317sub update { 1341sub update {
1318 my ($self) = @_; 1342 my ($self) = @_;
1319 1343
… …
1352sub size_request { 1376sub size_request {
1353 my ($self) = @_; 1377 my ($self) = @_;
1354 1378
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $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});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1384
1359 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1360 1386
1361 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1391} 1417}
1392 1418
1393sub _draw { 1419sub _draw {
1394 my ($self) = @_; 1420 my ($self) = @_;
1395 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1396 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1425 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $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});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1431
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403 1433
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5; 1436 : ($self->{w} - $tex->{w}) * 0.5);
1407 1437
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5; 1440 : ($self->{h} - $tex->{h}) * 0.5);
1411 1441
1412 $tex 1442 $tex
1413 }; 1443 };
1414 1444
1415 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
… …
1470sub set_text { 1500sub set_text {
1471 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1472 1502
1473 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1504 $self->_set_text ($text);
1505 $self->update;
1475 $self->check_size; 1506 $self->check_size;
1476 $self->update;
1477} 1507}
1478 1508
1479sub get_text { 1509sub get_text {
1480 $_[0]{text} 1510 $_[0]{text}
1481} 1511}
… …
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1522 } 1552 }
1523 1553
1524 $self->_set_text ($text); 1554 $self->_set_text ($text);
1525 $self->update; 1555 $self->update;
1556 $self->check_size;
1526} 1557}
1527 1558
1528sub focus_in { 1559sub focus_in {
1529 my ($self) = @_; 1560 my ($self) = @_;
1530 1561
… …
1659 my $class = shift; 1690 my $class = shift;
1660 1691
1661 $class->SUPER::new ( 1692 $class->SUPER::new (
1662 padding => 4, 1693 padding => 4,
1663 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1666 can_hover => 1, 1696 can_hover => 1,
1667 align => 0, 1697 align => 0,
1668 valign => 0, 1698 valign => 0,
1669 can_events => 1, 1699 can_events => 1,
… …
1717 1747
1718 $class->SUPER::new ( 1748 $class->SUPER::new (
1719 padding => 2, 1749 padding => 2,
1720 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1721 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],
1722 state => 0, 1754 state => 0,
1723 can_hover => 1, 1755 can_hover => 1,
1724 @_ 1756 @_
1725 ) 1757 )
1726} 1758}
… …
2010 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
2011 2043
2012sub new { 2044sub new {
2013 my $class = shift; 2045 my $class = shift;
2014 2046
2015 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
2016 2048
2017 # TODO: 0-width page 2049 # TODO: 0-width page
2018 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2051 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
2022 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],
2023 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
2024 req_w => $::WIDTH / 80, 2058 req_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2059 req_h => $::WIDTH / 80,
2026 vertical => 0, 2060 vertical => 0,
2027 can_hover => 1, 2061 can_hover => 1,
2028 inner_pad => 5, 2062 inner_pad => .05,
2029 @_ 2063 @_
2030 ); 2064 );
2031 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
2032 $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 }
2033} 2093}
2034 2094
2035sub size_request { 2095sub size_request {
2036 my ($self) = @_; 2096 my ($self) = @_;
2037 2097
… …
2050 2110
2051sub mouse_motion { 2111sub mouse_motion {
2052 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
2053 2113
2054 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
2055 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
2056 2132
2057 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
2058 2134
2059 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2060 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2061 2136
2062 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2063 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
2064 $x = $lo if $x < $lo;
2065 $x = $hi - $page if $x > $hi - $page;
2066 $self->{range}[0] = $x;
2067 2139
2068 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2069 $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;
2070 } 2147 });
2071}
2072 2148
2073# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
2074# so that the handle doesn't leave the texture. This calculation isn't 100%
2075# correct propably, but it does the job for now
2076sub _calc_inner_pad_px {
2077 my ($self, $w) = @_;
2078 ($w / 100) * $self->{inner_pad} # % to pixels
2079} 2150}
2080 2151
2081sub _draw { 2152sub _draw {
2082 my ($self) = @_; 2153 my ($self) = @_;
2083 2154
2084 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2085 2156
2086 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2087 2158
2088 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2089 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2090 2161
2091 glRotate 90, 0, 0, 1; 2162 glRotate 90, 0, 0, 1;
2092 glTranslate 0, -$self->{w}, 0; 2163 glTranslate 0, 1, 0;
2093
2094 ($w, $h) = ($h, $w);
2095 } 2164 }
2096 2165
2097 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2098 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2099 2168
2100 my ($value, $lo, $hi, $page) = @{$self->{range}};
2101
2102 $hi = $value + 1 if $lo == $hi;
2103
2104 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2105 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2106
2107 $page = int $page * $inner_w / ($hi - $lo);
2108 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2109
2110 $w -= $page;
2111 $page &= ~1;
2112 glTranslate $page * 0.5, 0, 0;
2113 $page ||= 2;
2114
2115 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2116 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2117
2118 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2119 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2120 2171
2121 # draw background 2172 # draw background
2122 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2123 2174
2124 # draw handle 2175 # draw handle
2125 $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);
2126 2177
2127 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2128} 2179}
2129 2180
2130############################################################################# 2181#############################################################################
… …
2384 2435
2385sub set_tooltip_from { 2436sub set_tooltip_from {
2386 my ($self, $widget) = @_; 2437 my ($self, $widget) = @_;
2387 2438
2388 $self->add (new CFClient::UI::Label 2439 $self->add (new CFClient::UI::Label
2389 markup => $widget->{tooltip}, 2440 markup => $widget->{tooltip},
2390 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2391 fontsize => 0.8, 2442 fontsize => 0.8,
2392 fg => [0, 0, 0, 1], 2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2393 font => ($widget->{tooltip_font} || $::FONT_PROP), 2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2394 ); 2446 );
2395} 2447}
2396 2448
2397sub size_request { 2449sub size_request {
2398 my ($self) = @_; 2450 my ($self) = @_;
… …
2476 2528
2477package CFClient::UI::InventoryItem; 2529package CFClient::UI::InventoryItem;
2478 2530
2479our @ISA = CFClient::UI::HBox::; 2531our @ISA = CFClient::UI::HBox::;
2480 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
2481sub new { 2559sub new {
2482 my $class = shift; 2560 my $class = shift;
2483 2561
2484 my %args = @_; 2562 my %args = @_;
2485 2563
2486 my $item = delete $args{item}; 2564 my $item = delete $args{item};
2487 2565
2488 my $desc = $item->{nrof} < 2 2566 my $desc = _item_to_desc ($item);
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492 2567
2493 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2494 can_hover => 1, 2569 can_hover => 1,
2495 can_events => 1, 2570 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc) 2571 tooltip => ((CFClient::UI::Label::escape $desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub { 2573 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_; 2574 my ($self, $ev, $x, $y) = @_;
2500 2575
2501 # 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 :(
2502 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
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2584 $::CONN->send ("move $targ $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) { 2585 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}"); 2586 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) { 2587 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new ( 2588 my @menu_items = (
2508 items => [
2509 ["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") }],
2510 [ 2593 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") }, 2595 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ], 2596 ],
2518 )->popup ($ev); 2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519 } 2600 }
2520 2601
2521 1 2602 1
2522 }, 2603 },
2523 %args 2604 %args
2524 ); 2605 );
2606
2525 2607
2526 $self->add (new CFClient::UI::Face 2608 $self->add (new CFClient::UI::Face
2527 can_events => 0, 2609 can_events => 0,
2528 face => $item->{face}, 2610 face => $item->{face},
2529 anim => $item->{anim}, 2611 anim => $item->{anim},
2530 animspeed => $item->{animspeed}, 2612 animspeed => $item->{animspeed},
2531 ); 2613 );
2532 2614
2533 $self->add (new CFClient::UI::Label 2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2534 can_events => 0, 2616
2535 text => $desc, 2617 $self->{item} = $item;
2536 ); 2618
2619 $self->update_item;
2537 2620
2538 $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);
2539} 2630}
2540 2631
2541############################################################################# 2632#############################################################################
2542 2633
2543package CFClient::UI::Inventory; 2634package CFClient::UI::Inventory;
… …
2567 } @$items; 2658 } @$items;
2568 2659
2569 $self->{real_items} = \@items; 2660 $self->{real_items} = \@items;
2570 2661
2571 for my $item (@items) { 2662 for my $item (@items) {
2572 my $desc = $item->{nrof} < 2
2573 ? $item->{name}
2574 : "$item->{nrof} $item->{name_pl}";
2575
2576 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2577 } 2665 }
2578 2666
2579 $self->{scrolled}->add (@items); 2667 $self->{scrolled}->add (@items);
2580 2668
2581# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
… …
2662 2750
2663package CFClient::UI::Statusbox; 2751package CFClient::UI::Statusbox;
2664 2752
2665our @ISA = CFClient::UI::VBox::; 2753our @ISA = CFClient::UI::VBox::;
2666 2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2761 )
2762}
2763
2667sub reorder { 2764sub reorder {
2668 my ($self) = @_; 2765 my ($self) = @_;
2669 my $NOW = time; 2766 my $NOW = time;
2670 2767
2671 while (my ($k, $v) = each %{ $self->{item} }) { 2768 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2689 ? "<b>$item->{count} ×</b> $item->{text}" 2786 ? "<b>$item->{count} ×</b> $item->{text}"
2690 : $item->{text}; 2787 : $item->{text};
2691 2788
2692 for ($short) { 2789 for ($short) {
2693 s/^\s+//; 2790 s/^\s+//;
2694 s/\012.*/…/s; 2791 s/\s+/ /g;
2695 my $len = int 40 / $item->{fontsize};
2696 substr $_, $len, length, "…" if $len < length;
2697 } 2792 }
2698 2793
2699 new CFClient::UI::Label 2794 new CFClient::UI::Label
2700 markup => $short, 2795 markup => $short,
2701 tooltip => $item->{tooltip}, 2796 tooltip => $item->{tooltip},
2702 tooltip_font => $::FONT_PROP, 2797 tooltip_font => $::FONT_PROP,
2703 tooltip_width => 0.67, 2798 tooltip_width => 0.67,
2704 fontsize => $item->{fontsize}, 2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2705 color => $item->{color}, 2801 fg => $item->{fg},
2706 can_events => 1, 2802 can_events => 1,
2707 can_hover => 1 2803 can_hover => 1
2708 }; 2804 };
2709 } 2805 }
2710 2806
… …
2736 $self->{item}{$group} = { 2832 $self->{item}{$group} = {
2737 id => ++$self->{id}, 2833 id => ++$self->{id},
2738 text => $text, 2834 text => $text,
2739 timeout => $timeout, 2835 timeout => $timeout,
2740 tooltip => $text, 2836 tooltip => $text,
2741 fontsize => 0.8,
2742 color => [0.8, 0.8, 0.8, 0.8], 2837 fg => [0.8, 0.8, 0.8, 0.8],
2743 pri => 0, 2838 pri => 0,
2744 count => 1, 2839 count => 1,
2745 %arg, 2840 %arg,
2746 }; 2841 };
2747 } 2842 }
2748 2843
2749 $self->reorder; 2844 $self->reorder;
2750} 2845}
2751 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
2752############################################################################# 2857#############################################################################
2753 2858
2754package CFClient::UI::Root; 2859package CFClient::UI::Root;
2755 2860
2756our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
… …
2795 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2796 2901
2797 for my $child ($self->children) { 2902 for my $child ($self->children) {
2798 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)};
2799 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
2800 $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;
2801 $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
2802 $child->configure ($X, $Y, $W, $H); 2914 $child->configure ($X, $Y, $W, $H);
2803 } 2915 }
2804} 2916}
2805 2917
2806sub coord2local { 2918sub coord2local {
… …
2922############################################################################# 3034#############################################################################
2923 3035
2924package CFClient::UI; 3036package CFClient::UI;
2925 3037
2926$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2927$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2928 3040
29291 30411
2930 3042

Diff Legend

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