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.185 by root, Mon May 8 17:23:08 2006 UTC vs.
Revision 1.212 by elmex, Wed May 17 14:55:14 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
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);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $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;
135 } 158 }
136} 159}
137 160
138############################################################################# 161#############################################################################
139 162
… …
158 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
160 } 183 }
161 } 184 }
162 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
163 $self 188 $self
164} 189}
165 190
166sub destroy { 191sub destroy {
167 my ($self) = @_; 192 my ($self) = @_;
… …
232 $self->{y} = $y; 257 $self->{y} = $y;
233 $self->update; 258 $self->update;
234 } 259 }
235 260
236 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 263 }
244} 264}
245 265
246sub size_allocate { 266sub size_allocate {
247 # nothing to be done 267 # nothing to be done
248} 268}
249 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
250sub children { 277sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261} 278}
262 279
263sub set_max_size { 280sub set_max_size {
264 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
265 282
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 285}
269 286
270# return top left coordinates 287sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 288 my ($self, $tooltip) = @_;
273 289
274 $self->{parent} 290 $self->{tooltip} = $tooltip;
275 or Carp::confess "no parent widget in _topleft\n";#d#
276 291
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 292 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip;
295 }
278} 296}
279 297
280# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
281sub coord2local { 299sub coord2local {
282 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
283 301
284 my ($X, $Y) = $self->_topleft; 302 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 303}
287 304
288# translate local coordinates to global coordinate system 305# translate local coordinates to global coordinate system
289sub coord2global { 306sub coord2global {
290 my ($self, $x, $y) = @_; 307 my ($self, $x, $y) = @_;
291 308
292 my ($X, $Y) = $self->_topleft; 309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 310}
295 311
296sub focus_in { 312sub focus_in {
297 my ($self) = @_; 313 my ($self) = @_;
298 314
… …
370 glVertex $self->{w}, 0; 386 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h}; 387 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h}; 388 glVertex 0 , $self->{h};
373 glEnd; 389 glEnd;
374 glPopMatrix; 390 glPopMatrix;
375 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;
376 } 392 }
377} 393}
378 394
379sub _draw { 395sub _draw {
380 my ($self) = @_; 396 my ($self) = @_;
… …
396 412
397sub set_parent { 413sub set_parent {
398 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
399 415
400 Scalar::Util::weaken ($self->{parent} = $parent); 416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
401} 421}
402 422
403sub check_size { 423sub check_size {
404 my ($self) = @_; 424 my ($self, $forced) = @_;
405 425
406 $self->{parent} 426 $self->{force_alloc} = 1 if $forced;
407 or return 1; 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427} 428}
428 429
429sub update { 430sub update {
430 my ($self) = @_; 431 my ($self) = @_;
431 432
… …
446} 447}
447 448
448sub DESTROY { 449sub DESTROY {
449 my ($self) = @_; 450 my ($self) = @_;
450 451
452 delete $WIDGET{$self+0};
451 #$self->deactivate; 453 #$self->deactivate;
452} 454}
453 455
454############################################################################# 456#############################################################################
455 457
… …
464 my $class = shift; 466 my $class = shift;
465 467
466 # range [value, low, high, page] 468 # range [value, low, high, page]
467 469
468 $class->SUPER::new ( 470 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
471 @_ 473 @_
472 ) 474 )
473} 475}
474 476
475sub _draw { 477sub _draw {
476 my ($self) = @_; 478 my ($self) = @_;
477 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
479 486
480 glEnable GL_BLEND; 487 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
483 490
484 glBegin GL_QUADS; 491 glBegin GL_QUADS;
485 glVertex 0 , 0; 492 glVertex 0 , 0;
486 glVertex 0 , $h; 493 glVertex 0 , $h;
487 glVertex $w, $h; 494 glVertex $w, $h;
488 glVertex $w, 0; 495 glVertex $w, 0;
489 glEnd; 496 glEnd;
490 497
491 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
492} 500}
493 501
494############################################################################# 502#############################################################################
495 503
496package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
528 536
529 $self 537 $self
530} 538}
531 539
532sub add { 540sub add {
533 my ($self, $child) = @_; 541 my ($self, @widgets) = @_;
534 542
535 $child->set_parent ($self); 543 $_->set_parent ($self)
544 for @widgets;
536 545
537 use sort 'stable'; 546 use sort 'stable';
538 547
539 $self->{children} = [ 548 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 550 @{$self->{children}}, @widgets
542 ]; 551 ];
543 552
544 $child->check_size; 553 $self->check_size (1);
545 $self->update; 554 $self->update;
546} 555}
547 556
548sub children { 557sub children {
549 @{ $_[0]{children} } 558 @{ $_[0]{children} }
… …
656} 665}
657 666
658sub update { 667sub update {
659 my ($self) = @_; 668 my ($self) = @_;
660 669
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 671 $self->SUPER::update;
663} 672}
664 673
665sub size_allocate { 674sub size_allocate {
666 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
698 707
699 my $tex = $self->{texture} 708 my $tex = $self->{texture}
700 or return; 709 or return;
701 710
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 713 glColor 0, 0, 0, 1;
707 714
708 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 716
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
712} 718}
713 719
714############################################################################# 720#############################################################################
715 721
… …
739 $self->{view_y} = int $y; 745 $self->{view_y} = int $y;
740 746
741 $self->update; 747 $self->update;
742} 748}
743 749
744# hmm, this does not work for topleft of $self... but we should not aks for that 750# hmm, this does not work for topleft of $self... but we should not ask for that
745sub _topleft { 751sub coord2local {
746 my ($self, $x, $y) = @_; 752 my ($self, $x, $y) = @_;
747 753
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 754 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
755}
756
757sub coord2global {
758 my ($self, $x, $y) = @_;
759
760 $x = List::Util::min $self->{w}, $x - $self->{view_x};
761 $y = List::Util::min $self->{h}, $y - $self->{view_y};
762
763 $self->SUPER::coord2global ($x, $y)
749} 764}
750 765
751sub find_widget { 766sub find_widget {
752 my ($self, $x, $y) = @_; 767 my ($self, $x, $y) = @_;
753 768
… …
798 $self->add ($self->{slider}); 813 $self->add ($self->{slider});
799 814
800 $self 815 $self
801} 816}
802 817
803#TODO# update range on size_allocate depeneing on child 818#TODO# update range on size_allocate depending on child
804# update viewport offset on scroll 819# update viewport offset on scroll
805 820
806############################################################################# 821#############################################################################
807 822
808package CFClient::UI::Frame; 823package CFClient::UI::Frame;
… …
812use CFClient::OpenGL; 827use CFClient::OpenGL;
813 828
814sub new { 829sub new {
815 my $class = shift; 830 my $class = shift;
816 831
817 my $self = $class->SUPER::new ( 832 $class->SUPER::new (
818 bg => [1, 1, 1, 1], 833 bg => undef,
819 border_bg => [1, 1, 1, 1],
820 border => 0.8,
821 @_ 834 @_,
822 ); 835 )
823
824 $self
825} 836}
826 837
827sub _draw { 838sub _draw {
828 my ($self) = @_; 839 my ($self) = @_;
829 840
830 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
831 843
832 glEnable GL_BLEND; 844 glEnable GL_BLEND;
833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
834 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836 847
837# glBegin GL_QUADS; 848 glBegin GL_QUADS;
838# glColor 0, 0, 0, 0;
839# glVertex 0 , 0; 849 glVertex 0 , 0;
840# glVertex 0 , $h; 850 glVertex 0 , $h;
841# glVertex $w, $h; 851 glVertex $w, $h;
842# glVertex $w, 0; 852 glVertex $w, 0;
843# glEnd; 853 glEnd;
844 854
845
846 $self->child->draw;
847 glDisable GL_BLEND; 855 glDisable GL_BLEND;
848 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
849} 859}
850 860
851############################################################################# 861#############################################################################
852 862
853package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
867 877
868 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
869 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
870 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
871 border => 0.6, 881 border => 0.6,
882 toplevel => 1,
872 can_events => 1, 883 can_events => 1,
873 @_ 884 @_
874 ); 885 );
875 886
876 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
… …
901 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
902 913
903 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
904 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
905 916
906 $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)
907 if $self->{title}; 918 if $self->{title};
908 919
909 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
910} 921}
911 922
… …
969 my ($self) = @_; 980 my ($self) = @_;
970 981
971 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
972 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
973 984
974 glEnable GL_BLEND;
975 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
976 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
978 987
979 my $border = $self->border; 988 my $border = $self->border;
980 989
981 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
982 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
983 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
985 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
986 995
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
988 my $bg = $tex[0]; 997 my $bg = $tex[0];
989 998
990 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
… …
994 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
995 1004
996 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
997 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
998 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
999 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
1000 1010
1001 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003 }
1004 1012
1005 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1006 1014
1007 $self->child->draw; 1015 $self->child->draw;
1008} 1016}
… …
1235} 1243}
1236 1244
1237sub size_allocate { 1245sub size_allocate {
1238 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1239 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1240 my $children = $self->{children}; 1250 my $children = $self->{children};
1241 1251
1242 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1243 1253
1244 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1273 1283
1274############################################################################# 1284#############################################################################
1275 1285
1276package CFClient::UI::Label; 1286package CFClient::UI::Label;
1277 1287
1278our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1279 1289
1280use CFClient::OpenGL; 1290use CFClient::OpenGL;
1281 1291
1282sub new { 1292sub new {
1283 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1284 1294
1285 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1286 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1287 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1288 fontsize => 1, 1303 fontsize => 1,
1289 text => "",
1290 align => -1, 1304 align => -1,
1291 valign => -1, 1305 valign => -1,
1292 padding => 2, 1306 padding => 2,
1293 layout => new CFClient::Layout,
1294 can_events => 0, 1307 can_events => 0,
1295 %arg 1308 %arg
1296 ); 1309 );
1297 1310
1298 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1299 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1300 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1301 $self->{template} = $layout; 1314 $self->{template} = $layout;
1302 } 1315 }
1303 1316
1304 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1305 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1318 $self->set_markup (delete $self->{markup});
1319 } else {
1320 $self->set_text (delete $self->{text});
1321 }
1306 1322
1307 $self 1323 $self
1308} 1324}
1309 1325
1310sub escape { 1326sub escape($) {
1311 local $_ = $_[1]; 1327 local $_ = $_[0];
1312 1328
1313 s/&/&amp;/g; 1329 s/&/&amp;/g;
1314 s/>/&gt;/g; 1330 s/>/&gt;/g;
1315 s/</&lt;/g; 1331 s/</&lt;/g;
1316 1332
1317 $_[1] 1333 $_
1318} 1334}
1319 1335
1320sub update { 1336sub update {
1321 my ($self) = @_; 1337 my ($self) = @_;
1322 1338
1323 delete $self->{texture}; 1339 delete $self->{texture};
1324 $self->SUPER::update; 1340 $self->SUPER::update;
1325} 1341}
1326 1342
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1333sub set_text { 1343sub set_text {
1334 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1335 1345
1336 return if $self->{text} eq "T$text"; 1346 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text"; 1347 $self->{text} = "T$text";
1338 1348
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1339 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1340 1351
1341 delete $self->{texture};
1342 $self->update; 1352 $self->update;
1343 $self->check_size; 1353 $self->check_size;
1344} 1354}
1345 1355
1346sub set_markup { 1356sub set_markup {
1347 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1348 1358
1349 return if $self->{text} eq "M$markup"; 1359 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup"; 1360 $self->{text} = "M$markup";
1351 1361
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1352 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1353 1366
1354 delete $self->{texture};
1355 $self->update; 1367 $self->update;
1356 $self->check_size; 1368 $self->check_size;
1357} 1369}
1358 1370
1359sub size_request { 1371sub size_request {
… …
1390sub set_fontsize { 1402sub set_fontsize {
1391 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1392 1404
1393 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1394 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1395 $self->check_size; 1409 $self->check_size;
1396 $self->update;
1397} 1410}
1398 1411
1399sub _draw { 1412sub _draw {
1400 my ($self) = @_; 1413 my ($self) = @_;
1401 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1402 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1405 $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);
1422
1406 new_from_layout CFClient::Texture $self->{layout} 1423 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1427 : ($self->{w} - $tex->{w}) * 0.5);
1428
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1431 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1407 }; 1434 };
1408 1435
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1438
1439 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $tex->draw_quad ($self->{ox}, $self->{oy}); 1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 }
1429 1445
1430 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1447}
1433 1448
1434############################################################################# 1449#############################################################################
1435 1450
1436package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1471 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1472 1487
1473 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1474} 1489}
1475 1490
1476sub get_text {
1477 $_[0]{text}
1478}
1479
1480sub size_request {
1481 my ($self) = @_;
1482
1483 my ($w, $h) = $self->SUPER::size_request;
1484
1485 ($w + 1, $h) # add 1 for cursor
1486}
1487
1488sub size_allocate {
1489 my ($self, $w, $h) = @_;
1490
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492}
1493
1494sub set_text { 1491sub set_text {
1495 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1496 1493
1497 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1498 $self->_set_text ($text); 1495 $self->_set_text ($text);
1499 $self->update; 1496 $self->update;
1497 $self->check_size;
1498}
1499
1500sub get_text {
1501 $_[0]{text}
1502}
1503
1504sub size_request {
1505 my ($self) = @_;
1506
1507 my ($w, $h) = $self->SUPER::size_request;
1508
1509 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1500} 1516}
1501 1517
1502sub key_down { 1518sub key_down {
1503 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1504 1520
… …
1506 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1508 1524
1509 my $text = $self->get_text; 1525 my $text = $self->get_text;
1510 1526
1511 if ($sym == 8) { 1527 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1540 $self->emit ('escape');
1525 } elsif ($uni) { 1541 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1543 }
1528 1544
1529 $self->_set_text ($text); 1545 $self->_set_text ($text);
1530 $self->update; 1546 $self->update;
1547 $self->check_size;
1531} 1548}
1532 1549
1533sub focus_in { 1550sub focus_in {
1534 my ($self) = @_; 1551 my ($self) = @_;
1535 1552
… …
1664 my $class = shift; 1681 my $class = shift;
1665 1682
1666 $class->SUPER::new ( 1683 $class->SUPER::new (
1667 padding => 4, 1684 padding => 4,
1668 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1671 can_hover => 1, 1687 can_hover => 1,
1672 align => 0, 1688 align => 0,
1673 valign => 0, 1689 valign => 0,
1674 can_events => 1, 1690 can_events => 1,
… …
1692 1708
1693 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1695 } 1711 }
1696 1712
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1702 1716
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1718
1705 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1720
1708 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1709} 1722}
1710 1723
1711############################################################################# 1724#############################################################################
… …
1725 1738
1726 $class->SUPER::new ( 1739 $class->SUPER::new (
1727 padding => 2, 1740 padding => 2,
1728 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1729 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],
1730 state => 0, 1745 state => 0,
1731 can_hover => 1, 1746 can_hover => 1,
1732 @_ 1747 @_
1733 ) 1748 )
1734} 1749}
… …
1758 1773
1759 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;
1760 1775
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1777
1763 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1764 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1783}
1774 1784
1775############################################################################# 1785#############################################################################
1776 1786
1777package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1821 1831
1822 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1823 } 1833 }
1824 1834
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1837
1830 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1839
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1834} 1841}
1835 1842
1836############################################################################# 1843#############################################################################
1837 1844
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
2027 2034
2028sub new { 2035sub new {
2029 my $class = shift; 2036 my $class = shift;
2030 2037
2031 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
2032 2039
2033 # TODO: 0-width page 2040 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2042 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
2038 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],
2039 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
2040 req_w => $::WIDTH / 80, 2049 req_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2050 req_h => $::WIDTH / 80,
2042 vertical => 0, 2051 vertical => 0,
2043 can_hover => 1, 2052 can_hover => 1,
2044 inner_pad => 5, 2053 inner_pad => .05,
2045 @_ 2054 @_
2046 ); 2055 );
2047 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
2048 $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 }
2049} 2084}
2050 2085
2051sub size_request { 2086sub size_request {
2052 my ($self) = @_; 2087 my ($self) = @_;
2053 2088
… …
2066 2101
2067sub mouse_motion { 2102sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
2069 2104
2070 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
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
2072 2123
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
2074 2125
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2076 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2077 2127
2078 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
2080 $x = $lo if $x < $lo;
2081 $x = $hi - $page if $x > $hi - $page;
2082 $self->{range}[0] = $x;
2083 2130
2084 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2085 $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;
2086 } 2138 });
2087}
2088 2139
2089# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
2090# so that the handle doesn't leave the texture. This calculation isn't 100%
2091# correct propably, but it does the job for now
2092sub _calc_inner_pad_px {
2093 my ($self, $w) = @_;
2094 ($w / 100) * $self->{inner_pad} # % to pixels
2095} 2141}
2096 2142
2097sub _draw { 2143sub _draw {
2098 my ($self) = @_; 2144 my ($self) = @_;
2099 2145
2100 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
2101 2147
2102 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
2103 2149
2104 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
2106 2152
2107 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2155 }
2112 2156
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2159
2116 my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118 $hi = $value + 1 if $lo == $hi;
2119
2120 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123 $page = int $page * $inner_w / ($hi - $lo);
2124 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126 $w -= $page;
2127 $page &= ~1;
2128 glTranslate $page * 0.5, 0, 0;
2129 $page ||= 2;
2130
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2162
2139 # draw background 2163 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2165
2142 # draw handle 2166 # draw handle
2143 $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);
2144 2168
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
2147} 2170}
2148 2171
2149############################################################################# 2172#############################################################################
2150 2173
… …
2161 fontsize => 1, 2184 fontsize => 1,
2162 can_events => 0, 2185 can_events => 0,
2163 #font => default_font 2186 #font => default_font
2164 @_, 2187 @_,
2165 2188
2166 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2167 par => [], 2190 par => [],
2168 height => 0, 2191 height => 0,
2169 children => [ 2192 children => [
2170 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
… …
2189 2212
2190 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2191 2214
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2195 2218
2196 ($layout->size)[1] 2219 ($layout->size)[1]
2197} 2220}
2198 2221
2199sub reflow { 2222sub reflow {
… …
2237 2260
2238 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2239 2262
2240 delete $self->{texture}; 2263 delete $self->{texture};
2241 2264
2242 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2243 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2267 my $height = 0;
2245 2268
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2247 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2255 2278
2256 $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 {
2257 glClearColor 0, 0, 0, 0; 2280 glClearColor 0, 0, 0, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2259 2282
2260 glEnable GL_BLEND;
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264 2285
2265 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2266 2287
… …
2275 2296
2276 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2298 my $h = $par->[0];
2278 2299
2279 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2280 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2281 2303
2282 glColor @{ $par->[1] };
2283 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2284 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);
2285 } 2306 }
2286 2307
2287 $y += $h; 2308 $y += $h;
2288 } 2309 }
2289 2310
2290 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND;
2292 }; 2312 };
2293 }); 2313 });
2294} 2314}
2295 2315
2296sub _draw { 2316sub _draw {
2297 my ($self) = @_; 2317 my ($self) = @_;
2298 2318
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2321 glColor 1, 1, 1, 1;
2304 $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});
2305 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2324
2308 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2309 2326
2310} 2327}
2311 2328
… …
2405 @_, 2422 @_,
2406 can_events => 0, 2423 can_events => 0,
2407 ) 2424 )
2408} 2425}
2409 2426
2410sub set_markup { 2427sub set_tooltip_from {
2411 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2412 2429
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2415 $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 );
2416} 2437}
2417 2438
2418sub size_request { 2439sub size_request {
2419 my ($self) = @_; 2440 my ($self) = @_;
2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422 2441
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2443
2425 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2426} 2445}
… …
2432} 2451}
2433 2452
2434sub _draw { 2453sub _draw {
2435 my ($self) = @_; 2454 my ($self) = @_;
2436 2455
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2439 2457
2440 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2441 2459
2442 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2471 glVertex 0 , $h;
2454 glVertex $w, $h; 2472 glVertex $w, $h;
2455 glVertex $w, 0; 2473 glVertex $w, 0;
2456 glEnd; 2474 glEnd;
2457 2475
2458 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2459
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2462} 2478}
2463 2479
2464############################################################################# 2480#############################################################################
2465 2481
… …
2488 return unless $::CONN;#d# manage and cache textures differently 2504 return unless $::CONN;#d# manage and cache textures differently
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2490 2506
2491 # TODO animation 2507 # TODO animation
2492 if ($tex) { 2508 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 } 2514 }
2515}
2516
2517#############################################################################
2518
2519package CFClient::UI::InventoryItem;
2520
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}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
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
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
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") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
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);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2502} 2665}
2503 2666
2504############################################################################# 2667#############################################################################
2505 2668
2506package CFClient::UI::Menu; 2669package CFClient::UI::Menu;
… …
2573 } 2736 }
2574} 2737}
2575 2738
2576############################################################################# 2739#############################################################################
2577 2740
2741package CFClient::UI::Statusbox;
2742
2743our @ISA = CFClient::UI::VBox::;
2744
2745sub new {
2746 my $class = shift;
2747
2748 $class->SUPER::new (
2749 fontsize => 0.8,
2750 @_,
2751 )
2752}
2753
2754sub reorder {
2755 my ($self) = @_;
2756 my $NOW = time;
2757
2758 while (my ($k, $v) = each %{ $self->{item} }) {
2759 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2760 }
2761
2762 my @widgets;
2763
2764 my @items = sort {
2765 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} };
2768
2769 my $count = 10 + 1;
2770 for my $item (@items) {
2771 last unless --$count;
2772
2773 push @widgets, $item->{label} ||= do {
2774 # TODO: doesn't handle markup well (read as: at all)
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
2781 for ($short) {
2782 s/^\s+//;
2783 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 }
2787
2788 new CFClient::UI::Label
2789 markup => $short,
2790 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67,
2793 fontsize => $fontsize,
2794 fg => $item->{fg},
2795 can_events => 1,
2796 can_hover => 1
2797 };
2798 }
2799
2800 $self->clear;
2801 $self->SUPER::add (reverse @widgets);
2802}
2803
2804sub add {
2805 my ($self, $text, %arg) = @_;
2806
2807 $text =~ s/^\s+//;
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},
2827 text => $text,
2828 timeout => $timeout,
2829 tooltip => $text,
2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2833 %arg,
2834 };
2835 }
2836
2837 $self->reorder;
2838}
2839
2840#############################################################################
2841
2578package CFClient::UI::Root; 2842package CFClient::UI::Root;
2579 2843
2580our @ISA = CFClient::UI::Container::; 2844our @ISA = CFClient::UI::Container::;
2581 2845
2582use CFClient::OpenGL; 2846use CFClient::OpenGL;
2583 2847
2584sub check_size { 2848sub new {
2585 my ($self) = @_; 2849 my $class = shift;
2586 2850
2587 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2851 $class->SUPER::new (
2588} 2852 @_,
2589 2853 )
2590sub size_request {
2591 ($::WIDTH, $::HEIGHT)
2592} 2854}
2593 2855
2594sub configure { 2856sub configure {
2595 my ($self, $x, $y, $w, $h) = @_; 2857 my ($self, $x, $y, $w, $h) = @_;
2596 2858
2597 $self->SUPER::configure ($x, $y, $w, $h); 2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2598 2862
2863sub check_size {
2864 my ($self) = @_;
2865
2866 $self->size_allocate ($self->{w}, $self->{h})
2867 if $self->{w};
2868}
2869
2870sub size_request {
2871 my ($self) = @_;
2872
2873 ($self->{w}, $self->{h})
2874}
2875
2876sub size_allocate {
2877 my ($self, $w, $h) = @_;
2878
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2599 for my $child (@{$self->{children}}) { 2885 for my $child ($self->children) {
2600 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)};
2601 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
2602 $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;
2603 $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
2604 $child->configure ($X, $Y, $W,$H); 2897 $child->configure ($X, $Y, $W, $H);
2605 } 2898 }
2606} 2899}
2607 2900
2608sub _topleft { 2901sub coord2local {
2609 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2610 2903
2611 ($x, $y) 2904 ($x, $y)
2612} 2905}
2613 2906
2907sub coord2global {
2908 my ($self, $x, $y) = @_;
2909
2910 ($x, $y)
2911}
2912
2614sub update { 2913sub update {
2615 my ($self) = @_; 2914 my ($self) = @_;
2616 2915
2617 $self->check_size; 2916 $self->check_size;
2618 ::refresh (); 2917 $::WANT_REFRESH++;
2619} 2918}
2620 2919
2621sub add { 2920sub add {
2622 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2623 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2624 # integerize window positions 2926 # integerise window positions
2625 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2626 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2627 2930
2628 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2629} 2932}
2630 2933
2631sub on_refresh { 2934sub on_refresh {
2632 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2633 2936
2634 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2635} 2938}
2636 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2637sub draw { 2946sub draw {
2638 my ($self) = @_; 2947 my ($self) = @_;
2639 2948
2640 while (my $rcb = delete $self->{refresh_hook}) { 2949 while ($self->{refresh_hook}) {
2641 $_->() for values %$rcb; 2950 $_->()
2951 for values %{delete $self->{refresh_hook}};
2952 }
2953
2954 if ($self->{check_size}) {
2955 my @queue = ([], []);
2956
2957 for (;;) {
2958 if ($self->{check_size}) {
2959 # heuristic: check containers last
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2961 for values %{delete $self->{check_size}}
2962 }
2963
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2965
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2967 ? @$widget{qw(user_w user_h)}
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973
2974 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h;
2976
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2978
2979 $widget->{parent}->check_size
2980 if $widget->{parent};
2981 }
2982 }
2983 }
2984
2985 while ($self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) {
2987 my ($widget, $w, $h) = @$_;
2988
2989 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0;
2991
2992 $widget->{w} = $w;
2993 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h);
2995 $widget->emit (size_allocate => $w, $h);
2996 }
2997 }
2998
2999 while ($self->{post_alloc_hook}) {
3000 $_->()
3001 for values %{delete $self->{post_alloc_hook}};
2642 } 3002 }
2643 3003
2644 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2645 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2646 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;
… …
2654 $self->_draw; 3014 $self->_draw;
2655} 3015}
2656 3016
2657############################################################################# 3017#############################################################################
2658 3018
2659package CFClient::UI::InventoryItem;
2660
2661our @ISA = CFClient::UI::HBox::;
2662
2663sub new {
2664 my $class = shift;
2665
2666 my %args = @_;
2667
2668 my $item = $args{item};
2669
2670 my $desc = $item->{nrof} < 2
2671 ? $item->{name}
2672 : "$item->{nrof} $item->{name_pl}";
2673
2674
2675 my $self = $class->SUPER::new (
2676 can_hover => 1,
2677 can_events => 1,
2678 tooltip => (CFClient::UI::Label->escape ($desc)
2679 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2680 connect_button_down => sub {
2681 my ($self, $ev, $x, $y) = @_;
2682
2683 # todo: maybe put examine on 1? but should just be a tooltip :(
2684 if ($ev->{button} == 1) {
2685 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2686 } elsif ($ev->{button} == 2) {
2687 $::CONN->send ("apply $item->{tag}");
2688 } elsif ($ev->{button} == 3) {
2689 CFClient::UI::Menu->new (
2690 items => [
2691 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2692 [
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2694 sub { $::CONN->send ("lock $item->{tag}") },
2695 ],
2696 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2697 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2698 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2699 ],
2700 )->popup ($ev);
2701 }
2702
2703 1
2704 },
2705 %args
2706 );
2707 $self->add(new CFClient::UI::Face
2708 can_events => 0,
2709 face => $item->{face},
2710 anim => $item->{anim},
2711 animspeed => $item->{animspeed});
2712 $self->add(new CFClient::UI::Label
2713 can_events => 0,
2714 text => $desc);
2715
2716 $self
2717}
2718
2719#############################################################################
2720
2721package CFClient::UI::Inventory;
2722
2723our @ISA = CFClient::UI::ScrolledWindow::;
2724
2725sub new {
2726 my $class = shift;
2727
2728 my $self = $class->SUPER::new (
2729 scrolled => (new CFClient::UI::VBox),
2730 @_,
2731 );
2732
2733 $self
2734}
2735
2736sub set_items {
2737 my ($self, $items) = @_;
2738
2739 $self->{scrolled}->clear;
2740 return unless $items;
2741
2742 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 for my $item (@items) {
2747 my $desc = $item->{nrof} < 2
2748 ? $item->{name}
2749 : "$item->{nrof} $item->{name_pl}";
2750
2751 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2752 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755}
2756
2757sub size_request {
2758 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h});
2760}
2761
2762#############################################################################
2763
2764package CFClient::UI; 3019package CFClient::UI;
2765 3020
2766$ROOT = new CFClient::UI::Root; 3021$ROOT = new CFClient::UI::Root;
2767$TOOLTIP = new CFClient::UI::Tooltip; 3022$TOOLTIP = new CFClient::UI::Tooltip;
2768 3023

Diff Legend

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