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.217 by root, Fri May 19 23:18:42 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;
… …
672 $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 {
673 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
675 694
676 $self->_render; 695 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 696 };
685} 697}
686 698
687sub _draw { 699sub _draw {
688 my ($self) = @_; 700 my ($self) = @_;
… …
692 my $tex = $self->{texture} 704 my $tex = $self->{texture}
693 or return; 705 or return;
694 706
695 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
698 710
699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700 712
701 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
702} 714}
… …
785 $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}));
786 }, 798 },
787 ; 799 ;
788 800
789 $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 802 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 803 slider => $slider,
792 @_, 804 @_,
793 ); 805 );
794 806
795 $self->{vp}->add ($self->{scrolled}); 807 $self->{vp}->add ($self->{scrolled});
… …
896 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
897 909
898 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
900 912
901 $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)
902 if $self->{title}; 914 if $self->{title};
903 915
904 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
905} 917}
906 918
… …
1267 1279
1268############################################################################# 1280#############################################################################
1269 1281
1270package CFClient::UI::Label; 1282package CFClient::UI::Label;
1271 1283
1272our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1273 1285
1274use CFClient::OpenGL; 1286use CFClient::OpenGL;
1275 1287
1276sub new { 1288sub new {
1277 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1278 1290
1279 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1281 #font => default_font 1295 #font => default_font
1282 #text => initial text 1296 #text => initial text
1283 #markup => initial narkup 1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1300 layout => (new CFClient::Layout),
1285 fontsize => 1, 1301 fontsize => 1,
1286 align => -1, 1302 align => -1,
1287 valign => -1, 1303 valign => -1,
1288 padding => 2, 1304 padding => 2,
… …
1303 } 1319 }
1304 1320
1305 $self 1321 $self
1306} 1322}
1307 1323
1308sub escape { 1324sub escape($) {
1309 local $_ = $_[1]; 1325 local $_ = $_[0];
1310 1326
1311 s/&/&amp;/g; 1327 s/&/&amp;/g;
1312 s/>/&gt;/g; 1328 s/>/&gt;/g;
1313 s/</&lt;/g; 1329 s/</&lt;/g;
1314 1330
1315 $_[1] 1331 $_
1316} 1332}
1317 1333
1318sub update { 1334sub update {
1319 my ($self) = @_; 1335 my ($self) = @_;
1320 1336
… …
1353sub size_request { 1369sub size_request {
1354 my ($self) = @_; 1370 my ($self) = @_;
1355 1371
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $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});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1377
1360 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1361 1379
1362 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1392} 1410}
1393 1411
1394sub _draw { 1412sub _draw {
1395 my ($self) = @_; 1413 my ($self) = @_;
1396 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1397 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $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});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1424
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1404 1426
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1429 : ($self->{w} - $tex->{w}) * 0.5);
1408 1430
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1433 : ($self->{h} - $tex->{h}) * 0.5);
1412 1434
1413 $tex 1435 $tex
1414 }; 1436 };
1415 1437
1416 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
… …
1471sub set_text { 1493sub set_text {
1472 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1473 1495
1474 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1497 $self->_set_text ($text);
1498 $self->update;
1476 $self->check_size; 1499 $self->check_size;
1477 $self->update;
1478} 1500}
1479 1501
1480sub get_text { 1502sub get_text {
1481 $_[0]{text} 1503 $_[0]{text}
1482} 1504}
… …
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1523 } 1545 }
1524 1546
1525 $self->_set_text ($text); 1547 $self->_set_text ($text);
1526 $self->update; 1548 $self->update;
1549 $self->check_size;
1527} 1550}
1528 1551
1529sub focus_in { 1552sub focus_in {
1530 my ($self) = @_; 1553 my ($self) = @_;
1531 1554
… …
1660 my $class = shift; 1683 my $class = shift;
1661 1684
1662 $class->SUPER::new ( 1685 $class->SUPER::new (
1663 padding => 4, 1686 padding => 4,
1664 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1667 can_hover => 1, 1689 can_hover => 1,
1668 align => 0, 1690 align => 0,
1669 valign => 0, 1691 valign => 0,
1670 can_events => 1, 1692 can_events => 1,
… …
1718 1740
1719 $class->SUPER::new ( 1741 $class->SUPER::new (
1720 padding => 2, 1742 padding => 2,
1721 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1722 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],
1723 state => 0, 1747 state => 0,
1724 can_hover => 1, 1748 can_hover => 1,
1725 @_ 1749 @_
1726 ) 1750 )
1727} 1751}
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
2012 2036
2013sub new { 2037sub new {
2014 my $class = shift; 2038 my $class = shift;
2015 2039
2016 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
2017 2041
2018 # TODO: 0-width page 2042 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2044 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2023 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],
2024 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2025 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2027 vertical => 0, 2053 vertical => 0,
2028 can_hover => 1, 2054 can_hover => 1,
2029 inner_pad => 5, 2055 inner_pad => 0.02,
2030 @_ 2056 @_
2031 ); 2057 );
2032 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
2033 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
2034} 2086}
2035 2087
2036sub size_request { 2088sub size_request {
2037 my ($self) = @_; 2089 my ($self) = @_;
2038 2090
… …
2051 2103
2052sub mouse_motion { 2104sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2054 2106
2055 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2057 2125
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2059 2127
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2062 2129
2063 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $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 2132
2069 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2070 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
2071 } 2140 });
2072}
2073 2141
2074# the inner_* stuff is for generating a padding for the slider handle, 2142 $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} 2143}
2081 2144
2082sub _draw { 2145sub _draw {
2083 my ($self) = @_; 2146 my ($self) = @_;
2084 2147
2085 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2086 2149
2087 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2088 2151
2089 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2091 2154
2155 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2157 }
2097 2158
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2161
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; 2162 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2164
2122 # draw background 2165 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2167
2125 # draw handle 2168 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2170
2128 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2129} 2172}
2130 2173
2131############################################################################# 2174#############################################################################
… …
2234 2277
2235 delete $self->{texture}; 2278 delete $self->{texture};
2236 } 2279 }
2237 2280
2238 $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 {
2239 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2241 2284
2242 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244 2287
… …
2276 my ($self) = @_; 2319 my ($self) = @_;
2277 2320
2278 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2281 $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});
2282 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2283 2326
2284 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2285 2328
2286} 2329}
… …
2385 2428
2386sub set_tooltip_from { 2429sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2430 my ($self, $widget) = @_;
2388 2431
2389 $self->add (new CFClient::UI::Label 2432 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2433 markup => $widget->{tooltip},
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2435 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2439 );
2396} 2440}
2397 2441
2398sub size_request { 2442sub size_request {
2399 my ($self) = @_; 2443 my ($self) = @_;
… …
2445use CFClient::OpenGL; 2489use CFClient::OpenGL;
2446 2490
2447sub new { 2491sub new {
2448 my $class = shift; 2492 my $class = shift;
2449 2493
2450 $class->SUPER::new ( 2494 my $self = $class->SUPER::new (
2451 aspect => 1, 2495 aspect => 1,
2452 @_, 2496 @_,
2453 ) 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
2454} 2514}
2455 2515
2456sub size_request { 2516sub size_request {
2457 (32, 8) 2517 (32, 8)
2458} 2518}
2459 2519
2460sub _draw { 2520sub _draw {
2461 my ($self) = @_; 2521 my ($self) = @_;
2462 2522
2463 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
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2535
2466 # TODO animation
2467 if ($tex) { 2536 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2537 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2539 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2541 glDisable GL_TEXTURE_2D;
2473 } 2542 }
2474} 2543}
2475 2544
2545sub DESTROY {
2546 my ($self) = @_;
2547
2548 $self->{timer}->cancel
2549 if $self->{timer};
2550
2551 $self->SUPER::DESTROY;
2552}
2553
2476############################################################################# 2554#############################################################################
2477 2555
2478package CFClient::UI::InventoryItem; 2556package CFClient::UI::InventoryItem;
2479 2557
2480our @ISA = CFClient::UI::HBox::; 2558our @ISA = CFClient::UI::HBox::;
2559
2560sub _item_to_desc {
2561 my ($item) = @_;
2562
2563 my $desc =
2564 $item->{nrof} < 2
2565 ? $item->{name}
2566 : "$item->{nrof} × $item->{name_pl}";
2567
2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2569 and $desc .= " (open)";
2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2571 and $desc .= " (applied)";
2572 $item->{flags} & Crossfire::Protocol::F_UNPAID
2573 and $desc .= " (unpaid)";
2574 $item->{flags} & Crossfire::Protocol::F_MAGIC
2575 and $desc .= " (magic)";
2576 $item->{flags} & Crossfire::Protocol::F_CURSED
2577 and $desc .= " (cursed)";
2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2579 and $desc .= " (damned)";
2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2581 and $desc .= " *";
2582
2583 $desc
2584}
2481 2585
2482sub new { 2586sub new {
2483 my $class = shift; 2587 my $class = shift;
2484 2588
2485 my %args = @_; 2589 my %args = @_;
2486 2590
2487 my $item = delete $args{item}; 2591 my $item = delete $args{item};
2488 2592
2489 my $desc = $item->{nrof} < 2 2593 my $desc = _item_to_desc ($item);
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493 2594
2494 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
2495 can_hover => 1, 2596 can_hover => 1,
2496 can_events => 1, 2597 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc) 2598 tooltip => ((CFClient::UI::Label::escape $desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub { 2600 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_; 2601 my ($self, $ev, $x, $y) = @_;
2501 2602
2502 # 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 :(
2503 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
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2611 $::CONN->send ("move $targ $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) { 2612 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}"); 2613 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) { 2614 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new ( 2615 my @menu_items = (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2511 [ 2620 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2621 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") }, 2622 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 ], 2623 ],
2519 )->popup ($ev); 2624 );
2625
2626 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2520 } 2627 }
2521 2628
2522 1 2629 1
2523 }, 2630 },
2524 %args 2631 %args
2525 ); 2632 );
2633
2526 2634
2527 $self->add (new CFClient::UI::Face 2635 $self->add (new CFClient::UI::Face
2528 can_events => 0, 2636 can_events => 0,
2529 face => $item->{face}, 2637 face => $item->{face},
2530 anim => $item->{anim}, 2638 anim => $item->{anim},
2531 animspeed => $item->{animspeed}, 2639 animspeed => $item->{animspeed},
2532 ); 2640 );
2533 2641
2534 $self->add (new CFClient::UI::Label 2642 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2535 can_events => 0, 2643
2536 text => $desc, 2644 $self->{item} = $item;
2537 ); 2645
2646 $self->update_item;
2538 2647
2539 $self 2648 $self
2649}
2650
2651sub update_item {
2652 my ($self) = @_;
2653
2654 my $desc = _item_to_desc ($self->{item});
2655
2656 $self->{name_lbl}->set_text ($desc);
2540} 2657}
2541 2658
2542############################################################################# 2659#############################################################################
2543 2660
2544package CFClient::UI::Inventory; 2661package CFClient::UI::Inventory;
… …
2568 } @$items; 2685 } @$items;
2569 2686
2570 $self->{real_items} = \@items; 2687 $self->{real_items} = \@items;
2571 2688
2572 for my $item (@items) { 2689 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; 2690 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2691 $item->update_item ();
2578 } 2692 }
2579 2693
2580 $self->{scrolled}->add (@items); 2694 $self->{scrolled}->add (@items);
2581 2695
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2696# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
… …
2663 2777
2664package CFClient::UI::Statusbox; 2778package CFClient::UI::Statusbox;
2665 2779
2666our @ISA = CFClient::UI::VBox::; 2780our @ISA = CFClient::UI::VBox::;
2667 2781
2782sub new {
2783 my $class = shift;
2784
2785 $class->SUPER::new (
2786 fontsize => 0.8,
2787 @_,
2788 )
2789}
2790
2668sub reorder { 2791sub reorder {
2669 my ($self) = @_; 2792 my ($self) = @_;
2670 my $NOW = time; 2793 my $NOW = time;
2671 2794
2672 while (my ($k, $v) = each %{ $self->{item} }) { 2795 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 2813 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 2814 : $item->{text};
2692 2815
2693 for ($short) { 2816 for ($short) {
2694 s/^\s+//; 2817 s/^\s+//;
2695 s/\012.*/…/s; 2818 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 2819 }
2699 2820
2700 new CFClient::UI::Label 2821 new CFClient::UI::Label
2701 markup => $short, 2822 markup => $short,
2702 tooltip => $item->{tooltip}, 2823 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 2824 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 2825 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 2826 fontsize => $item->{fontsize} || $self->{fontsize},
2827 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 2828 fg => $item->{fg},
2707 can_events => 1, 2829 can_events => 1,
2708 can_hover => 1 2830 can_hover => 1
2709 }; 2831 };
2710 } 2832 }
2711 2833
… …
2737 $self->{item}{$group} = { 2859 $self->{item}{$group} = {
2738 id => ++$self->{id}, 2860 id => ++$self->{id},
2739 text => $text, 2861 text => $text,
2740 timeout => $timeout, 2862 timeout => $timeout,
2741 tooltip => $text, 2863 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 2864 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 2865 pri => 0,
2745 count => 1, 2866 count => 1,
2746 %arg, 2867 %arg,
2747 }; 2868 };
2748 } 2869 }
2749 2870
2750 $self->reorder; 2871 $self->reorder;
2751} 2872}
2752 2873
2874sub reconfigure {
2875 my ($self) = @_;
2876
2877 delete $_->{label}
2878 for values %{ $self->{item} || {} };
2879
2880 $self->reorder;
2881 $self->SUPER::reconfigure;
2882}
2883
2753############################################################################# 2884#############################################################################
2754 2885
2755package CFClient::UI::Root; 2886package CFClient::UI::Root;
2756 2887
2757our @ISA = CFClient::UI::Container::; 2888our @ISA = CFClient::UI::Container::;
… …
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 2927 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797 2928
2798 for my $child ($self->children) { 2929 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2930 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 2931
2932 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2933 if exists $child->{req_x};
2934
2935 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2936 if exists $child->{req_y};
2937
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2938 $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; 2939 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2940
2803 $child->configure ($X, $Y, $W, $H); 2941 $child->configure ($X, $Y, $W, $H);
2804 } 2942 }
2805} 2943}
2806 2944
2807sub coord2local { 2945sub coord2local {
… …
2923############################################################################# 3061#############################################################################
2924 3062
2925package CFClient::UI; 3063package CFClient::UI;
2926 3064
2927$ROOT = new CFClient::UI::Root; 3065$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3066$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3067
29301 30681
2931 3069

Diff Legend

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