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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.212 by elmex, Wed May 17 14:55:14 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}) {
… …
24 26
25 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
26 28
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 30
29 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 32 $TOOLTIP->show;
32 33
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34 35
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
38 38
39 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
40 } 42 }
41 43
42 return; 44 return;
43 } 45 }
44 } 46 }
… …
131 133
132 for (@$vals) { 134 for (@$vals) {
133 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
134 $rem += $_ - $i; 136 $rem += $_ - $i;
135 $_ = $i; 137 $_ = $i;
138 }
139}
140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
136 } 158 }
137} 159}
138 160
139############################################################################# 161#############################################################################
140 162
… …
159 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
161 } 183 }
162 } 184 }
163 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
164 $self 188 $self
165} 189}
166 190
167sub destroy { 191sub destroy {
168 my ($self) = @_; 192 my ($self) = @_;
… …
241 265
242sub size_allocate { 266sub size_allocate {
243 # nothing to be done 267 # nothing to be done
244} 268}
245 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
246sub children { 277sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259} 278}
260 279
261sub set_max_size { 280sub set_max_size {
262 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
263 282
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
285}
286
287sub set_tooltip {
288 my ($self, $tooltip) = @_;
289
290 $self->{tooltip} = $tooltip;
291
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip;
295 }
266} 296}
267 297
268# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
269sub coord2local { 299sub coord2local {
270 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 386 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 387 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 388 glVertex 0 , $self->{h};
359 glEnd; 389 glEnd;
360 glPopMatrix; 390 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 392 }
363} 393}
364 394
365sub _draw { 395sub _draw {
366 my ($self) = @_; 396 my ($self) = @_;
… …
383sub set_parent { 413sub set_parent {
384 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
385 415
386 Scalar::Util::weaken ($self->{parent} = $parent); 416 Scalar::Util::weaken ($self->{parent} = $parent);
387 417
418 # TODO: req_w _does_change after ->reconfigure
388 $self->check_size 419 $self->check_size
389 unless exists $self->{req_w}; 420 unless exists $self->{req_w};
390} 421}
391 422
392sub check_size { 423sub check_size {
393 my ($self) = @_; 424 my ($self, $forced) = @_;
394 425
426 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 428}
397 429
398sub update { 430sub update {
399 my ($self) = @_; 431 my ($self) = @_;
… …
415} 447}
416 448
417sub DESTROY { 449sub DESTROY {
418 my ($self) = @_; 450 my ($self) = @_;
419 451
452 delete $WIDGET{$self+0};
420 #$self->deactivate; 453 #$self->deactivate;
421} 454}
422 455
423############################################################################# 456#############################################################################
424 457
… …
433 my $class = shift; 466 my $class = shift;
434 467
435 # range [value, low, high, page] 468 # range [value, low, high, page]
436 469
437 $class->SUPER::new ( 470 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
440 @_ 473 @_
441 ) 474 )
442} 475}
443 476
444sub _draw { 477sub _draw {
445 my ($self) = @_; 478 my ($self) = @_;
446 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
448 486
449 glEnable GL_BLEND; 487 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
452 490
453 glBegin GL_QUADS; 491 glBegin GL_QUADS;
454 glVertex 0 , 0; 492 glVertex 0 , 0;
455 glVertex 0 , $h; 493 glVertex 0 , $h;
456 glVertex $w, $h; 494 glVertex $w, $h;
457 glVertex $w, 0; 495 glVertex $w, 0;
458 glEnd; 496 glEnd;
459 497
460 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
461} 500}
462 501
463############################################################################# 502#############################################################################
464 503
465package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
509 $self->{children} = [ 548 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 550 @{$self->{children}}, @widgets
512 ]; 551 ];
513 552
514 $self->check_size; 553 $self->check_size (1);
515 $self->update; 554 $self->update;
516} 555}
517 556
518sub children { 557sub children {
519 @{ $_[0]{children} } 558 @{ $_[0]{children} }
… …
626} 665}
627 666
628sub update { 667sub update {
629 my ($self) = @_; 668 my ($self) = @_;
630 669
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 671 $self->SUPER::update;
633} 672}
634 673
635sub size_allocate { 674sub size_allocate {
636 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
… …
774 $self->add ($self->{slider}); 813 $self->add ($self->{slider});
775 814
776 $self 815 $self
777} 816}
778 817
779#TODO# update range on size_allocate depeneing on child 818#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 819# update viewport offset on scroll
781 820
782############################################################################# 821#############################################################################
783 822
784package CFClient::UI::Frame; 823package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 827use CFClient::OpenGL;
789 828
790sub new { 829sub new {
791 my $class = shift; 830 my $class = shift;
792 831
793 my $self = $class->SUPER::new ( 832 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 833 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 834 @_,
798 ); 835 )
799
800 $self
801} 836}
802 837
803sub _draw { 838sub _draw {
804 my ($self) = @_; 839 my ($self) = @_;
805 840
806 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
807 843
808 glEnable GL_BLEND; 844 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 847
813# glBegin GL_QUADS; 848 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 849 glVertex 0 , 0;
816# glVertex 0 , $h; 850 glVertex 0 , $h;
817# glVertex $w, $h; 851 glVertex $w, $h;
818# glVertex $w, 0; 852 glVertex $w, 0;
819# glEnd; 853 glEnd;
820 854
821
822 $self->child->draw;
823 glDisable GL_BLEND; 855 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
825} 859}
826 860
827############################################################################# 861#############################################################################
828 862
829package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
843 877
844 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
847 border => 0.6, 881 border => 0.6,
882 toplevel => 1,
848 can_events => 1, 883 can_events => 1,
849 @_ 884 @_
850 ); 885 );
851 886
852 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
… …
877 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
878 913
879 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
881 916
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 918 if $self->{title};
884 919
885 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
886} 921}
887 922
… …
945 my ($self) = @_; 980 my ($self) = @_;
946 981
947 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 984
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 987
955 my $border = $self->border; 988 my $border = $self->border;
956 989
957 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 995
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 997 my $bg = $tex[0];
965 998
966 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
971 1004
972 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
976 1010
977 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1012
981 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
982 1014
983 $self->child->draw; 1015 $self->child->draw;
984} 1016}
… …
1251 1283
1252############################################################################# 1284#############################################################################
1253 1285
1254package CFClient::UI::Label; 1286package CFClient::UI::Label;
1255 1287
1256our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1257 1289
1258use CFClient::OpenGL; 1290use CFClient::OpenGL;
1259 1291
1260sub new { 1292sub new {
1261 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1262 1294
1263 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1265 #font => default_font 1299 #font => default_font
1266 #text => initial text 1300 #text => initial text
1267 #markup => initial narkup 1301 #markup => initial narkup
1268 layout => (new CFClient::Layout), 1302 layout => (new CFClient::Layout),
1269 fontsize => 1, 1303 fontsize => 1,
… …
1287 } 1321 }
1288 1322
1289 $self 1323 $self
1290} 1324}
1291 1325
1292sub escape { 1326sub escape($) {
1293 local $_ = $_[1]; 1327 local $_ = $_[0];
1294 1328
1295 s/&/&amp;/g; 1329 s/&/&amp;/g;
1296 s/>/&gt;/g; 1330 s/>/&gt;/g;
1297 s/</&lt;/g; 1331 s/</&lt;/g;
1298 1332
1299 $_[1] 1333 $_
1300} 1334}
1301 1335
1302sub update { 1336sub update {
1303 my ($self) = @_; 1337 my ($self) = @_;
1304 1338
… …
1375 $self->check_size; 1409 $self->check_size;
1376} 1410}
1377 1411
1378sub _draw { 1412sub _draw {
1379 my ($self) = @_; 1413 my ($self) = @_;
1414
1415 $self->SUPER::_draw; # draw background, if applicable
1380 1416
1381 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1418 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386 1422
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1423 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1424
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1427 : ($self->{w} - $tex->{w}) * 0.5);
1392 1428
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1431 : ($self->{h} - $tex->{h}) * 0.5);
1396 1432
1397 $tex 1433 $tex
1398 }; 1434 };
1399 1435
1400 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
… …
1455sub set_text { 1491sub set_text {
1456 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1457 1493
1458 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1495 $self->_set_text ($text);
1496 $self->update;
1460 $self->check_size; 1497 $self->check_size;
1461 $self->update;
1462} 1498}
1463 1499
1464sub get_text { 1500sub get_text {
1465 $_[0]{text} 1501 $_[0]{text}
1466} 1502}
… …
1486 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1488 1524
1489 my $text = $self->get_text; 1525 my $text = $self->get_text;
1490 1526
1491 if ($sym == 8) { 1527 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1540 $self->emit ('escape');
1505 } elsif ($uni) { 1541 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1543 }
1508 1544
1509 $self->_set_text ($text); 1545 $self->_set_text ($text);
1510 $self->update; 1546 $self->update;
1547 $self->check_size;
1511} 1548}
1512 1549
1513sub focus_in { 1550sub focus_in {
1514 my ($self) = @_; 1551 my ($self) = @_;
1515 1552
… …
1644 my $class = shift; 1681 my $class = shift;
1645 1682
1646 $class->SUPER::new ( 1683 $class->SUPER::new (
1647 padding => 4, 1684 padding => 4,
1648 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1651 can_hover => 1, 1687 can_hover => 1,
1652 align => 0, 1688 align => 0,
1653 valign => 0, 1689 valign => 0,
1654 can_events => 1, 1690 can_events => 1,
… …
1672 1708
1673 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1675 } 1711 }
1676 1712
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1682 1716
1683 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684 1718
1685 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1686 glDisable GL_BLEND;
1687 1720
1688 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1689} 1722}
1690 1723
1691############################################################################# 1724#############################################################################
… …
1705 1738
1706 $class->SUPER::new ( 1739 $class->SUPER::new (
1707 padding => 2, 1740 padding => 2,
1708 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1709 active_fg => [1, 1, 0], 1742 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5],
1710 state => 0, 1745 state => 0,
1711 can_hover => 1, 1746 can_hover => 1,
1712 @_ 1747 @_
1713 ) 1748 )
1714} 1749}
… …
1738 1773
1739 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1740 1775
1741 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742 1777
1743 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1744 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747 my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1752 glDisable GL_BLEND;
1753} 1783}
1754 1784
1755############################################################################# 1785#############################################################################
1756 1786
1757package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1800 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1801 1831
1802 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1803 } 1833 }
1804 1834
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 1837
1810 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1811 1839
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1814} 1841}
1815 1842
1816############################################################################# 1843#############################################################################
1817 1844
… …
2006 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
2007 2034
2008sub new { 2035sub new {
2009 my $class = shift; 2036 my $class = shift;
2010 2037
2011 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
2012 2039
2013 # TODO: 0-width page 2040 # TODO: 0-width page
2014 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
2015 # TODO: calculations are off 2042 # TODO: calculations are off
2016 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
2017 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
2018 active_fg => [0, 0, 0], 2045 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5],
2019 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
2020 req_w => $::WIDTH / 80, 2049 req_w => $::WIDTH / 80,
2021 req_h => $::WIDTH / 80, 2050 req_h => $::WIDTH / 80,
2022 vertical => 0, 2051 vertical => 0,
2023 can_hover => 1, 2052 can_hover => 1,
2024 inner_pad => 5, 2053 inner_pad => .05,
2025 @_ 2054 @_
2026 ); 2055 );
2027 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
2028 $self 2060 $self
2061}
2062
2063sub set_value {
2064 my ($self, $value) = @_;
2065
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067
2068 $hi = $lo + 1 if $hi <= $lo;
2069
2070 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi;
2072
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079
2080 if ($value != $old_value) {
2081 $self->emit (changed => $value);
2082 $self->update;
2083 }
2029} 2084}
2030 2085
2031sub size_request { 2086sub size_request {
2032 my ($self) = @_; 2087 my ($self) = @_;
2033 2088
… …
2046 2101
2047sub mouse_motion { 2102sub mouse_motion {
2048 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
2049 2104
2050 if ($GRAB == $self) { 2105 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107
2108 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2111
2112 $self->set_value ($x * ($hi - $lo) + $lo);
2113 }
2114}
2115
2116sub update {
2117 my ($self) = @_;
2118
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]);
2121
2051 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
2052 2123
2053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
2054 2125
2055 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2056 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2057 2127
2058 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2059 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
2060 $x = $lo if $x < $lo;
2061 $x = $hi - $page if $x > $hi - $page;
2062 $self->{range}[0] = $x;
2063 2130
2064 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2065 $self->update; 2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value;
2137 $self->{knob_w} = $page;
2066 } 2138 });
2067}
2068 2139
2069# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
2070# so that the handle doesn't leave the texture. This calculation isn't 100%
2071# correct propably, but it does the job for now
2072sub _calc_inner_pad_px {
2073 my ($self, $w) = @_;
2074 ($w / 100) * $self->{inner_pad} # % to pixels
2075} 2141}
2076 2142
2077sub _draw { 2143sub _draw {
2078 my ($self) = @_; 2144 my ($self) = @_;
2079 2145
2080 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
2081 2147
2082 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
2083 2149
2084 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
2085 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
2086 2152
2087 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
2088 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
2089
2090 ($w, $h) = ($h, $w);
2091 } 2155 }
2092 2156
2093 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095 2159
2096 my ($value, $lo, $hi, $page) = @{$self->{range}};
2097
2098 $hi = $value + 1 if $lo == $hi;
2099
2100 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2101 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2102
2103 $page = int $page * $inner_w / ($hi - $lo);
2104 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2105
2106 $w -= $page;
2107 $page &= ~1;
2108 glTranslate $page * 0.5, 0, 0;
2109 $page ||= 2;
2110
2111 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113
2114 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2162
2119 # draw background 2163 # draw background
2120 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121 2165
2122 # draw handle 2166 # draw handle
2123 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124 2168
2125 glDisable GL_BLEND;
2126 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2127} 2170}
2128 2171
2129############################################################################# 2172#############################################################################
2130 2173
… …
2141 fontsize => 1, 2184 fontsize => 1,
2142 can_events => 0, 2185 can_events => 0,
2143 #font => default_font 2186 #font => default_font
2144 @_, 2187 @_,
2145 2188
2146 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2147 par => [], 2190 par => [],
2148 height => 0, 2191 height => 0,
2149 children => [ 2192 children => [
2150 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2151 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
… …
2169 2212
2170 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2171 2214
2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $layout->set_width ($self->{children}[0]{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2174 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2175 2218
2176 ($layout->size)[1] 2219 ($layout->size)[1]
2177} 2220}
2178 2221
2179sub reflow { 2222sub reflow {
… …
2217 2260
2218 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2219 2262
2220 delete $self->{texture}; 2263 delete $self->{texture};
2221 2264
2222 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2223 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2224 my $height = 0; 2267 my $height = 0;
2225 2268
2226 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2227 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2235 2278
2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2237 glClearColor 0, 0, 0, 0; 2280 glClearColor 0, 0, 0, 0;
2238 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2239 2282
2240 glEnable GL_BLEND;
2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2242 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244 2285
2245 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2246 2287
… …
2255 2296
2256 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2298 my $h = $par->[0];
2258 2299
2259 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2260 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2261 2303
2262 glColor @{ $par->[1] };
2263 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2265 } 2306 }
2266 2307
2267 $y += $h; 2308 $y += $h;
2268 } 2309 }
2269 2310
2270 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2271 glDisable GL_BLEND;
2272 }; 2312 };
2273 }); 2313 });
2274} 2314}
2275 2315
2276sub _draw { 2316sub _draw {
2277 my ($self) = @_; 2317 my ($self) = @_;
2278 2318
2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1; 2321 glColor 1, 1, 1, 1;
2284 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2286 glDisable GL_BLEND;
2287 2324
2288 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2289 2326
2290} 2327}
2291 2328
… …
2385 @_, 2422 @_,
2386 can_events => 0, 2423 can_events => 0,
2387 ) 2424 )
2388} 2425}
2389 2426
2390sub set_markup { 2427sub set_tooltip_from {
2391 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2392 2429
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2394 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2395 $self->add ($self->{label}); 2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8,
2434 fg => [0, 0, 0, 1],
2435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 );
2396} 2437}
2397 2438
2398sub size_request { 2439sub size_request {
2399 my ($self) = @_; 2440 my ($self) = @_;
2400
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402 2441
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404 2443
2405 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2406} 2445}
… …
2412} 2451}
2413 2452
2414sub _draw { 2453sub _draw {
2415 my ($self) = @_; 2454 my ($self) = @_;
2416 2455
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2419 2457
2420 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2421 2459
2422 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2433 glVertex 0 , $h; 2471 glVertex 0 , $h;
2434 glVertex $w, $h; 2472 glVertex $w, $h;
2435 glVertex $w, 0; 2473 glVertex $w, 0;
2436 glEnd; 2474 glEnd;
2437 2475
2438 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2439
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2442} 2478}
2443 2479
2444############################################################################# 2480#############################################################################
2445 2481
… …
2468 return unless $::CONN;#d# manage and cache textures differently 2504 return unless $::CONN;#d# manage and cache textures differently
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470 2506
2471 # TODO animation 2507 # TODO animation
2472 if ($tex) { 2508 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2514 }
2482} 2515}
2483 2516
2484############################################################################# 2517#############################################################################
2485 2518
2486package CFClient::UI::InventoryItem; 2519package CFClient::UI::InventoryItem;
2487 2520
2488our @ISA = CFClient::UI::HBox::; 2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2489 2548
2490sub new { 2549sub new {
2491 my $class = shift; 2550 my $class = shift;
2492 2551
2493 my %args = @_; 2552 my %args = @_;
2494 2553
2495 my $item = delete $args{item}; 2554 my $item = delete $args{item};
2496 2555
2497 my $desc = $item->{nrof} < 2 2556 my $desc = _item_to_desc ($item);
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501 2557
2502 my $self = $class->SUPER::new ( 2558 my $self = $class->SUPER::new (
2503 can_hover => 1, 2559 can_hover => 1,
2504 can_events => 1, 2560 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc) 2561 tooltip => ((CFClient::UI::Label::escape $desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub { 2563 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_; 2564 my ($self, $ev, $x, $y) = @_;
2509 2565
2510 # todo: maybe put examine on 1? but should just be a tooltip :( 2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) { 2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2574 $::CONN->send ("move $targ $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) { 2575 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}"); 2576 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) { 2577 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new ( 2578 my @menu_items = (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2519 [ 2583 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock", 2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") }, 2585 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ], 2586 ],
2527 )->popup ($ev); 2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2528 } 2590 }
2529 2591
2530 1 2592 1
2531 }, 2593 },
2532 %args 2594 %args
2533 ); 2595 );
2596
2534 2597
2535 $self->add (new CFClient::UI::Face 2598 $self->add (new CFClient::UI::Face
2536 can_events => 0, 2599 can_events => 0,
2537 face => $item->{face}, 2600 face => $item->{face},
2538 anim => $item->{anim}, 2601 anim => $item->{anim},
2539 animspeed => $item->{animspeed}, 2602 animspeed => $item->{animspeed},
2540 ); 2603 );
2541 2604
2542 $self->add (new CFClient::UI::Label 2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2543 can_events => 0, 2606
2544 text => $desc, 2607 $self->{item} = $item;
2545 ); 2608
2609 $self->update_item;
2546 2610
2547 $self 2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2548} 2620}
2549 2621
2550############################################################################# 2622#############################################################################
2551 2623
2552package CFClient::UI::Inventory; 2624package CFClient::UI::Inventory;
… …
2568 my ($self, $items) = @_; 2640 my ($self, $items) = @_;
2569 2641
2570 $self->{scrolled}->clear; 2642 $self->{scrolled}->clear;
2571 return unless $items; 2643 return unless $items;
2572 2644
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2574 2649
2575 $self->{real_items} = \@items; 2650 $self->{real_items} = \@items;
2576 2651
2577 for my $item (@items) { 2652 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2583 } 2655 }
2656
2657 $self->{scrolled}->add (@items);
2584 2658
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586} 2660}
2587 2661
2588sub size_request { 2662sub size_request {
… …
2666 2740
2667package CFClient::UI::Statusbox; 2741package CFClient::UI::Statusbox;
2668 2742
2669our @ISA = CFClient::UI::VBox::; 2743our @ISA = CFClient::UI::VBox::;
2670 2744
2745sub new {
2746 my $class = shift;
2747
2748 $class->SUPER::new (
2749 fontsize => 0.8,
2750 @_,
2751 )
2752}
2753
2671sub reorder { 2754sub reorder {
2672 my ($self) = @_; 2755 my ($self) = @_;
2673 my $NOW = time; 2756 my $NOW = time;
2674 2757
2675 while (my ($k, $v) = each %{ $self->{item} }) { 2758 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2759 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 } 2760 }
2678 2761
2679 my @widgets; 2762 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2763
2764 my @items = sort {
2765 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} };
2768
2681 my $count = 10 + 1; 2769 my $count = 10 + 1;
2682 for my $item (@items) { 2770 for my $item (@items) {
2683 last unless --$count; 2771 last unless --$count;
2684 2772
2685 push @widgets, $item->{label} ||= do { 2773 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all) 2774 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text}; 2775 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text};
2778
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2688 for ($short) { 2781 for ($short) {
2689 s/^\s+//; 2782 s/^\s+//;
2690 s/\012.*//s; 2783 s/\s+/ /g;
2691 my $len = int 30 / $item->{fontsize}; 2784 my $len = int 40 / $fontsize;
2692 substr $_, $len, length, "…" if $len < length; 2785 substr $_, $len, length, "…" if $len < length;
2693 } 2786 }
2694 2787
2695 new CFClient::UI::Label 2788 new CFClient::UI::Label
2696 markup => $short, 2789 markup => $short,
2697 tooltip => delete $item->{tooltip}, 2790 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67,
2698 fontsize => delete $item->{fontsize}, 2793 fontsize => $fontsize,
2699 color => delete $item->{color}, 2794 fg => $item->{fg},
2700 can_events => 1, 2795 can_events => 1,
2701 can_hover => 1, 2796 can_hover => 1
2702 }; 2797 };
2703 } 2798 }
2704 2799
2705 $self->clear; 2800 $self->clear;
2706 $self->SUPER::add (@widgets); 2801 $self->SUPER::add (reverse @widgets);
2707} 2802}
2708 2803
2709sub add { 2804sub add {
2710 my ($self, $text, %arg) = @_; 2805 my ($self, $text, %arg) = @_;
2711 2806
2712 my $item = { 2807 $text =~ s/^\s+//;
2713 time => time, 2808 $text =~ s/\s+$//;
2809
2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2811
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813
2814 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) {
2816 $item->{count}++;
2817 } else {
2818 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text;
2820 }
2821 $item->{id} = ++$self->{id};
2822 $item->{timeout} = $timeout;
2823 delete $item->{label};
2824 } else {
2825 $self->{item}{$group} = {
2826 id => ++$self->{id},
2714 text => $text, 2827 text => $text,
2715 timeout => 60, 2828 timeout => $timeout,
2716 tooltip => $text, 2829 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8], 2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2719 %arg, 2833 %arg,
2834 };
2720 }; 2835 }
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726 2836
2727 $self->reorder; 2837 $self->reorder;
2728} 2838}
2729 2839
2730############################################################################# 2840#############################################################################
… …
2764} 2874}
2765 2875
2766sub size_allocate { 2876sub size_allocate {
2767 my ($self, $w, $h) = @_; 2877 my ($self, $w, $h) = @_;
2768 2878
2769 my $old_w = $self->{old_w}; 2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2770 my $old_h = $self->{old_h}; 2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2771 2881
2772 if ($old_w && $old_h) { 2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2773 for my $child ($self->children) { 2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784 2884
2785 for my $child ($self->children) { 2885 for my $child ($self->children) {
2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787 2887
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889 if exists $child->{req_x};
2890
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2892 if exists $child->{req_y};
2893
2788 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896
2790 $child->configure ($X, $Y, $W, $H); 2897 $child->configure ($X, $Y, $W, $H);
2791 } 2898 }
2792
2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795} 2899}
2796 2900
2797sub coord2local { 2901sub coord2local {
2798 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2799 2903
… …
2812 $self->check_size; 2916 $self->check_size;
2813 $::WANT_REFRESH++; 2917 $::WANT_REFRESH++;
2814} 2918}
2815 2919
2816sub add { 2920sub add {
2817 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2818 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2819 # integerise window positions 2926 # integerise window positions
2820 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2821 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2822 2930
2823 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2824} 2932}
2825 2933
2826sub on_refresh { 2934sub on_refresh {
2827 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2828 2936
2829 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2830} 2938}
2831 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2832sub draw { 2946sub draw {
2833 my ($self) = @_; 2947 my ($self) = @_;
2948
2949 while ($self->{refresh_hook}) {
2950 $_->()
2951 for values %{delete $self->{refresh_hook}};
2952 }
2834 2953
2835 if ($self->{check_size}) { 2954 if ($self->{check_size}) {
2836 my @queue = ([], []); 2955 my @queue = ([], []);
2837 2956
2838 for (;;) { 2957 for (;;) {
… …
2846 2965
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)} 2967 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request; 2968 : $widget->size_request;
2850 2969
2970 if (delete $widget->{force_alloc}
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853 2973
2854 $widget->{req_w} = $w; 2974 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h; 2975 $widget->{req_h} = $h;
2856 2976
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2858 2978
2859 $widget->{parent}->check_size 2979 $widget->{parent}->check_size
2860 if $widget->{parent}; 2980 if $widget->{parent};
2861 } 2981 }
2862 } 2982 }
… …
2874 $widget->size_allocate ($w, $h); 2994 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h); 2995 $widget->emit (size_allocate => $w, $h);
2876 } 2996 }
2877 } 2997 }
2878 2998
2879 while ($self->{refresh_hook}) { 2999 while ($self->{post_alloc_hook}) {
2880 $_->() 3000 $_->()
2881 for values %{delete $self->{refresh_hook}}; 3001 for values %{delete $self->{post_alloc_hook}};
2882 } 3002 }
2883 3003
2884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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