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.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.213 by root, Wed May 17 15:18:57 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size; 40 $TOOLTIP->check_size;
40 $TOOLTIP->update; 41 $TOOLTIP->update;
41 } 42 }
… …
132 133
133 for (@$vals) { 134 for (@$vals) {
134 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
135 $rem += $_ - $i; 136 $rem += $_ - $i;
136 $_ = $i; 137 $_ = $i;
138 }
139}
140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
137 } 161 }
138} 162}
139 163
140############################################################################# 164#############################################################################
141 165
… …
160 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
162 } 186 }
163 } 187 }
164 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
165 $self 191 $self
166} 192}
167 193
168sub destroy { 194sub destroy {
169 my ($self) = @_; 195 my ($self) = @_;
… …
242 268
243sub size_allocate { 269sub size_allocate {
244 # nothing to be done 270 # nothing to be done
245} 271}
246 272
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure { 273sub reconfigure {
252 my ($self) = @_; 274 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256 275
257 $self->check_size (1); 276 $self->check_size (1);
258 $self->update; 277 $self->update;
259} 278}
260 279
280sub children {
281}
282
261sub set_max_size { 283sub set_max_size {
262 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
263 285
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 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 }
266} 299}
267 300
268# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
269sub coord2local { 302sub coord2local {
270 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
359 glEnd; 392 glEnd;
360 glPopMatrix; 393 glPopMatrix;
361 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;
362 } 395 }
363} 396}
364 397
365sub _draw { 398sub _draw {
366 my ($self) = @_; 399 my ($self) = @_;
… …
383sub set_parent { 416sub set_parent {
384 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
385 418
386 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
387 420
388
389 # TODO: req_w _does_change after ->reconfigure 421 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size 422 $self->check_size
391 unless exists $self->{req_w}; 423 unless exists $self->{req_w};
392} 424}
393 425
… …
418} 450}
419 451
420sub DESTROY { 452sub DESTROY {
421 my ($self) = @_; 453 my ($self) = @_;
422 454
455 delete $WIDGET{$self+0};
423 #$self->deactivate; 456 #$self->deactivate;
424} 457}
425 458
426############################################################################# 459#############################################################################
427 460
… …
436 my $class = shift; 469 my $class = shift;
437 470
438 # range [value, low, high, page] 471 # range [value, low, high, page]
439 472
440 $class->SUPER::new ( 473 $class->SUPER::new (
441 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
442 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
443 @_ 476 @_
444 ) 477 )
445} 478}
446 479
447sub _draw { 480sub _draw {
448 my ($self) = @_; 481 my ($self) = @_;
449 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
450 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
451 489
452 glEnable GL_BLEND; 490 glEnable GL_BLEND;
453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
455 493
456 glBegin GL_QUADS; 494 glBegin GL_QUADS;
457 glVertex 0 , 0; 495 glVertex 0 , 0;
458 glVertex 0 , $h; 496 glVertex 0 , $h;
459 glVertex $w, $h; 497 glVertex $w, $h;
460 glVertex $w, 0; 498 glVertex $w, 0;
461 glEnd; 499 glEnd;
462 500
463 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
464} 503}
465 504
466############################################################################# 505#############################################################################
467 506
468package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
777 $self->add ($self->{slider}); 816 $self->add ($self->{slider});
778 817
779 $self 818 $self
780} 819}
781 820
782#TODO# update range on size_allocate depeneing on child 821#TODO# update range on size_allocate depending on child
783# update viewport offset on scroll 822# update viewport offset on scroll
784 823
785############################################################################# 824#############################################################################
786 825
787package CFClient::UI::Frame; 826package CFClient::UI::Frame;
788 827
789our @ISA = CFClient::UI::Bin::; 828our @ISA = CFClient::UI::Bin::;
790 829
791use CFClient::OpenGL; 830use CFClient::OpenGL;
831
832sub new {
833 my $class = shift;
834
835 $class->SUPER::new (
836 bg => undef,
837 @_,
838 )
839}
840
841sub _draw {
842 my ($self) = @_;
843
844 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)};
846
847 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
849 glColor @{ $self->{bg} };
850
851 glBegin GL_QUADS;
852 glVertex 0 , 0;
853 glVertex 0 , $h;
854 glVertex $w, $h;
855 glVertex $w, 0;
856 glEnd;
857
858 glDisable GL_BLEND;
859 }
860
861 $self->SUPER::_draw;
862}
792 863
793############################################################################# 864#############################################################################
794 865
795package CFClient::UI::FancyFrame; 866package CFClient::UI::FancyFrame;
796 867
… …
809 880
810 my $self = $class->SUPER::new ( 881 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1], 882 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1], 883 border_bg => [1, 1, 1, 1],
813 border => 0.6, 884 border => 0.6,
885 toplevel => 1,
814 can_events => 1, 886 can_events => 1,
815 @_ 887 @_
816 ); 888 );
817 889
818 $self->{title} &&= new CFClient::UI::Label 890 $self->{title} &&= new CFClient::UI::Label
… …
843 my ($self, $w, $h) = @_; 915 my ($self, $w, $h) = @_;
844 916
845 $h -= List::Util::max 0, $self->border * 2; 917 $h -= List::Util::max 0, $self->border * 2;
846 $w -= List::Util::max 0, $self->border * 2; 918 $w -= List::Util::max 0, $self->border * 2;
847 919
848 $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)
849 if $self->{title}; 921 if $self->{title};
850 922
851 $self->child->configure ($self->border, $self->border, $w, $h); 923 $self->child->configure ($self->border, $self->border, $w, $h);
852} 924}
853 925
… …
1214 1286
1215############################################################################# 1287#############################################################################
1216 1288
1217package CFClient::UI::Label; 1289package CFClient::UI::Label;
1218 1290
1219our @ISA = CFClient::UI::Base::; 1291our @ISA = CFClient::UI::DrawBG::;
1220 1292
1221use CFClient::OpenGL; 1293use CFClient::OpenGL;
1222 1294
1223sub new { 1295sub new {
1224 my ($class, %arg) = @_; 1296 my ($class, %arg) = @_;
1225 1297
1226 my $self = $class->SUPER::new ( 1298 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1299 fg => [1, 1, 1],
1300 #bg => none
1301 #active_bg => none
1228 #font => default_font 1302 #font => default_font
1229 #text => initial text 1303 #text => initial text
1230 #markup => initial narkup 1304 #markup => initial narkup
1305 #max_w => maximum pixel width
1306 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1307 layout => (new CFClient::Layout),
1232 fontsize => 1, 1308 fontsize => 1,
1233 align => -1, 1309 align => -1,
1234 valign => -1, 1310 valign => -1,
1235 padding => 2, 1311 padding => 2,
… …
1250 } 1326 }
1251 1327
1252 $self 1328 $self
1253} 1329}
1254 1330
1255sub escape { 1331sub escape($) {
1256 local $_ = $_[1]; 1332 local $_ = $_[0];
1257 1333
1258 s/&/&amp;/g; 1334 s/&/&amp;/g;
1259 s/>/&gt;/g; 1335 s/>/&gt;/g;
1260 s/</&lt;/g; 1336 s/</&lt;/g;
1261 1337
1262 $_[1] 1338 $_
1263} 1339}
1264 1340
1265sub update { 1341sub update {
1266 my ($self) = @_; 1342 my ($self) = @_;
1267 1343
… …
1300sub size_request { 1376sub size_request {
1301 my ($self) = @_; 1377 my ($self) = @_;
1302 1378
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1379 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $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});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1384
1307 my ($w, $h) = $self->{layout}->size; 1385 my ($w, $h) = $self->{layout}->size;
1308 1386
1309 if (exists $self->{template}) { 1387 if (exists $self->{template}) {
… …
1339} 1417}
1340 1418
1341sub _draw { 1419sub _draw {
1342 my ($self) = @_; 1420 my ($self) = @_;
1343 1421
1422 $self->SUPER::_draw; # draw background, if applicable
1423
1344 my $tex = $self->{texture} ||= do { 1424 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1425 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $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});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1431
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1432 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351 1433
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5; 1436 : ($self->{w} - $tex->{w}) * 0.5);
1355 1437
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5; 1440 : ($self->{h} - $tex->{h}) * 0.5);
1359 1441
1360 $tex 1442 $tex
1361 }; 1443 };
1362 1444
1363 glEnable GL_TEXTURE_2D; 1445 glEnable GL_TEXTURE_2D;
… …
1418sub set_text { 1500sub set_text {
1419 my ($self, $text) = @_; 1501 my ($self, $text) = @_;
1420 1502
1421 $self->{cursor} = length $text; 1503 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1504 $self->_set_text ($text);
1505 $self->update;
1423 $self->check_size; 1506 $self->check_size;
1424 $self->update;
1425} 1507}
1426 1508
1427sub get_text { 1509sub get_text {
1428 $_[0]{text} 1510 $_[0]{text}
1429} 1511}
… …
1449 my $sym = $ev->{sym}; 1531 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1532 my $uni = $ev->{unicode};
1451 1533
1452 my $text = $self->get_text; 1534 my $text = $self->get_text;
1453 1535
1454 if ($sym == 8) { 1536 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1537 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1538 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1539 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1540 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1541 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1542 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1543 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1544 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1545 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1546 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1547 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1548 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1549 $self->emit ('escape');
1468 } elsif ($uni) { 1550 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1551 substr $text, $self->{cursor}++, 0, chr $uni;
1470 } 1552 }
1471 1553
1472 $self->_set_text ($text); 1554 $self->_set_text ($text);
1473 $self->update; 1555 $self->update;
1556 $self->check_size;
1474} 1557}
1475 1558
1476sub focus_in { 1559sub focus_in {
1477 my ($self) = @_; 1560 my ($self) = @_;
1478 1561
… …
1607 my $class = shift; 1690 my $class = shift;
1608 1691
1609 $class->SUPER::new ( 1692 $class->SUPER::new (
1610 padding => 4, 1693 padding => 4,
1611 fg => [1, 1, 1], 1694 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 1695 active_fg => [0, 0, 1],
1614 can_hover => 1, 1696 can_hover => 1,
1615 align => 0, 1697 align => 0,
1616 valign => 0, 1698 valign => 0,
1617 can_events => 1, 1699 can_events => 1,
… …
1665 1747
1666 $class->SUPER::new ( 1748 $class->SUPER::new (
1667 padding => 2, 1749 padding => 2,
1668 fg => [1, 1, 1], 1750 fg => [1, 1, 1],
1669 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],
1670 state => 0, 1754 state => 0,
1671 can_hover => 1, 1755 can_hover => 1,
1672 @_ 1756 @_
1673 ) 1757 )
1674} 1758}
… …
1958 qw(s1_slider.png s1_slider_bg.png); 2042 qw(s1_slider.png s1_slider_bg.png);
1959 2043
1960sub new { 2044sub new {
1961 my $class = shift; 2045 my $class = shift;
1962 2046
1963 # range [value, low, high, page] 2047 # range [value, low, high, page, unit]
1964 2048
1965 # TODO: 0-width page 2049 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2050 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2051 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2052 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2053 fg => [1, 1, 1],
1970 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],
1971 range => [0, 0, 100, 10], 2057 range => [0, 0, 100, 10],
1972 req_w => $::WIDTH / 80, 2058 req_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2059 req_h => $::WIDTH / 80,
1974 vertical => 0, 2060 vertical => 0,
1975 can_hover => 1, 2061 can_hover => 1,
1976 inner_pad => 5, 2062 inner_pad => .05,
1977 @_ 2063 @_
1978 ); 2064 );
1979 2065
2066 $self->set_value ($self->{range}[0]);
2067 $self->update;
2068
1980 $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 }
1981} 2093}
1982 2094
1983sub size_request { 2095sub size_request {
1984 my ($self) = @_; 2096 my ($self) = @_;
1985 2097
… …
1998 2110
1999sub mouse_motion { 2111sub mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2112 my ($self, $ev, $x, $y) = @_;
2001 2113
2002 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
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2131 my ($value, $lo, $hi, $page) = @{$self->{range}};
2004 2132
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2133 my $inner_w = 1 - 2 * $self->{inner_pad};
2006 2134
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2009 2136
2010 $x -= $inner_pad_px; # substract the padding 2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2138 $value = $self->{scale} * ($value - $lo);
2012 $x = $lo if $x < $lo;
2013 $x = $hi - $page if $x > $hi - $page;
2014 $self->{range}[0] = $x;
2015 2139
2016 $self->emit (changed => $x); 2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2017 $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;
2018 } 2147 });
2019}
2020 2148
2021# the inner_* stuff is for generating a padding for the slider handle, 2149 $self->SUPER::update;
2022# so that the handle doesn't leave the texture. This calculation isn't 100%
2023# correct propably, but it does the job for now
2024sub _calc_inner_pad_px {
2025 my ($self, $w) = @_;
2026 ($w / 100) * $self->{inner_pad} # % to pixels
2027} 2150}
2028 2151
2029sub _draw { 2152sub _draw {
2030 my ($self) = @_; 2153 my ($self) = @_;
2031 2154
2032 $self->SUPER::_draw (); 2155 $self->SUPER::_draw ();
2033 2156
2034 my ($w, $h) = @$self{qw(w h)}; 2157 glScale $self->{w}, $self->{h};
2035 2158
2036 if ($self->{vertical}) { 2159 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2160 # draw a vertical slider like a rotated horizontal slider
2038 2161
2039 glRotate 90, 0, 0, 1; 2162 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0; 2163 glTranslate 0, 1, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2164 }
2044 2165
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2166 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2167 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2168
2048 my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050 $hi = $value + 1 if $lo == $hi;
2051
2052 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055 $page = int $page * $inner_w / ($hi - $lo);
2056 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058 $w -= $page;
2059 $page &= ~1;
2060 glTranslate $page * 0.5, 0, 0;
2061 $page ||= 2;
2062
2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2171
2069 # draw background 2172 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2173 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2174
2072 # draw handle 2175 # draw handle
2073 $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);
2074 2177
2075 glDisable GL_TEXTURE_2D; 2178 glDisable GL_TEXTURE_2D;
2076} 2179}
2077 2180
2078############################################################################# 2181#############################################################################
… …
2332 2435
2333sub set_tooltip_from { 2436sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2437 my ($self, $widget) = @_;
2335 2438
2336 $self->add (new CFClient::UI::Label 2439 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2440 markup => $widget->{tooltip},
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2442 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2443 fg => [0, 0, 0, 1],
2444 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2445 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2446 );
2343} 2447}
2344 2448
2345sub size_request { 2449sub size_request {
2346 my ($self) = @_; 2450 my ($self) = @_;
… …
2424 2528
2425package CFClient::UI::InventoryItem; 2529package CFClient::UI::InventoryItem;
2426 2530
2427our @ISA = CFClient::UI::HBox::; 2531our @ISA = CFClient::UI::HBox::;
2428 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
2429sub new { 2559sub new {
2430 my $class = shift; 2560 my $class = shift;
2431 2561
2432 my %args = @_; 2562 my %args = @_;
2433 2563
2434 my $item = delete $args{item}; 2564 my $item = delete $args{item};
2435 2565
2436 my $desc = $item->{nrof} < 2 2566 my $desc = _item_to_desc ($item);
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440 2567
2441 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2442 can_hover => 1, 2569 can_hover => 1,
2443 can_events => 1, 2570 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc) 2571 tooltip => ((CFClient::UI::Label::escape $desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub { 2573 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_; 2574 my ($self, $ev, $x, $y) = @_;
2448 2575
2449 # 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 :(
2450 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
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2584 $::CONN->send ("move $targ $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) { 2585 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}"); 2586 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) { 2587 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new ( 2588 my @menu_items = (
2456 items => [
2457 ["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") }],
2458 [ 2593 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") }, 2595 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ], 2596 ],
2466 )->popup ($ev); 2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2467 } 2600 }
2468 2601
2469 1 2602 1
2470 }, 2603 },
2471 %args 2604 %args
2472 ); 2605 );
2606
2473 2607
2474 $self->add (new CFClient::UI::Face 2608 $self->add (new CFClient::UI::Face
2475 can_events => 0, 2609 can_events => 0,
2476 face => $item->{face}, 2610 face => $item->{face},
2477 anim => $item->{anim}, 2611 anim => $item->{anim},
2478 animspeed => $item->{animspeed}, 2612 animspeed => $item->{animspeed},
2479 ); 2613 );
2480 2614
2481 $self->add (new CFClient::UI::Label 2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2482 can_events => 0, 2616
2483 text => $desc, 2617 $self->{item} = $item;
2484 ); 2618
2619 $self->update_item;
2485 2620
2486 $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);
2487} 2630}
2488 2631
2489############################################################################# 2632#############################################################################
2490 2633
2491package CFClient::UI::Inventory; 2634package CFClient::UI::Inventory;
… …
2507 my ($self, $items) = @_; 2650 my ($self, $items) = @_;
2508 2651
2509 $self->{scrolled}->clear; 2652 $self->{scrolled}->clear;
2510 return unless $items; 2653 return unless $items;
2511 2654
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2513 2659
2514 $self->{real_items} = \@items; 2660 $self->{real_items} = \@items;
2515 2661
2516 for my $item (@items) { 2662 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2522 } 2665 }
2666
2667 $self->{scrolled}->add (@items);
2523 2668
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525} 2670}
2526 2671
2527sub size_request { 2672sub size_request {
… …
2605 2750
2606package CFClient::UI::Statusbox; 2751package CFClient::UI::Statusbox;
2607 2752
2608our @ISA = CFClient::UI::VBox::; 2753our @ISA = CFClient::UI::VBox::;
2609 2754
2755sub new {
2756 my $class = shift;
2757
2758 $class->SUPER::new (
2759 fontsize => 0.8,
2760 @_,
2761 )
2762}
2763
2610sub reorder { 2764sub reorder {
2611 my ($self) = @_; 2765 my ($self) = @_;
2612 my $NOW = time; 2766 my $NOW = time;
2613 2767
2614 while (my ($k, $v) = each %{ $self->{item} }) { 2768 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2632 ? "<b>$item->{count} ×</b> $item->{text}" 2786 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 2787 : $item->{text};
2634 2788
2635 for ($short) { 2789 for ($short) {
2636 s/^\s+//; 2790 s/^\s+//;
2637 s/\012.*/…/s; 2791 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 2792 }
2641 2793
2642 new CFClient::UI::Label 2794 new CFClient::UI::Label
2643 markup => $short, 2795 markup => $short,
2644 tooltip => $item->{tooltip}, 2796 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 2797 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 2798 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 2799 fontsize => $item->{fontsize} || $self->{fontsize},
2800 max_w => $::WIDTH * 0.44,
2648 color => $item->{color}, 2801 fg => $item->{fg},
2649 can_events => 1, 2802 can_events => 1,
2650 can_hover => 1 2803 can_hover => 1
2651 }; 2804 };
2652 } 2805 }
2653 2806
… …
2679 $self->{item}{$group} = { 2832 $self->{item}{$group} = {
2680 id => ++$self->{id}, 2833 id => ++$self->{id},
2681 text => $text, 2834 text => $text,
2682 timeout => $timeout, 2835 timeout => $timeout,
2683 tooltip => $text, 2836 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 2837 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 2838 pri => 0,
2687 count => 1, 2839 count => 1,
2688 %arg, 2840 %arg,
2689 }; 2841 };
2690 } 2842 }
2691 2843
2692 $self->reorder; 2844 $self->reorder;
2693} 2845}
2694 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
2695############################################################################# 2857#############################################################################
2696 2858
2697package CFClient::UI::Root; 2859package CFClient::UI::Root;
2698 2860
2699our @ISA = CFClient::UI::Container::; 2861our @ISA = CFClient::UI::Container::;
… …
2729} 2891}
2730 2892
2731sub size_allocate { 2893sub size_allocate {
2732 my ($self, $w, $h) = @_; 2894 my ($self, $w, $h) = @_;
2733 2895
2734 my $old_w = $self->{old_w}; 2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2735 my $old_h = $self->{old_h}; 2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2736 2898
2737 if ($old_w && $old_h) { 2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2738 for my $child ($self->children) { 2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749 2901
2750 for my $child ($self->children) { 2902 for my $child ($self->children) {
2751 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)};
2752 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
2753 $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;
2754 $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
2755 $child->configure ($X, $Y, $W, $H); 2914 $child->configure ($X, $Y, $W, $H);
2756 } 2915 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760} 2916}
2761 2917
2762sub coord2local { 2918sub coord2local {
2763 my ($self, $x, $y) = @_; 2919 my ($self, $x, $y) = @_;
2764 2920
… …
2777 $self->check_size; 2933 $self->check_size;
2778 $::WANT_REFRESH++; 2934 $::WANT_REFRESH++;
2779} 2935}
2780 2936
2781sub add { 2937sub add {
2782 my ($self, $child) = @_; 2938 my ($self, @children) = @_;
2783 2939
2940 for my $child (@children) {
2941 $child->{toplevel} = 1;
2942
2784 # integerise window positions 2943 # integerise window positions
2785 $child->{x} = int $child->{x}; 2944 $child->{x} = int $child->{x};
2786 $child->{y} = int $child->{y}; 2945 $child->{y} = int $child->{y};
2946 }
2787 2947
2788 $self->SUPER::add ($child); 2948 $self->SUPER::add (@children);
2789} 2949}
2790 2950
2791sub on_refresh { 2951sub on_refresh {
2792 my ($self, $id, $cb) = @_; 2952 my ($self, $id, $cb) = @_;
2793 2953
… …
2874############################################################################# 3034#############################################################################
2875 3035
2876package CFClient::UI; 3036package CFClient::UI;
2877 3037
2878$ROOT = new CFClient::UI::Root; 3038$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3039$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3040
28811 30411
2882 3042

Diff Legend

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