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.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.215 by root, Fri May 19 03:49:48 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};
… …
199sub show { 201sub show {
200 my ($self) = @_; 202 my ($self) = @_;
201 203
202 return if $self->{parent}; 204 return if $self->{parent};
203 205
204 $self->{toplevel} = 1;
205 $CFClient::UI::ROOT->add ($self); 206 $CFClient::UI::ROOT->add ($self);
206} 207}
207 208
208sub hide { 209sub hide {
209 my ($self) = @_; 210 my ($self) = @_;
… …
282sub set_max_size { 283sub set_max_size {
283 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
284 285
285 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
286 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 }
287} 299}
288 300
289# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
290sub coord2local { 302sub coord2local {
291 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
377 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
378 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
379 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
380 glEnd; 392 glEnd;
381 glPopMatrix; 393 glPopMatrix;
382 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;
383 } 395 }
384} 396}
385 397
386sub _draw { 398sub _draw {
387 my ($self) = @_; 399 my ($self) = @_;
… …
457 my $class = shift; 469 my $class = shift;
458 470
459 # range [value, low, high, page] 471 # range [value, low, high, page]
460 472
461 $class->SUPER::new ( 473 $class->SUPER::new (
462 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
463 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
464 @_ 476 @_
465 ) 477 )
466} 478}
467 479
468sub _draw { 480sub _draw {
469 my ($self) = @_; 481 my ($self) = @_;
470 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
471 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
472 489
473 glEnable GL_BLEND; 490 glEnable GL_BLEND;
474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
475 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
476 493
477 glBegin GL_QUADS; 494 glBegin GL_QUADS;
478 glVertex 0 , 0; 495 glVertex 0 , 0;
479 glVertex 0 , $h; 496 glVertex 0 , $h;
480 glVertex $w, $h; 497 glVertex $w, $h;
481 glVertex $w, 0; 498 glVertex $w, 0;
482 glEnd; 499 glEnd;
483 500
484 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
485} 503}
486 504
487############################################################################# 505#############################################################################
488 506
489package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
669 687
670sub render_child { 688sub render_child {
671 my ($self) = @_; 689 my ($self) = @_;
672 690
673 $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 {
674 glClearColor 0, 0, 0, 0; 692 glClearColor 0.5, 0.5, 0.5, 1;
675 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
676 694
677 $self->_render; 695 $self->_render;
678# glColorMask 1, 1, 1, 0;
679# glEnable GL_BLEND;
680# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
681# glRasterPos 0, 0;
682# glCopyPixels 0, 0, $self->{w}, $self->{h};
683# glDisable GL_BLEND;
684# glColorMask 1, 1, 1, 1;
685 }; 696 };
686} 697}
687 698
688sub _draw { 699sub _draw {
689 my ($self) = @_; 700 my ($self) = @_;
… …
693 my $tex = $self->{texture} 704 my $tex = $self->{texture}
694 or return; 705 or return;
695 706
696 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
698 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
699 710
700 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
701 712
702 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
703} 714}
… …
897 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
898 909
899 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
900 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
901 912
902 $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)
903 if $self->{title}; 914 if $self->{title};
904 915
905 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
906} 917}
907 918
… …
1268 1279
1269############################################################################# 1280#############################################################################
1270 1281
1271package CFClient::UI::Label; 1282package CFClient::UI::Label;
1272 1283
1273our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1274 1285
1275use CFClient::OpenGL; 1286use CFClient::OpenGL;
1276 1287
1277sub new { 1288sub new {
1278 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1279 1290
1280 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1281 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1282 #font => default_font 1295 #font => default_font
1283 #text => initial text 1296 #text => initial text
1284 #markup => initial narkup 1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1285 layout => (new CFClient::Layout), 1300 layout => (new CFClient::Layout),
1286 fontsize => 1, 1301 fontsize => 1,
1287 align => -1, 1302 align => -1,
1288 valign => -1, 1303 valign => -1,
1289 padding => 2, 1304 padding => 2,
… …
1304 } 1319 }
1305 1320
1306 $self 1321 $self
1307} 1322}
1308 1323
1309sub escape { 1324sub escape($) {
1310 local $_ = $_[1]; 1325 local $_ = $_[0];
1311 1326
1312 s/&/&amp;/g; 1327 s/&/&amp;/g;
1313 s/>/&gt;/g; 1328 s/>/&gt;/g;
1314 s/</&lt;/g; 1329 s/</&lt;/g;
1315 1330
1316 $_[1] 1331 $_
1317} 1332}
1318 1333
1319sub update { 1334sub update {
1320 my ($self) = @_; 1335 my ($self) = @_;
1321 1336
… …
1354sub size_request { 1369sub size_request {
1355 my ($self) = @_; 1370 my ($self) = @_;
1356 1371
1357 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1358 $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});
1359 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1360 1377
1361 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1362 1379
1363 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1393} 1410}
1394 1411
1395sub _draw { 1412sub _draw {
1396 my ($self) = @_; 1413 my ($self) = @_;
1397 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1398 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1399 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $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});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1403 1424
1404 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1405 1426
1406 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1407 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1408 : ($self->{w} - $tex->{w}) * 0.5; 1429 : ($self->{w} - $tex->{w}) * 0.5);
1409 1430
1410 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1411 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1412 : ($self->{h} - $tex->{h}) * 0.5; 1433 : ($self->{h} - $tex->{h}) * 0.5);
1413 1434
1414 $tex 1435 $tex
1415 }; 1436 };
1416 1437
1417 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
… …
1472sub set_text { 1493sub set_text {
1473 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1474 1495
1475 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1476 $self->_set_text ($text); 1497 $self->_set_text ($text);
1498 $self->update;
1477 $self->check_size; 1499 $self->check_size;
1478 $self->update;
1479} 1500}
1480 1501
1481sub get_text { 1502sub get_text {
1482 $_[0]{text} 1503 $_[0]{text}
1483} 1504}
… …
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1545 }
1525 1546
1526 $self->_set_text ($text); 1547 $self->_set_text ($text);
1527 $self->update; 1548 $self->update;
1549 $self->check_size;
1528} 1550}
1529 1551
1530sub focus_in { 1552sub focus_in {
1531 my ($self) = @_; 1553 my ($self) = @_;
1532 1554
… …
1661 my $class = shift; 1683 my $class = shift;
1662 1684
1663 $class->SUPER::new ( 1685 $class->SUPER::new (
1664 padding => 4, 1686 padding => 4,
1665 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1668 can_hover => 1, 1689 can_hover => 1,
1669 align => 0, 1690 align => 0,
1670 valign => 0, 1691 valign => 0,
1671 can_events => 1, 1692 can_events => 1,
… …
1719 1740
1720 $class->SUPER::new ( 1741 $class->SUPER::new (
1721 padding => 2, 1742 padding => 2,
1722 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1723 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],
1724 state => 0, 1747 state => 0,
1725 can_hover => 1, 1748 can_hover => 1,
1726 @_ 1749 @_
1727 ) 1750 )
1728} 1751}
… …
2012 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
2013 2036
2014sub new { 2037sub new {
2015 my $class = shift; 2038 my $class = shift;
2016 2039
2017 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
2018 2041
2019 # TODO: 0-width page 2042 # TODO: 0-width page
2020 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
2021 # TODO: calculations are off 2044 # TODO: calculations are off
2022 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2023 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2024 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],
2025 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2026 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2027 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2028 vertical => 0, 2053 vertical => 0,
2029 can_hover => 1, 2054 can_hover => 1,
2030 inner_pad => 5, 2055 inner_pad => .05,
2031 @_ 2056 @_
2032 ); 2057 );
2033 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
2034 $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 }
2035} 2086}
2036 2087
2037sub size_request { 2088sub size_request {
2038 my ($self) = @_; 2089 my ($self) = @_;
2039 2090
… …
2052 2103
2053sub mouse_motion { 2104sub mouse_motion {
2054 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2055 2106
2056 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
2057 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2058 2125
2059 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2060 2127
2061 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2062 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2063 2129
2064 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2065 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
2066 $x = $lo if $x < $lo;
2067 $x = $hi - $page if $x > $hi - $page;
2068 $self->{range}[0] = $x;
2069 2132
2070 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2071 $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;
2072 } 2140 });
2073}
2074 2141
2075# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
2076# so that the handle doesn't leave the texture. This calculation isn't 100%
2077# correct propably, but it does the job for now
2078sub _calc_inner_pad_px {
2079 my ($self, $w) = @_;
2080 ($w / 100) * $self->{inner_pad} # % to pixels
2081} 2143}
2082 2144
2083sub _draw { 2145sub _draw {
2084 my ($self) = @_; 2146 my ($self) = @_;
2085 2147
2086 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2087 2149
2088 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2089 2151
2090 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2091 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2092 2154
2155 glTranslate 1, 0, 0;
2093 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2094 glTranslate 0, -$self->{w}, 0;
2095
2096 ($w, $h) = ($h, $w);
2097 } 2157 }
2098 2158
2099 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101 2161
2102 my ($value, $lo, $hi, $page) = @{$self->{range}};
2103
2104 $hi = $value + 1 if $lo == $hi;
2105
2106 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2107 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108
2109 $page = int $page * $inner_w / ($hi - $lo);
2110 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2111
2112 $w -= $page;
2113 $page &= ~1;
2114 glTranslate $page * 0.5, 0, 0;
2115 $page ||= 2;
2116
2117 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2118 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2119
2120 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
2121 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122 2164
2123 # draw background 2165 # draw background
2124 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125 2167
2126 # draw handle 2168 # draw handle
2127 $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);
2128 2170
2129 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2130} 2172}
2131 2173
2132############################################################################# 2174#############################################################################
… …
2235 2277
2236 delete $self->{texture}; 2278 delete $self->{texture};
2237 } 2279 }
2238 2280
2239 $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 {
2240 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2241 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2242 2284
2243 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245 2287
… …
2386 2428
2387sub set_tooltip_from { 2429sub set_tooltip_from {
2388 my ($self, $widget) = @_; 2430 my ($self, $widget) = @_;
2389 2431
2390 $self->add (new CFClient::UI::Label 2432 $self->add (new CFClient::UI::Label
2391 markup => $widget->{tooltip}, 2433 markup => $widget->{tooltip},
2392 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2393 fontsize => 0.8, 2435 fontsize => 0.8,
2394 fg => [0, 0, 0, 1], 2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2395 font => ($widget->{tooltip_font} || $::FONT_PROP), 2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2396 ); 2439 );
2397} 2440}
2398 2441
2399sub size_request { 2442sub size_request {
2400 my ($self) = @_; 2443 my ($self) = @_;
… …
2478 2521
2479package CFClient::UI::InventoryItem; 2522package CFClient::UI::InventoryItem;
2480 2523
2481our @ISA = CFClient::UI::HBox::; 2524our @ISA = CFClient::UI::HBox::;
2482 2525
2526sub _item_to_desc {
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2483sub new { 2552sub new {
2484 my $class = shift; 2553 my $class = shift;
2485 2554
2486 my %args = @_; 2555 my %args = @_;
2487 2556
2488 my $item = delete $args{item}; 2557 my $item = delete $args{item};
2489 2558
2490 my $desc = $item->{nrof} < 2 2559 my $desc = _item_to_desc ($item);
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494 2560
2495 my $self = $class->SUPER::new ( 2561 my $self = $class->SUPER::new (
2496 can_hover => 1, 2562 can_hover => 1,
2497 can_events => 1, 2563 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc) 2564 tooltip => ((CFClient::UI::Label::escape $desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub { 2566 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_; 2567 my ($self, $ev, $x, $y) = @_;
2502 2568
2503 # todo: maybe put examine on 1? but should just be a tooltip :( 2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) { 2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2577 $::CONN->send ("move $targ $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) { 2578 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}"); 2579 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) { 2580 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new ( 2581 my @menu_items = (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2512 [ 2586 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") }, 2588 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ], 2589 ],
2520 )->popup ($ev); 2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521 } 2593 }
2522 2594
2523 1 2595 1
2524 }, 2596 },
2525 %args 2597 %args
2526 ); 2598 );
2599
2527 2600
2528 $self->add (new CFClient::UI::Face 2601 $self->add (new CFClient::UI::Face
2529 can_events => 0, 2602 can_events => 0,
2530 face => $item->{face}, 2603 face => $item->{face},
2531 anim => $item->{anim}, 2604 anim => $item->{anim},
2532 animspeed => $item->{animspeed}, 2605 animspeed => $item->{animspeed},
2533 ); 2606 );
2534 2607
2535 $self->add (new CFClient::UI::Label 2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536 can_events => 0, 2609
2537 text => $desc, 2610 $self->{item} = $item;
2538 ); 2611
2612 $self->update_item;
2539 2613
2540 $self 2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2541} 2623}
2542 2624
2543############################################################################# 2625#############################################################################
2544 2626
2545package CFClient::UI::Inventory; 2627package CFClient::UI::Inventory;
… …
2569 } @$items; 2651 } @$items;
2570 2652
2571 $self->{real_items} = \@items; 2653 $self->{real_items} = \@items;
2572 2654
2573 for my $item (@items) { 2655 for my $item (@items) {
2574 my $desc = $item->{nrof} < 2
2575 ? $item->{name}
2576 : "$item->{nrof} $item->{name_pl}";
2577
2578 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2579 } 2658 }
2580 2659
2581 $self->{scrolled}->add (@items); 2660 $self->{scrolled}->add (@items);
2582 2661
2583# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
… …
2664 2743
2665package CFClient::UI::Statusbox; 2744package CFClient::UI::Statusbox;
2666 2745
2667our @ISA = CFClient::UI::VBox::; 2746our @ISA = CFClient::UI::VBox::;
2668 2747
2748sub new {
2749 my $class = shift;
2750
2751 $class->SUPER::new (
2752 fontsize => 0.8,
2753 @_,
2754 )
2755}
2756
2669sub reorder { 2757sub reorder {
2670 my ($self) = @_; 2758 my ($self) = @_;
2671 my $NOW = time; 2759 my $NOW = time;
2672 2760
2673 while (my ($k, $v) = each %{ $self->{item} }) { 2761 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2691 ? "<b>$item->{count} ×</b> $item->{text}" 2779 ? "<b>$item->{count} ×</b> $item->{text}"
2692 : $item->{text}; 2780 : $item->{text};
2693 2781
2694 for ($short) { 2782 for ($short) {
2695 s/^\s+//; 2783 s/^\s+//;
2696 s/\012.*/…/s; 2784 s/\s+/ /g;
2697 my $len = int 40 / $item->{fontsize};
2698 substr $_, $len, length, "…" if $len < length;
2699 } 2785 }
2700 2786
2701 new CFClient::UI::Label 2787 new CFClient::UI::Label
2702 markup => $short, 2788 markup => $short,
2703 tooltip => $item->{tooltip}, 2789 tooltip => $item->{tooltip},
2704 tooltip_font => $::FONT_PROP, 2790 tooltip_font => $::FONT_PROP,
2705 tooltip_width => 0.67, 2791 tooltip_width => 0.67,
2706 fontsize => $item->{fontsize}, 2792 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44,
2707 color => $item->{color}, 2794 fg => $item->{fg},
2708 can_events => 1, 2795 can_events => 1,
2709 can_hover => 1 2796 can_hover => 1
2710 }; 2797 };
2711 } 2798 }
2712 2799
… …
2738 $self->{item}{$group} = { 2825 $self->{item}{$group} = {
2739 id => ++$self->{id}, 2826 id => ++$self->{id},
2740 text => $text, 2827 text => $text,
2741 timeout => $timeout, 2828 timeout => $timeout,
2742 tooltip => $text, 2829 tooltip => $text,
2743 fontsize => 0.8,
2744 color => [0.8, 0.8, 0.8, 0.8], 2830 fg => [0.8, 0.8, 0.8, 0.8],
2745 pri => 0, 2831 pri => 0,
2746 count => 1, 2832 count => 1,
2747 %arg, 2833 %arg,
2748 }; 2834 };
2749 } 2835 }
2750 2836
2751 $self->reorder; 2837 $self->reorder;
2752} 2838}
2753 2839
2840sub reconfigure {
2841 my ($self) = @_;
2842
2843 delete $_->{label}
2844 for values %{ $self->{item} || {} };
2845
2846 $self->reorder;
2847 $self->SUPER::reconfigure;
2848}
2849
2754############################################################################# 2850#############################################################################
2755 2851
2756package CFClient::UI::Root; 2852package CFClient::UI::Root;
2757 2853
2758our @ISA = CFClient::UI::Container::; 2854our @ISA = CFClient::UI::Container::;
… …
2797 if $old_w && $old_h && ($old_w != $w || $old_h != $h); 2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2798 2894
2799 for my $child ($self->children) { 2895 for my $child ($self->children) {
2800 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2801 2897
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2899 if exists $child->{req_x};
2900
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2902 if exists $child->{req_y};
2903
2802 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2803 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906
2804 $child->configure ($X, $Y, $W, $H); 2907 $child->configure ($X, $Y, $W, $H);
2805 } 2908 }
2806} 2909}
2807 2910
2808sub coord2local { 2911sub coord2local {
… …
2823 $self->check_size; 2926 $self->check_size;
2824 $::WANT_REFRESH++; 2927 $::WANT_REFRESH++;
2825} 2928}
2826 2929
2827sub add { 2930sub add {
2828 my ($self, $child) = @_; 2931 my ($self, @children) = @_;
2829 2932
2933 for my $child (@children) {
2934 $child->{toplevel} = 1;
2935
2830 # integerise window positions 2936 # integerise window positions
2831 $child->{x} = int $child->{x}; 2937 $child->{x} = int $child->{x};
2832 $child->{y} = int $child->{y}; 2938 $child->{y} = int $child->{y};
2939 }
2833 2940
2834 $self->SUPER::add ($child); 2941 $self->SUPER::add (@children);
2835} 2942}
2836 2943
2837sub on_refresh { 2944sub on_refresh {
2838 my ($self, $id, $cb) = @_; 2945 my ($self, $id, $cb) = @_;
2839 2946
… …
2920############################################################################# 3027#############################################################################
2921 3028
2922package CFClient::UI; 3029package CFClient::UI;
2923 3030
2924$ROOT = new CFClient::UI::Root; 3031$ROOT = new CFClient::UI::Root;
2925$TOOLTIP = new CFClient::UI::Tooltip; 3032$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2926 3033
29271 30341
2928 3035

Diff Legend

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