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.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.221 by root, Mon May 22 03:48:50 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
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
137 } 169 }
138} 170}
139 171
140############################################################################# 172#############################################################################
141 173
… …
160 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
162 } 194 }
163 } 195 }
164 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
165 $self 199 $self
166} 200}
167 201
168sub destroy { 202sub destroy {
169 my ($self) = @_; 203 my ($self) = @_;
… …
173} 207}
174 208
175sub show { 209sub show {
176 my ($self) = @_; 210 my ($self) = @_;
177 211
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
178 return if $self->{parent}; 218 return if $self->{parent};
179 219
180 $CFClient::UI::ROOT->add ($self); 220 $CFClient::UI::ROOT->add ($self);
181} 221}
182 222
183sub hide { 223sub hide {
184 my ($self) = @_; 224 my ($self) = @_;
225
226 for (my @w = $self; @w; ) {
227 my $w = pop @w;
228 push @w, $w->children;
229 $w->{visible} = 1;
230 }
185 231
186 undef $GRAB if $GRAB == $self; 232 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 233 undef $HOVER if $HOVER == $self;
188 234
189 $self->{parent}->remove ($self) 235 $self->{parent}->remove ($self)
… …
242 288
243sub size_allocate { 289sub size_allocate {
244 # nothing to be done 290 # nothing to be done
245} 291}
246 292
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure { 293sub reconfigure {
252 my ($self) = @_; 294 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256 295
257 $self->check_size (1); 296 $self->check_size (1);
258 $self->update; 297 $self->update;
259} 298}
260 299
300sub children {
301}
302
261sub set_max_size { 303sub set_max_size {
262 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
263 305
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
308}
309
310sub set_tooltip {
311 my ($self, $tooltip) = @_;
312
313 $self->{tooltip} = $tooltip;
314
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
266} 319}
267 320
268# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
269sub coord2local { 322sub coord2local {
270 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
359 glEnd; 412 glEnd;
360 glPopMatrix; 413 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 415 }
363} 416}
364 417
365sub _draw { 418sub _draw {
366 my ($self) = @_; 419 my ($self) = @_;
… …
386 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
387 440
388 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size 442 $self->check_size
390 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
391} 446}
392 447
393sub check_size { 448sub check_size {
394 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
395 450
… …
417} 472}
418 473
419sub DESTROY { 474sub DESTROY {
420 my ($self) = @_; 475 my ($self) = @_;
421 476
477 delete $WIDGET{$self+0};
422 #$self->deactivate; 478 #$self->deactivate;
423} 479}
424 480
425############################################################################# 481#############################################################################
426 482
… …
435 my $class = shift; 491 my $class = shift;
436 492
437 # range [value, low, high, page] 493 # range [value, low, high, page]
438 494
439 $class->SUPER::new ( 495 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
442 @_ 498 @_
443 ) 499 )
444} 500}
445 501
446sub _draw { 502sub _draw {
447 my ($self) = @_; 503 my ($self) = @_;
448 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
450 511
451 glEnable GL_BLEND; 512 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
454 515
455 glBegin GL_QUADS; 516 glBegin GL_QUADS;
456 glVertex 0 , 0; 517 glVertex 0 , 0;
457 glVertex 0 , $h; 518 glVertex 0 , $h;
458 glVertex $w, $h; 519 glVertex $w, $h;
459 glVertex $w, 0; 520 glVertex $w, 0;
460 glEnd; 521 glEnd;
461 522
462 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
463} 525}
464 526
465############################################################################# 527#############################################################################
466 528
467package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
654 716
655 $self->_render; 717 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 718 };
664} 719}
665 720
666sub _draw { 721sub _draw {
667 my ($self) = @_; 722 my ($self) = @_;
… …
671 my $tex = $self->{texture} 726 my $tex = $self->{texture}
672 or return; 727 or return;
673 728
674 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
677 732
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 734
680 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
681} 736}
… …
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 }, 820 },
766 ; 821 ;
767 822
768 $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 824 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 825 slider => $slider,
771 @_, 826 @_,
772 ); 827 );
773 828
774 $self->{vp}->add ($self->{scrolled}); 829 $self->{vp}->add ($self->{scrolled});
… …
840 895
841 my $self = $class->SUPER::new ( 896 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 897 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 898 border_bg => [1, 1, 1, 1],
844 border => 0.6, 899 border => 0.6,
900 toplevel => 1,
845 can_events => 1, 901 can_events => 1,
846 @_ 902 @_
847 ); 903 );
848 904
849 $self->{title} &&= new CFClient::UI::Label 905 $self->{title} &&= new CFClient::UI::Label
… …
874 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
875 931
876 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
878 934
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
880 if $self->{title}; 936 if $self->{title};
881 937
882 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
883} 939}
884 940
… …
1245 1301
1246############################################################################# 1302#############################################################################
1247 1303
1248package CFClient::UI::Label; 1304package CFClient::UI::Label;
1249 1305
1250our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1251 1307
1252use CFClient::OpenGL; 1308use CFClient::OpenGL;
1253 1309
1254sub new { 1310sub new {
1255 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1256 1312
1257 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1259 #font => default_font 1317 #font => default_font
1260 #text => initial text 1318 #text => initial text
1261 #markup => initial narkup 1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1322 layout => (new CFClient::Layout),
1263 fontsize => 1, 1323 fontsize => 1,
1264 align => -1, 1324 align => -1,
1265 valign => -1, 1325 valign => -1,
1266 padding => 2, 1326 padding => 2,
… …
1281 } 1341 }
1282 1342
1283 $self 1343 $self
1284} 1344}
1285 1345
1286sub escape { 1346sub escape($) {
1287 local $_ = $_[1]; 1347 local $_ = $_[0];
1288 1348
1289 s/&/&amp;/g; 1349 s/&/&amp;/g;
1290 s/>/&gt;/g; 1350 s/>/&gt;/g;
1291 s/</&lt;/g; 1351 s/</&lt;/g;
1292 1352
1293 $_[1] 1353 $_
1294} 1354}
1295 1355
1296sub update { 1356sub update {
1297 my ($self) = @_; 1357 my ($self) = @_;
1298 1358
… …
1331sub size_request { 1391sub size_request {
1332 my ($self) = @_; 1392 my ($self) = @_;
1333 1393
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1395 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1399
1338 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1339 1401
1340 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1370} 1432}
1371 1433
1372sub _draw { 1434sub _draw {
1373 my ($self) = @_; 1435 my ($self) = @_;
1374 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1375 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1440 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $self->{layout}->set_width ($self->{w}); 1442 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1446
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1382 1448
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5; 1451 : ($self->{w} - $tex->{w}) * 0.5);
1386 1452
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5; 1455 : ($self->{h} - $tex->{h}) * 0.5);
1390 1456
1391 $tex 1457 $tex
1392 }; 1458 };
1393 1459
1394 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
… …
1449sub set_text { 1515sub set_text {
1450 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1451 1517
1452 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1519 $self->_set_text ($text);
1520 $self->update;
1454 $self->check_size; 1521 $self->check_size;
1455 $self->update;
1456} 1522}
1457 1523
1458sub get_text { 1524sub get_text {
1459 $_[0]{text} 1525 $_[0]{text}
1460} 1526}
… …
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1501 } 1567 }
1502 1568
1503 $self->_set_text ($text); 1569 $self->_set_text ($text);
1504 $self->update; 1570 $self->update;
1571 $self->check_size;
1505} 1572}
1506 1573
1507sub focus_in { 1574sub focus_in {
1508 my ($self) = @_; 1575 my ($self) = @_;
1509 1576
… …
1638 my $class = shift; 1705 my $class = shift;
1639 1706
1640 $class->SUPER::new ( 1707 $class->SUPER::new (
1641 padding => 4, 1708 padding => 4,
1642 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1645 can_hover => 1, 1711 can_hover => 1,
1646 align => 0, 1712 align => 0,
1647 valign => 0, 1713 valign => 0,
1648 can_events => 1, 1714 can_events => 1,
… …
1696 1762
1697 $class->SUPER::new ( 1763 $class->SUPER::new (
1698 padding => 2, 1764 padding => 2,
1699 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 1766 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 1769 state => 0,
1702 can_hover => 1, 1770 can_hover => 1,
1703 @_ 1771 @_
1704 ) 1772 )
1705} 1773}
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
1990 2058
1991sub new { 2059sub new {
1992 my $class = shift; 2060 my $class = shift;
1993 2061
1994 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
1995 2063
1996 # TODO: 0-width page 2064 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2066 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
2001 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5],
2002 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
2003 req_w => $::WIDTH / 80, 2073 req_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2074 req_h => $::WIDTH / 80,
2005 vertical => 0, 2075 vertical => 0,
2006 can_hover => 1, 2076 can_hover => 1,
2007 inner_pad => 5, 2077 inner_pad => 0.02,
2008 @_ 2078 @_
2009 ); 2079 );
2010 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
2011 $self 2084 $self
2085}
2086
2087sub set_value {
2088 my ($self, $value) = @_;
2089
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091
2092 $hi = $lo + 1 if $hi <= $lo;
2093
2094 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi;
2096
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103
2104 if ($value != $old_value) {
2105 $self->emit (changed => $value);
2106 $self->update;
2107 }
2012} 2108}
2013 2109
2014sub size_request { 2110sub size_request {
2015 my ($self) = @_; 2111 my ($self) = @_;
2016 2112
… …
2029 2125
2030sub mouse_motion { 2126sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
2032 2128
2033 if ($GRAB == $self) { 2129 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131
2132 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2135
2136 $self->set_value ($x * ($hi - $lo) + $lo);
2137 }
2138}
2139
2140sub update {
2141 my ($self) = @_;
2142
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]);
2145
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
2035 2147
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
2037 2149
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2040 2151
2041 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2154
2047 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2048 $self->update; 2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value;
2161 $self->{knob_w} = $page;
2049 } 2162 });
2050}
2051 2163
2052# the inner_* stuff is for generating a padding for the slider handle, 2164 $self->SUPER::update;
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058} 2165}
2059 2166
2060sub _draw { 2167sub _draw {
2061 my ($self) = @_; 2168 my ($self) = @_;
2062 2169
2063 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
2064 2171
2065 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
2066 2173
2067 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
2069 2176
2177 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2179 }
2075 2180
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2183
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2186
2100 # draw background 2187 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2189
2103 # draw handle 2190 # draw handle
2104 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2105 2192
2106 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
2107} 2194}
2108 2195
2109############################################################################# 2196#############################################################################
… …
2142 2229
2143 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2231 $self->reflow;
2145} 2232}
2146 2233
2234sub size_allocate {
2235 my ($self, $w, $h) = @_;
2236
2237 $self->SUPER::size_allocate ($w, $h);
2238
2239 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $self->{layout}->set_width ($self->{children}[0]{w});
2242
2243 $self->reflow;
2244}
2245
2147sub text_height { 2246sub text_height {
2148 my ($self, $text) = @_; 2247 my ($self, $text, $indent) = @_;
2149 2248
2150 my $layout = $self->{layout}; 2249 my $layout = $self->{layout};
2151 2250
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w}); 2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2154 $layout->set_markup ($text); 2253 $layout->set_markup ($text);
2155 2254
2156 ($layout->size)[1] 2255 ($layout->size)[1]
2157} 2256}
2158 2257
… …
2161 2260
2162 $self->{need_reflow}++; 2261 $self->{need_reflow}++;
2163 $self->update; 2262 $self->update;
2164} 2263}
2165 2264
2166sub size_allocate {
2167 my ($self, $w, $h) = @_;
2168
2169 $self->SUPER::size_allocate ($w, $h);
2170
2171 $self->{layout}->set_font ($self->{font}) if $self->{font};
2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $self->{layout}->set_width ($self->{children}[0]{w});
2174
2175 $self->reflow;
2176}
2177
2178sub add_paragraph { 2265sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2180 2267
2181 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2182 2269
2270 for my $line (split /\n/, $text) {
2183 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2184
2185 $self->{height} += $height; 2272 $self->{height} += $height;
2186
2187 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2188 2275
2189 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2190 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2191} 2278}
2192 2279
… …
2201 2288
2202 $ROOT->on_post_alloc ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2203 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2291 my $height = 0;
2205 2292
2206 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2207 for @{$self->{par}}; 2294 for @{$self->{par}};
2208 2295
2209 $self->{height} = $height; 2296 $self->{height} = $height;
2210 2297
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2299 $self->{children}[1]->update;
2212 2300
2213 delete $self->{texture}; 2301 delete $self->{texture};
2214 } 2302 }
2215 2303
2216 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2217 glClearColor 0, 0, 0, 0; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2219
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 2307
2223 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2224 2309
2225 my $y0 = $top; 2310 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2229 2314
2230 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2231 2316
2232 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2233 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2234 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2235 my $h = $par->[0]; 2323 my $h = $par->[0];
2236 2324
2237 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] }); 2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2239 $layout->set_markup ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2240 2329
2241 my ($W, $H) = $layout->size; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2331
2332 glRasterPos $par->[2], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2243 } 2334 }
2244 2335
2245 $y += $h; 2336 $y += $h;
2246 } 2337 }
2247 2338
2248 glDisable GL_TEXTURE_2D; 2339 glDisable GL_BLEND;
2249 }; 2340 };
2250 }); 2341 });
2251} 2342}
2252 2343
2253sub _draw { 2344sub _draw {
2254 my ($self) = @_; 2345 my ($self) = @_;
2255 2346
2256 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2349 glColor 1, 1, 1, 1;
2259 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2260 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2261 2352
2262 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2263 2354
2264} 2355}
… …
2363 2454
2364sub set_tooltip_from { 2455sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2456 my ($self, $widget) = @_;
2366 2457
2367 $self->add (new CFClient::UI::Label 2458 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2459 markup => $widget->{tooltip},
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2461 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2465 );
2374} 2466}
2375 2467
2376sub size_request { 2468sub size_request {
2377 my ($self) = @_; 2469 my ($self) = @_;
… …
2423use CFClient::OpenGL; 2515use CFClient::OpenGL;
2424 2516
2425sub new { 2517sub new {
2426 my $class = shift; 2518 my $class = shift;
2427 2519
2428 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2429 aspect => 1, 2521 aspect => 1,
2430 @_, 2522 @_,
2431 ) 2523 );
2524
2525 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self);
2527
2528 $self->{timer} = Event->timer (
2529 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2530 hard => 1,
2531 interval => $self->{animspeed},
2532 cb => sub {
2533 ++$widget->{frame};
2534 $widget->update;
2535 },
2536 );
2537 }
2538
2539 $self
2432} 2540}
2433 2541
2434sub size_request { 2542sub size_request {
2435 (32, 8) 2543 (32, 8)
2436} 2544}
2437 2545
2438sub _draw { 2546sub _draw {
2439 my ($self) = @_; 2547 my ($self) = @_;
2440 2548
2441 return unless $::CONN;#d# manage and cache textures differently 2549 return unless $::CONN;#d# manage and cache textures differently
2550
2551 my $face;
2552
2553 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}];
2555
2556 $face = $anim->[ $self->{frame} % @$anim ]
2557 if $anim && @$anim;
2558 }
2559
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2560 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2561
2444 # TODO animation
2445 if ($tex) { 2562 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2563 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2565 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2567 glDisable GL_TEXTURE_2D;
2451 } 2568 }
2452} 2569}
2453 2570
2571sub DESTROY {
2572 my ($self) = @_;
2573
2574 $self->{timer}->cancel
2575 if $self->{timer};
2576
2577 $self->SUPER::DESTROY;
2578}
2579
2454############################################################################# 2580#############################################################################
2455 2581
2456package CFClient::UI::InventoryItem; 2582package CFClient::UI::InventoryItem;
2457 2583
2458our @ISA = CFClient::UI::HBox::; 2584our @ISA = CFClient::UI::HBox::;
2585
2586sub _item_to_desc {
2587 my ($item) = @_;
2588
2589 my $desc =
2590 $item->{nrof} < 2
2591 ? $item->{name}
2592 : "$item->{nrof} × $item->{name_pl}";
2593
2594 $item->{flags} & Crossfire::Protocol::F_OPEN
2595 and $desc .= " (open)";
2596 $item->{flags} & Crossfire::Protocol::F_APPLIED
2597 and $desc .= " (applied)";
2598 $item->{flags} & Crossfire::Protocol::F_UNPAID
2599 and $desc .= " (unpaid)";
2600 $item->{flags} & Crossfire::Protocol::F_MAGIC
2601 and $desc .= " (magic)";
2602 $item->{flags} & Crossfire::Protocol::F_CURSED
2603 and $desc .= " (cursed)";
2604 $item->{flags} & Crossfire::Protocol::F_DAMNED
2605 and $desc .= " (damned)";
2606 $item->{flags} & Crossfire::Protocol::F_LOCKED
2607 and $desc .= " *";
2608
2609 $desc
2610}
2459 2611
2460sub new { 2612sub new {
2461 my $class = shift; 2613 my $class = shift;
2462 2614
2463 my %args = @_; 2615 my %args = @_;
2464 2616
2465 my $item = delete $args{item}; 2617 my $item = delete $args{item};
2466 2618
2467 my $desc = $item->{nrof} < 2 2619 my $desc = _item_to_desc ($item);
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471 2620
2472 my $self = $class->SUPER::new ( 2621 my $self = $class->SUPER::new (
2473 can_hover => 1, 2622 can_hover => 1,
2474 can_events => 1, 2623 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc) 2624 tooltip => ((CFClient::UI::Label::escape $desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2625 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub { 2626 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_; 2627 my ($self, $ev, $x, $y) = @_;
2479 2628
2480 # todo: maybe put examine on 1? but should just be a tooltip :( 2629 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) { 2630 if ($ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag};
2632
2633 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT;
2635 }
2636
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2637 $::CONN->send ("move $targ $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) { 2638 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}"); 2639 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) { 2640 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new ( 2641 my @menu_items = (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2643 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2644 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645 (
2646 $item->{flags} & Crossfire::Protocol::F_LOCKED
2647 ? (
2648 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649 )
2650 : (
2651 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2652 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653 )
2496 ], 2654 ),
2497 )->popup ($ev); 2655 );
2656
2657 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2498 } 2658 }
2499 2659
2500 1 2660 1
2501 }, 2661 },
2502 %args 2662 %args
2503 ); 2663 );
2664
2504 2665
2505 $self->add (new CFClient::UI::Face 2666 $self->add (new CFClient::UI::Face
2506 can_events => 0, 2667 can_events => 0,
2507 face => $item->{face}, 2668 face => $item->{face},
2508 anim => $item->{anim}, 2669 anim => $item->{anim},
2509 animspeed => $item->{animspeed}, 2670 animspeed => $item->{animspeed},
2510 ); 2671 );
2511 2672
2512 $self->add (new CFClient::UI::Label 2673 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2513 can_events => 0, 2674
2514 text => $desc, 2675 $self->{item} = $item;
2515 ); 2676
2677 $self->update_item;
2516 2678
2517 $self 2679 $self
2680}
2681
2682sub update_item {
2683 my ($self) = @_;
2684
2685 my $desc = _item_to_desc ($self->{item});
2686
2687 $self->{name_lbl}->set_text ($desc);
2518} 2688}
2519 2689
2520############################################################################# 2690#############################################################################
2521 2691
2522package CFClient::UI::Inventory; 2692package CFClient::UI::Inventory;
… …
2546 } @$items; 2716 } @$items;
2547 2717
2548 $self->{real_items} = \@items; 2718 $self->{real_items} = \@items;
2549 2719
2550 for my $item (@items) { 2720 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item ();
2556 } 2723 }
2557 2724
2558 $self->{scrolled}->add (@items); 2725 $self->{scrolled}->add (@items);
2559 2726
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
… …
2641 2808
2642package CFClient::UI::Statusbox; 2809package CFClient::UI::Statusbox;
2643 2810
2644our @ISA = CFClient::UI::VBox::; 2811our @ISA = CFClient::UI::VBox::;
2645 2812
2813sub new {
2814 my $class = shift;
2815
2816 $class->SUPER::new (
2817 fontsize => 0.8,
2818 @_,
2819 )
2820}
2821
2646sub reorder { 2822sub reorder {
2647 my ($self) = @_; 2823 my ($self) = @_;
2648 my $NOW = time; 2824 my $NOW = time;
2649 2825
2650 while (my ($k, $v) = each %{ $self->{item} }) { 2826 while (my ($k, $v) = each %{ $self->{item} }) {
… …
2668 ? "<b>$item->{count} ×</b> $item->{text}" 2844 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text}; 2845 : $item->{text};
2670 2846
2671 for ($short) { 2847 for ($short) {
2672 s/^\s+//; 2848 s/^\s+//;
2673 s/\012.*/…/s; 2849 s/\s+/ /g;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 } 2850 }
2677 2851
2678 new CFClient::UI::Label 2852 new CFClient::UI::Label
2679 markup => $short, 2853 markup => $short,
2680 tooltip => $item->{tooltip}, 2854 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP, 2855 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67, 2856 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize}, 2857 fontsize => $item->{fontsize} || $self->{fontsize},
2858 max_w => $::WIDTH * 0.44,
2684 color => $item->{color}, 2859 fg => $item->{fg},
2685 can_events => 1, 2860 can_events => 1,
2686 can_hover => 1 2861 can_hover => 1
2687 }; 2862 };
2688 } 2863 }
2689 2864
… …
2715 $self->{item}{$group} = { 2890 $self->{item}{$group} = {
2716 id => ++$self->{id}, 2891 id => ++$self->{id},
2717 text => $text, 2892 text => $text,
2718 timeout => $timeout, 2893 timeout => $timeout,
2719 tooltip => $text, 2894 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8], 2895 fg => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0, 2896 pri => 0,
2723 count => 1, 2897 count => 1,
2724 %arg, 2898 %arg,
2725 }; 2899 };
2726 } 2900 }
2727 2901
2728 $self->reorder; 2902 $self->reorder;
2729} 2903}
2730 2904
2905sub reconfigure {
2906 my ($self) = @_;
2907
2908 delete $_->{label}
2909 for values %{ $self->{item} || {} };
2910
2911 $self->reorder;
2912 $self->SUPER::reconfigure;
2913}
2914
2731############################################################################# 2915#############################################################################
2732 2916
2733package CFClient::UI::Root; 2917package CFClient::UI::Root;
2734 2918
2735our @ISA = CFClient::UI::Container::; 2919our @ISA = CFClient::UI::Container::;
… …
2765} 2949}
2766 2950
2767sub size_allocate { 2951sub size_allocate {
2768 my ($self, $w, $h) = @_; 2952 my ($self, $w, $h) = @_;
2769 2953
2770 my $old_w = $self->{old_w}; 2954 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2771 my $old_h = $self->{old_h}; 2955 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2772 2956
2773 if ($old_w && $old_h) { 2957 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2774 for my $child ($self->children) { 2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785 2959
2786 for my $child ($self->children) { 2960 for my $child ($self->children) {
2787 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2961 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2788 2962
2963 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2964 if exists $child->{req_x};
2965
2966 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2967 if exists $child->{req_y};
2968
2789 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2969 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2790 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2970 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971
2791 $child->configure ($X, $Y, $W, $H); 2972 $child->configure ($X, $Y, $W, $H);
2792 } 2973 }
2793
2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796} 2974}
2797 2975
2798sub coord2local { 2976sub coord2local {
2799 my ($self, $x, $y) = @_; 2977 my ($self, $x, $y) = @_;
2800 2978
… …
2813 $self->check_size; 2991 $self->check_size;
2814 $::WANT_REFRESH++; 2992 $::WANT_REFRESH++;
2815} 2993}
2816 2994
2817sub add { 2995sub add {
2818 my ($self, $child) = @_; 2996 my ($self, @children) = @_;
2819 2997
2998 for my $child (@children) {
2999 $child->{toplevel} = 1;
3000
2820 # integerise window positions 3001 # integerise window positions
2821 $child->{x} = int $child->{x}; 3002 $child->{x} = int $child->{x};
2822 $child->{y} = int $child->{y}; 3003 $child->{y} = int $child->{y};
3004 }
2823 3005
2824 $self->SUPER::add ($child); 3006 $self->SUPER::add (@children);
2825} 3007}
2826 3008
2827sub on_refresh { 3009sub on_refresh {
2828 my ($self, $id, $cb) = @_; 3010 my ($self, $id, $cb) = @_;
2829 3011
… …
2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899 glClear GL_COLOR_BUFFER_BIT; 3081 glClear GL_COLOR_BUFFER_BIT;
2900 3082
2901 glMatrixMode GL_PROJECTION; 3083 glMatrixMode GL_PROJECTION;
2902 glLoadIdentity; 3084 glLoadIdentity;
2903 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3085 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904 glMatrixMode GL_MODELVIEW; 3086 glMatrixMode GL_MODELVIEW;
2905 glLoadIdentity; 3087 glLoadIdentity;
2906 3088
2907 $self->_draw; 3089 $self->_draw;
2908} 3090}
… …
2910############################################################################# 3092#############################################################################
2911 3093
2912package CFClient::UI; 3094package CFClient::UI;
2913 3095
2914$ROOT = new CFClient::UI::Root; 3096$ROOT = new CFClient::UI::Root;
2915$TOOLTIP = new CFClient::UI::Tooltip; 3097$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916 3098
29171 30991
2918 3100

Diff Legend

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