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.187 by root, Mon May 8 20:40:31 2006 UTC vs.
Revision 1.225 by root, Tue May 23 21:14:41 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
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
135 } 169 }
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
… …
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
… …
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
179} 227}
180 228
181sub hide { 229sub hide {
182 my ($self) = @_; 230 my ($self) = @_;
183 231
… …
232 $self->{y} = $y; 280 $self->{y} = $y;
233 $self->update; 281 $self->update;
234 } 282 }
235 283
236 if ($self->{w} != $w || $self->{h} != $h) { 284 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 285 $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 } 286 }
244} 287}
245 288
246sub size_allocate { 289sub size_allocate {
247 # nothing to be done 290 # nothing to be done
248} 291}
249 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
250sub children { 300sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 301}
264 302
265sub set_max_size { 303sub set_max_size {
266 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
267 305
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 308}
271 309
272# return top left coordinates 310sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 311 my ($self, $tooltip) = @_;
275 312
276 $self->{parent} 313 $self->{tooltip} = $tooltip;
277 or Carp::confess "no parent widget in _topleft\n";#d#
278 314
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
280} 319}
281 320
282# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
283sub coord2local { 322sub coord2local {
284 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
285 324
286 my ($X, $Y) = $self->_topleft; 325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 326}
289 327
290# translate local coordinates to global coordinate system 328# translate local coordinates to global coordinate system
291sub coord2global { 329sub coord2global {
292 my ($self, $x, $y) = @_; 330 my ($self, $x, $y) = @_;
293 331
294 my ($X, $Y) = $self->_topleft; 332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 333}
297 334
298sub focus_in { 335sub focus_in {
299 my ($self) = @_; 336 my ($self) = @_;
300 337
… …
372 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
375 glEnd; 412 glEnd;
376 glPopMatrix; 413 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 415 }
379} 416}
380 417
381sub _draw { 418sub _draw {
382 my ($self) = @_; 419 my ($self) = @_;
… …
398 435
399sub set_parent { 436sub set_parent {
400 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
401 438
402 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
403} 446}
404 447
405sub check_size { 448sub check_size {
406 my ($self) = @_; 449 my ($self, $forced) = @_;
407 450
408 $self->{parent} 451 $self->{force_alloc} = 1 if $forced;
409 or return 1; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 453}
430 454
431sub update { 455sub update {
432 my ($self) = @_; 456 my ($self) = @_;
433 457
… …
448} 472}
449 473
450sub DESTROY { 474sub DESTROY {
451 my ($self) = @_; 475 my ($self) = @_;
452 476
477 delete $WIDGET{$self+0};
453 #$self->deactivate; 478 #$self->deactivate;
454} 479}
455 480
456############################################################################# 481#############################################################################
457 482
… …
466 my $class = shift; 491 my $class = shift;
467 492
468 # range [value, low, high, page] 493 # range [value, low, high, page]
469 494
470 $class->SUPER::new ( 495 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
473 @_ 498 @_
474 ) 499 )
475} 500}
476 501
477sub _draw { 502sub _draw {
478 my ($self) = @_; 503 my ($self) = @_;
479 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
481 511
482 glEnable GL_BLEND; 512 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
485 515
486 glBegin GL_QUADS; 516 glBegin GL_QUADS;
487 glVertex 0 , 0; 517 glVertex 0 , 0;
488 glVertex 0 , $h; 518 glVertex 0 , $h;
489 glVertex $w, $h; 519 glVertex $w, $h;
490 glVertex $w, 0; 520 glVertex $w, 0;
491 glEnd; 521 glEnd;
492 522
493 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
494} 525}
495 526
496############################################################################# 527#############################################################################
497 528
498package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
530 561
531 $self 562 $self
532} 563}
533 564
534sub add { 565sub add {
535 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
536 567
537 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
538 570
539 use sort 'stable'; 571 use sort 'stable';
540 572
541 $self->{children} = [ 573 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
544 ]; 576 ];
545 577
546 $child->check_size; 578 $self->check_size (1);
547 $self->update; 579 $self->update;
548} 580}
549 581
550sub children { 582sub children {
551 @{ $_[0]{children} } 583 @{ $_[0]{children} }
… …
658} 690}
659 691
660sub update { 692sub update {
661 my ($self) = @_; 693 my ($self) = @_;
662 694
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 696 $self->SUPER::update;
665} 697}
666 698
667sub size_allocate { 699sub size_allocate {
668 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
… …
681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
684 716
685 $self->_render; 717 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 718 };
694} 719}
695 720
696sub _draw { 721sub _draw {
697 my ($self) = @_; 722 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 724 my ($w, $h) = ($self->w, $self->h);
700 725
701 my $tex = $self->{texture} 726 my $tex = $self->{texture}
702 or return; 727 or return;
703 728
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
709 732
710 $tex->draw_quad (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 734
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
714} 736}
715 737
716############################################################################# 738#############################################################################
717 739
… …
721 743
722sub size_request { 744sub size_request {
723 my ($self) = @_; 745 my ($self) = @_;
724 746
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 748
728 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
729} 750}
730 751
731sub size_allocate { 752sub size_allocate {
732 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
733 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
734 $self->update; 758 $self->update;
735} 759}
736 760
737sub set_offset { 761sub set_offset {
738 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 765 $self->{view_y} = int $y;
742 766
743 $self->update; 767 $self->update;
744} 768}
745 769
746# hmm, this does not work for topleft of $self... but we should not aks for that 770# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 771sub coord2local {
748 my ($self, $x, $y) = @_; 772 my ($self, $x, $y) = @_;
749 773
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 774 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
775}
776
777sub coord2global {
778 my ($self, $x, $y) = @_;
779
780 $x = List::Util::min $self->{w}, $x - $self->{view_x};
781 $y = List::Util::min $self->{h}, $y - $self->{view_y};
782
783 $self->SUPER::coord2global ($x, $y)
751} 784}
752 785
753sub find_widget { 786sub find_widget {
754 my ($self, $x, $y) = @_; 787 my ($self, $x, $y) = @_;
755 788
… …
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
789 }, 822 },
790 ; 823 ;
791 824
792 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 827 slider => $slider,
795 @_, 828 @_,
796 ); 829 );
797 830
798 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 833 $self->add ($self->{slider});
801 834
802 $self 835 $self
803} 836}
804 837
805#TODO# update range on size_allocate depeneing on child 838#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 839# update viewport offset on scroll
807 840
808############################################################################# 841#############################################################################
809 842
810package CFClient::UI::Frame; 843package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 847use CFClient::OpenGL;
815 848
816sub new { 849sub new {
817 my $class = shift; 850 my $class = shift;
818 851
819 my $self = $class->SUPER::new ( 852 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 853 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 854 @_,
824 ); 855 )
825
826 $self
827} 856}
828 857
829sub _draw { 858sub _draw {
830 my ($self) = @_; 859 my ($self) = @_;
831 860
832 my ($w, $h) = ($self->{w}, $self->{h}); 861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
833 863
834 glEnable GL_BLEND; 864 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 866 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 867
839# glBegin GL_QUADS; 868 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 869 glVertex 0 , 0;
842# glVertex 0 , $h; 870 glVertex 0 , $h;
843# glVertex $w, $h; 871 glVertex $w, $h;
844# glVertex $w, 0; 872 glVertex $w, 0;
845# glEnd; 873 glEnd;
846 874
847
848 $self->child->draw;
849 glDisable GL_BLEND; 875 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 876 }
877
878 $self->SUPER::_draw;
851} 879}
852 880
853############################################################################# 881#############################################################################
854 882
855package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
… …
869 897
870 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
873 border => 0.6, 901 border => 0.6,
902 toplevel => 1,
874 can_events => 1, 903 can_events => 1,
875 @_ 904 @_
876 ); 905 );
877 906
878 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
… …
903 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
904 933
905 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
907 936
908 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
909 if $self->{title}; 938 if $self->{title};
910 939
911 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
912} 941}
913 942
… …
971 my ($self) = @_; 1000 my ($self) = @_;
972 1001
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1002 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1004
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1005 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1007
981 my $border = $self->border; 1008 my $border = $self->border;
982 1009
983 glColor @{ $self->{border_bg} }; 1010 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1015
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1017 my $bg = $tex[0];
991 1018
992 # TODO: repeat texture not scale 1019 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1023 glColor @{ $self->{bg} };
997 1024
998 $bg->{s} = $rep_x; 1025 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1026 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1027 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 }
1002 1030
1003 glDisable GL_TEXTURE_2D; 1031 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1032
1007 $self->{title}->draw if $self->{title}; 1033 $self->{title}->draw if $self->{title};
1008 1034
1009 $self->child->draw; 1035 $self->child->draw;
1010} 1036}
… …
1237} 1263}
1238 1264
1239sub size_allocate { 1265sub size_allocate {
1240 my ($self, $w, $h) = @_; 1266 my ($self, $w, $h) = @_;
1241 1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1242 my $children = $self->{children}; 1270 my $children = $self->{children};
1243 1271
1244 my @h = map $_->{req_h}, @$children; 1272 my @h = map $_->{req_h}, @$children;
1245 1273
1246 my $req_h = List::Util::sum @h; 1274 my $req_h = List::Util::sum @h;
… …
1275 1303
1276############################################################################# 1304#############################################################################
1277 1305
1278package CFClient::UI::Label; 1306package CFClient::UI::Label;
1279 1307
1280our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1281 1309
1282use CFClient::OpenGL; 1310use CFClient::OpenGL;
1283 1311
1284sub new { 1312sub new {
1285 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1286 1314
1287 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1289 #font => default_font 1319 #font => default_font
1320 #text => initial text
1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1324 layout => (new CFClient::Layout),
1290 fontsize => 1, 1325 fontsize => 1,
1291 text => "",
1292 align => -1, 1326 align => -1,
1293 valign => -1, 1327 valign => -1,
1294 padding => 2, 1328 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1329 can_events => 0,
1297 %arg 1330 %arg
1298 ); 1331 );
1299 1332
1300 if (exists $self->{template}) { 1333 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1334 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1335 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1336 $self->{template} = $layout;
1304 } 1337 }
1305 1338
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1339 if (exists $self->{markup}) {
1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1340 $self->set_markup (delete $self->{markup});
1341 } else {
1342 $self->set_text (delete $self->{text});
1343 }
1308 1344
1309 $self 1345 $self
1310} 1346}
1311 1347
1312sub escape { 1348sub escape($) {
1313 local $_ = $_[1]; 1349 local $_ = $_[0];
1314 1350
1315 s/&/&amp;/g; 1351 s/&/&amp;/g;
1316 s/>/&gt;/g; 1352 s/>/&gt;/g;
1317 s/</&lt;/g; 1353 s/</&lt;/g;
1318 1354
1319 $_[1] 1355 $_
1320} 1356}
1321 1357
1322sub update { 1358sub update {
1323 my ($self) = @_; 1359 my ($self) = @_;
1324 1360
… …
1330 my ($self, $text) = @_; 1366 my ($self, $text) = @_;
1331 1367
1332 return if $self->{text} eq "T$text"; 1368 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1369 $self->{text} = "T$text";
1334 1370
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1372 $self->{layout}->set_text ($text);
1336 1373
1337 delete $self->{texture};
1338 $self->update; 1374 $self->update;
1339 $self->check_size; 1375 $self->check_size;
1340} 1376}
1341 1377
1342sub set_markup { 1378sub set_markup {
1343 my ($self, $markup) = @_; 1379 my ($self, $markup) = @_;
1344 1380
1345 return if $self->{text} eq "M$markup"; 1381 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1382 $self->{text} = "M$markup";
1347 1383
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1387 $self->{layout}->set_markup ($markup);
1349 1388
1350 delete $self->{texture};
1351 $self->update; 1389 $self->update;
1352 $self->check_size; 1390 $self->check_size;
1353} 1391}
1354 1392
1355sub size_request { 1393sub size_request {
1356 my ($self) = @_; 1394 my ($self) = @_;
1357 1395
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1); 1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1401
1362 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1363 1403
1364 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1394} 1434}
1395 1435
1396sub _draw { 1436sub _draw {
1397 my ($self) = @_; 1437 my ($self) = @_;
1398 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1399 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448
1403 new_from_layout CFClient::Texture $self->{layout} 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1450
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1453 : ($self->{w} - $tex->{w}) * 0.5);
1454
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1404 }; 1460 };
1405 1461
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1464
1465 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1466 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $tex->draw_quad ($self->{ox}, $self->{oy}); 1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 }
1426 1471
1427 glDisable GL_TEXTURE_2D; 1472 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1473}
1430 1474
1431############################################################################# 1475#############################################################################
1432 1476
1433package CFClient::UI::EntryBase; 1477package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1447 can_hover => 1, 1491 can_hover => 1,
1448 can_focus => 1, 1492 can_focus => 1,
1449 valign => 0, 1493 valign => 0,
1450 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1451 @_ 1496 @_
1452 ) 1497 )
1453} 1498}
1454 1499
1455sub _set_text { 1500sub _set_text {
… …
1466 1511
1467 $text =~ s/./*/g if $self->{hidden}; 1512 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1513 $self->{layout}->set_text ("$text ");
1469 1514
1470 $self->emit (changed => $self->{text}); 1515 $self->emit (changed => $self->{text});
1471}
1472
1473sub get_text {
1474 $_[0]{text}
1475}
1476
1477sub size_request {
1478 my ($self) = @_;
1479
1480 my ($w, $h) = $self->SUPER::size_request;
1481
1482 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489} 1516}
1490 1517
1491sub set_text { 1518sub set_text {
1492 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1493 1520
1494 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1522 $self->_set_text ($text);
1496 $self->update; 1523 $self->update;
1524 $self->check_size;
1525}
1526
1527sub get_text {
1528 $_[0]{text}
1529}
1530
1531sub size_request {
1532 my ($self) = @_;
1533
1534 my ($w, $h) = $self->SUPER::size_request;
1535
1536 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1497} 1543}
1498 1544
1499sub key_down { 1545sub key_down {
1500 my ($self, $ev) = @_; 1546 my ($self, $ev) = @_;
1501 1547
… …
1503 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1505 1551
1506 my $text = $self->get_text; 1552 my $text = $self->get_text;
1507 1553
1508 if ($sym == 8) { 1554 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1567 $self->emit ('escape');
1522 } elsif ($uni) { 1568 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1570 }
1525 1571
1526 $self->_set_text ($text); 1572 $self->_set_text ($text);
1527 $self->update; 1573 $self->update;
1574 $self->check_size;
1528} 1575}
1529 1576
1530sub focus_in { 1577sub focus_in {
1531 my ($self) = @_; 1578 my ($self) = @_;
1532 1579
… …
1661 my $class = shift; 1708 my $class = shift;
1662 1709
1663 $class->SUPER::new ( 1710 $class->SUPER::new (
1664 padding => 4, 1711 padding => 4,
1665 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1668 can_hover => 1, 1714 can_hover => 1,
1669 align => 0, 1715 align => 0,
1670 valign => 0, 1716 valign => 0,
1671 can_events => 1, 1717 can_events => 1,
… …
1689 1735
1690 if ($GRAB == $self) { 1736 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1737 $self->{fg} = $self->{active_fg};
1692 } 1738 }
1693 1739
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1742 glColor 0, 0, 0, 1;
1699 1743
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1744 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1745
1702 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1747
1705 $self->SUPER::_draw; 1748 $self->SUPER::_draw;
1706} 1749}
1707 1750
1708############################################################################# 1751#############################################################################
… …
1722 1765
1723 $class->SUPER::new ( 1766 $class->SUPER::new (
1724 padding => 2, 1767 padding => 2,
1725 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1726 active_fg => [1, 1, 0], 1769 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5],
1727 state => 0, 1772 state => 0,
1728 can_hover => 1, 1773 can_hover => 1,
1729 @_ 1774 @_
1730 ) 1775 )
1731} 1776}
… …
1755 1800
1756 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1757 1802
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1804
1760 glEnable GL_BLEND; 1805 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806
1761 glEnable GL_TEXTURE_2D; 1807 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1808 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1809 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1810}
1771 1811
1772############################################################################# 1812#############################################################################
1773 1813
1774package CFClient::UI::Image; 1814package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1857 glTranslate 0, -$self->{w}, 0;
1818 1858
1819 ($w, $h) = ($h, $w); 1859 ($w, $h) = ($h, $w);
1820 } 1860 }
1821 1861
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1862 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1864
1827 $tex->draw_quad (0, 0, $w, $h); 1865 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1866
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1831} 1868}
1832 1869
1833############################################################################# 1870#############################################################################
1834 1871
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
2024 2061
2025sub new { 2062sub new {
2026 my $class = shift; 2063 my $class = shift;
2027 2064
2028 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
2029 2066
2030 # TODO: 0-width page 2067 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2069 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2035 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5],
2036 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
2037 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2039 vertical => 0, 2078 vertical => 0,
2040 can_hover => 1, 2079 can_hover => 1,
2041 inner_pad => 5, 2080 inner_pad => 0.02,
2042 @_ 2081 @_
2043 ); 2082 );
2044 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
2045 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2098sub set_value {
2099 my ($self, $value) = @_;
2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102
2103 $hi = $lo + 1 if $hi <= $lo;
2104
2105 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi;
2107
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
2046} 2119}
2047 2120
2048sub size_request { 2121sub size_request {
2049 my ($self) = @_; 2122 my ($self) = @_;
2050 2123
… …
2063 2136
2064sub mouse_motion { 2137sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
2066 2139
2067 if ($GRAB == $self) { 2140 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142
2143 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2146
2147 $self->set_value ($x * ($hi - $lo) + $lo);
2148 }
2149}
2150
2151sub update {
2152 my ($self) = @_;
2153
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]);
2156
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2157 my ($value, $lo, $hi, $page) = @{$self->{range}};
2069 2158
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2159 my $inner_w = 1 - 2 * $self->{inner_pad};
2071 2160
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2074 2162
2075 $x -= $inner_pad_px; # substract the padding 2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2164 $value = $self->{scale} * ($value - $lo);
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2165
2081 $self->emit (changed => $x); 2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2082 $self->update; 2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value;
2172 $self->{knob_w} = $page;
2083 } 2173 });
2084}
2085 2174
2086# the inner_* stuff is for generating a padding for the slider handle, 2175 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2176}
2093 2177
2094sub _draw { 2178sub _draw {
2095 my ($self) = @_; 2179 my ($self) = @_;
2096 2180
2097 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
2098 2182
2099 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
2100 2184
2101 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2103 2187
2188 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2190 }
2109 2191
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2194
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2195 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2197
2136 # draw background 2198 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2200
2139 # draw handle 2201 # draw handle
2140 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2141 2203
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2144} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2145 2247
2146############################################################################# 2248#############################################################################
2147 2249
2148package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2149 2251
… …
2158 fontsize => 1, 2260 fontsize => 1,
2159 can_events => 0, 2261 can_events => 0,
2160 #font => default_font 2262 #font => default_font
2161 @_, 2263 @_,
2162 2264
2163 layout => (new CFClient::Layout), 2265 layout => (new CFClient::Layout 1),
2164 par => [], 2266 par => [],
2165 height => 0, 2267 height => 0,
2166 children => [ 2268 children => [
2167 (new CFClient::UI::Empty expand => 1), 2269 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2270 (new CFClient::UI::Slider vertical => 1),
… …
2179 2281
2180 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2283 $self->reflow;
2182} 2284}
2183 2285
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2286sub size_allocate {
2204 my ($self, $w, $h) = @_; 2287 my ($self, $w, $h) = @_;
2205 2288
2206 $self->SUPER::size_allocate ($w, $h); 2289 $self->SUPER::size_allocate ($w, $h);
2207 2290
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2294
2212 $self->reflow; 2295 $self->reflow;
2213} 2296}
2214 2297
2298sub text_height {
2299 my ($self, $text, $indent) = @_;
2300
2301 my $layout = $self->{layout};
2302
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text);
2306
2307 ($layout->size)[1]
2308}
2309
2310sub reflow {
2311 my ($self) = @_;
2312
2313 $self->{need_reflow}++;
2314 $self->update;
2315}
2316
2215sub add_paragraph { 2317sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2318 my ($self, $color, $text, $indent) = @_;
2217 2319
2218 #TODO: intelligently "reformat" paragraph 2320 #TODO: intelligently "reformat" paragraph
2219 2321
2322 for my $line (split /\n/, $text) {
2220 my $height = $self->text_height ($text); 2323 my $height = $self->text_height ($line);
2221
2222 $self->{height} += $height; 2324 $self->{height} += $height;
2223
2224 push @{$self->{par}}, [$height, $color, $text]; 2325 push @{$self->{par}}, [$height, $color, $indent, $line];
2326 }
2225 2327
2226 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2227 $self->{children}[1]->update; 2329 $self->{children}[1]->update;
2228} 2330}
2229 2331
… …
2234 2336
2235 return unless $self->{h} > 0; 2337 return unless $self->{h} > 0;
2236 2338
2237 delete $self->{texture}; 2339 delete $self->{texture};
2238 2340
2239 $ROOT->on_refresh ($self, sub { 2341 $ROOT->on_post_alloc ($self, sub {
2240 if (delete $self->{need_reflow}) { 2342 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2343 my $height = 0;
2242 2344
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2244 for @{$self->{par}}; 2346 for @{$self->{par}};
2245 2347
2246 $self->{height} = $height; 2348 $self->{height} = $height;
2247 2349
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2351 $self->{children}[1]->update;
2249 2352
2250 delete $self->{texture}; 2353 delete $self->{texture};
2251 } 2354 }
2252 2355
2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2254 glClearColor 0, 0, 0, 0; 2357 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2358 glClear GL_COLOR_BUFFER_BIT;
2256
2257 glEnable GL_BLEND;
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261 2359
2262 my $top = int $self->{children}[1]{range}[0]; 2360 my $top = int $self->{children}[1]{range}[0];
2263 2361
2264 my $y0 = $top; 2362 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2363 my $y1 = $top + $self->{h};
… …
2268 2366
2269 my $layout = $self->{layout}; 2367 my $layout = $self->{layout};
2270 2368
2271 $layout->set_font ($self->{font}) if $self->{font}; 2369 $layout->set_font ($self->{font}) if $self->{font};
2272 2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2273 for my $par (@{$self->{par}}) { 2374 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2375 my $h = $par->[0];
2275 2376
2276 if ($y0 < $y + $h && $y < $y1) { 2377 if ($y0 < $y + $h && $y < $y1) {
2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2277 $layout->set_text ($par->[2]); 2380 $layout->set_markup ($par->[3]);
2278 2381
2279 glColor @{ $par->[1] }; 2382 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2383
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2384 glRasterPos $par->[2], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2386 }
2283 2387
2284 $y += $h; 2388 $y += $h;
2285 } 2389 }
2286 2390
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2391 glDisable GL_BLEND;
2289 }; 2392 };
2290 }); 2393 });
2291} 2394}
2292 2395
2293sub _draw { 2396sub _draw {
2294 my ($self) = @_; 2397 my ($self) = @_;
2295 2398
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2401 glColor 1, 1, 1, 1;
2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2402 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302 glDisable GL_TEXTURE_2D; 2403 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2404
2305 $self->{children}[1]->draw; 2405 $self->{children}[1]->draw;
2306 2406
2307} 2407}
2308 2408
… …
2402 @_, 2502 @_,
2403 can_events => 0, 2503 can_events => 0,
2404 ) 2504 )
2405} 2505}
2406 2506
2407sub set_markup { 2507sub set_tooltip_from {
2408 my ($self, $text) = @_; 2508 my ($self, $widget) = @_;
2409 2509
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2510 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2511 markup => $widget->{tooltip},
2412 $self->add ($self->{label}); 2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2513 fontsize => 0.8,
2514 fg => [0, 0, 0, 1],
2515 ellipsise => 0,
2516 font => ($widget->{tooltip_font} || $::FONT_PROP),
2517 );
2413} 2518}
2414 2519
2415sub size_request { 2520sub size_request {
2416 my ($self) = @_; 2521 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2522
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2523 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2524
2422 ($w + 4, $h + 4) 2525 ($w + 4, $h + 4)
2423} 2526}
… …
2429} 2532}
2430 2533
2431sub _draw { 2534sub _draw {
2432 my ($self) = @_; 2535 my ($self) = @_;
2433 2536
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2537 glTranslate 0.375, 0.375;
2436 2538
2437 my ($w, $h) = @$self{qw(w h)}; 2539 my ($w, $h) = @$self{qw(w h)};
2438 2540
2439 glColor 1, 0.8, 0.4; 2541 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2552 glVertex 0 , $h;
2451 glVertex $w, $h; 2553 glVertex $w, $h;
2452 glVertex $w, 0; 2554 glVertex $w, 0;
2453 glEnd; 2555 glEnd;
2454 2556
2455 glPopMatrix; 2557 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2558 $self->SUPER::_draw;
2459} 2559}
2460 2560
2461############################################################################# 2561#############################################################################
2462 2562
… …
2467use CFClient::OpenGL; 2567use CFClient::OpenGL;
2468 2568
2469sub new { 2569sub new {
2470 my $class = shift; 2570 my $class = shift;
2471 2571
2472 $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2473 aspect => 1, 2573 aspect => 1,
2474 @_, 2574 @_,
2475 ) 2575 );
2576
2577 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self);
2579
2580 $self->{timer} = Event->timer (
2581 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2582 hard => 1,
2583 interval => $self->{animspeed},
2584 cb => sub {
2585 ++$widget->{frame};
2586 $widget->update;
2587 },
2588 );
2589 }
2590
2591 $self
2476} 2592}
2477 2593
2478sub size_request { 2594sub size_request {
2479 (32, 8) 2595 (32, 8)
2480} 2596}
2481 2597
2598sub update {
2599 my ($self) = @_;
2600
2601 return unless $self->{visible};
2602
2603 $self->SUPER::update;
2604}
2605
2482sub _draw { 2606sub _draw {
2483 my ($self) = @_; 2607 my ($self) = @_;
2484 2608
2485 return unless $::CONN;#d# manage and cache textures differently 2609 return unless $::CONN;#d# manage and cache textures differently
2610
2611 my $face;
2612
2613 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}];
2615
2616 $face = $anim->[ $self->{frame} % @$anim ]
2617 if $anim && @$anim;
2618 }
2619
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2621
2488 # TODO animation
2489 if ($tex) { 2622 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2623 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2625 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2628 }
2629}
2630
2631sub DESTROY {
2632 my ($self) = @_;
2633
2634 $self->{timer}->cancel
2635 if $self->{timer};
2636
2637 $self->SUPER::DESTROY;
2499} 2638}
2500 2639
2501############################################################################# 2640#############################################################################
2502 2641
2503package CFClient::UI::InventoryItem; 2642package CFClient::UI::InventoryItem;
2504 2643
2505our @ISA = CFClient::UI::HBox::; 2644our @ISA = CFClient::UI::HBox::;
2645
2646sub _item_to_desc {
2647 my ($item) = @_;
2648
2649 my $desc =
2650 $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} × $item->{name_pl}";
2653
2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2655 and $desc .= " (open)";
2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2657 and $desc .= " (applied)";
2658 $item->{flags} & Crossfire::Protocol::F_UNPAID
2659 and $desc .= " (unpaid)";
2660 $item->{flags} & Crossfire::Protocol::F_MAGIC
2661 and $desc .= " (magic)";
2662 $item->{flags} & Crossfire::Protocol::F_CURSED
2663 and $desc .= " (cursed)";
2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2665 and $desc .= " (damned)";
2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2667 and $desc .= " *";
2668
2669 $desc
2670}
2506 2671
2507sub new { 2672sub new {
2508 my $class = shift; 2673 my $class = shift;
2509 2674
2510 my %args = @_; 2675 my %args = @_;
2511 2676
2512 my $item = $args{item}; 2677 my $item = delete $args{item};
2513 2678
2514 my $desc = $item->{nrof} < 2 2679 my $desc = _item_to_desc ($item);
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518 2680
2519 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2520 can_hover => 1, 2682 can_hover => 1,
2521 can_events => 1, 2683 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc) 2684 tooltip => ((CFClient::UI::Label::escape $desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub { 2686 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_; 2687 my ($self, $ev, $x, $y) = @_;
2526 2688
2527 # todo: maybe put examine on 1? but should just be a tooltip :( 2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2691 my $targ = $::CONN->{player}{tag};
2692
2693 if ($item->{container} == $::CONN->{player}{tag}) {
2694 $targ = $main::OPENCONT;
2695 }
2696
2697 $::CONN->send ("move $targ $item->{tag} 0");
2528 if ($ev->{button} == 1) { 2698 } elsif ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2699 $::CONN->send ("examine $item->{tag}");
2530 } elsif ($ev->{button} == 2) { 2700 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}"); 2701 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) { 2702 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new ( 2703 my @menu_items = (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2706 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2707 (
2708 $item->{flags} & Crossfire::Protocol::F_LOCKED
2709 ? (
2710 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2711 )
2712 : (
2713 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2543 ], 2716 ),
2544 )->popup ($ev); 2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2545 } 2720 }
2546 2721
2547 1 2722 1
2548 }, 2723 },
2549 %args 2724 %args
2550 ); 2725 );
2726
2727
2551 $self->add(new CFClient::UI::Face 2728 $self->add (new CFClient::UI::Face
2552 can_events => 0, 2729 can_events => 0,
2553 face => $item->{face}, 2730 face => $item->{face},
2554 anim => $item->{anim}, 2731 anim => $item->{anim},
2555 animspeed => $item->{animspeed}); 2732 animspeed => $item->{animspeed},
2556 $self->add(new CFClient::UI::Label 2733 );
2557 can_events => 0, 2734
2558 text => $desc); 2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2736
2737 $self->{item} = $item;
2738
2739 $self->update_item;
2559 2740
2560 $self 2741 $self
2742}
2743
2744sub update_item {
2745 my ($self) = @_;
2746
2747 my $desc = _item_to_desc ($self->{item});
2748
2749 $self->{name_lbl}->set_text ($desc);
2561} 2750}
2562 2751
2563############################################################################# 2752#############################################################################
2564 2753
2565package CFClient::UI::Inventory; 2754package CFClient::UI::Inventory;
… …
2568 2757
2569sub new { 2758sub new {
2570 my $class = shift; 2759 my $class = shift;
2571 2760
2572 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox), 2762 scrolled => (new CFClient::UI::Table),
2574 @_, 2763 @_,
2575 ); 2764 );
2576 2765
2577 $self 2766 $self
2578} 2767}
… …
2581 my ($self, $items) = @_; 2770 my ($self, $items) = @_;
2582 2771
2583 $self->{scrolled}->clear; 2772 $self->{scrolled}->clear;
2584 return unless $items; 2773 return unless $items;
2585 2774
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2587 2779
2588 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2589 2781
2590 for my $item (@items) { 2782 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2783 $item->{item} = $item;
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2786 }
2787
2788 my $i = 0;
2789 for (@items) {
2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2596 } 2793 }
2597 2794
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599} 2796}
2600 2797
… …
2675 } 2872 }
2676} 2873}
2677 2874
2678############################################################################# 2875#############################################################################
2679 2876
2877package CFClient::UI::Statusbox;
2878
2879our @ISA = CFClient::UI::VBox::;
2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2890sub reorder {
2891 my ($self) = @_;
2892 my $NOW = time;
2893
2894 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 }
2897
2898 my @widgets;
2899
2900 my @items = sort {
2901 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} };
2904
2905 my $count = 10 + 1;
2906 for my $item (@items) {
2907 last unless --$count;
2908
2909 push @widgets, $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text};
2914
2915 for ($short) {
2916 s/^\s+//;
2917 s/\s+/ /g;
2918 }
2919
2920 new CFClient::UI::Label
2921 markup => $short,
2922 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg},
2928 can_events => 1,
2929 can_hover => 1
2930 };
2931 }
2932
2933 $self->clear;
2934 $self->SUPER::add (reverse @widgets);
2935}
2936
2937sub add {
2938 my ($self, $text, %arg) = @_;
2939
2940 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//;
2942
2943 my $timeout = time + ((delete $arg{timeout}) || 60);
2944
2945 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2946
2947 if (my $item = $self->{item}{$group}) {
2948 if ($item->{text} eq $text) {
2949 $item->{count}++;
2950 } else {
2951 $item->{count} = 1;
2952 $item->{text} = $item->{tooltip} = $text;
2953 }
2954 $item->{id} = ++$self->{id};
2955 $item->{timeout} = $timeout;
2956 delete $item->{label};
2957 } else {
2958 $self->{item}{$group} = {
2959 id => ++$self->{id},
2960 text => $text,
2961 timeout => $timeout,
2962 tooltip => $text,
2963 fg => [0.8, 0.8, 0.8, 0.8],
2964 pri => 0,
2965 count => 1,
2966 %arg,
2967 };
2968 }
2969
2970 $self->reorder;
2971}
2972
2973sub reconfigure {
2974 my ($self) = @_;
2975
2976 delete $_->{label}
2977 for values %{ $self->{item} || {} };
2978
2979 $self->reorder;
2980 $self->SUPER::reconfigure;
2981}
2982
2983#############################################################################
2984
2680package CFClient::UI::Root; 2985package CFClient::UI::Root;
2681 2986
2682our @ISA = CFClient::UI::Container::; 2987our @ISA = CFClient::UI::Container::;
2683 2988
2684use CFClient::OpenGL; 2989use CFClient::OpenGL;
2685 2990
2991sub new {
2992 my $class = shift;
2993
2994 $class->SUPER::new (
2995 @_,
2996 )
2997}
2998
2999sub configure {
3000 my ($self, $x, $y, $w, $h) = @_;
3001
3002 $self->{w} = $w;
3003 $self->{h} = $h;
3004}
3005
2686sub check_size { 3006sub check_size {
2687 my ($self) = @_; 3007 my ($self) = @_;
2688 3008
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 3009 $self->size_allocate ($self->{w}, $self->{h})
3010 if $self->{w};
2690} 3011}
2691 3012
2692sub size_request { 3013sub size_request {
2693 my ($self) = @_; 3014 my ($self) = @_;
2694 3015
… …
2696} 3017}
2697 3018
2698sub size_allocate { 3019sub size_allocate {
2699 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h) = @_;
2700 3021
2701 my $old_w = $self->{old_w}; 3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2702 my $old_h = $self->{old_h}; 3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2703 3024
2704 if ($old_w && $old_h) { 3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2705 for my $child ($self->children) { 3026 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725 3027
2726 for my $child ($self->children) { 3028 for my $child ($self->children) {
2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728 3030
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x};
3033
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
2731 $child->configure ($X, $Y, $W, $H); 3040 $child->configure ($X, $Y, $W, $H);
2732 } 3041 }
2733} 3042}
2734 3043
2735sub _topleft { 3044sub coord2local {
2736 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2737 3046
2738 ($x, $y) 3047 ($x, $y)
2739} 3048}
2740 3049
3050sub coord2global {
3051 my ($self, $x, $y) = @_;
3052
3053 ($x, $y)
3054}
3055
2741sub update { 3056sub update {
2742 my ($self) = @_; 3057 my ($self) = @_;
2743 3058
2744 $self->check_size; 3059 $self->check_size;
2745 ::refresh (); 3060 $::WANT_REFRESH++;
2746} 3061}
2747 3062
2748sub add { 3063sub add {
2749 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2750 3065
3066 for my $child (@children) {
3067 $child->{toplevel} = 1;
3068
2751 # integerize window positions 3069 # integerise window positions
2752 $child->{x} = int $child->{x}; 3070 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 3071 $child->{y} = int $child->{y};
3072 }
2754 3073
2755 $self->SUPER::add ($child); 3074 $self->SUPER::add (@children);
3075
3076 while (@children) {
3077 my $w = pop @children;
3078 push @children, $w->children;
3079 $w->{visible} = 1;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 }
2756} 3093}
2757 3094
2758sub on_refresh { 3095sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2760 3097
2761 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2762} 3099}
2763 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2764sub draw { 3107sub draw {
2765 my ($self) = @_; 3108 my ($self) = @_;
2766 3109
2767 while (my $rcb = delete $self->{refresh_hook}) { 3110 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3111 $_->()
3112 for values %{delete $self->{refresh_hook}};
3113 }
3114
3115 if ($self->{check_size}) {
3116 my @queue = ([], []);
3117
3118 for (;;) {
3119 if ($self->{check_size}) {
3120 # heuristic: check containers last
3121 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3122 for values %{delete $self->{check_size}}
3123 }
3124
3125 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3126
3127 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3128 ? @$widget{qw(user_w user_h)}
3129 : $widget->size_request;
3130
3131 if (delete $widget->{force_alloc}
3132 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3133 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3134
3135 $widget->{req_w} = $w;
3136 $widget->{req_h} = $h;
3137
3138 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3139
3140 $widget->{parent}->check_size
3141 if $widget->{parent};
3142 }
3143 }
3144 }
3145
3146 while ($self->{size_alloc}) {
3147 for (values %{delete $self->{size_alloc}}) {
3148 my ($widget, $w, $h) = @$_;
3149
3150 $w = 0 if $w < 0;
3151 $h = 0 if $h < 0;
3152
3153 $widget->{w} = $w;
3154 $widget->{h} = $h;
3155 $widget->size_allocate ($w, $h);
3156 $widget->emit (size_allocate => $w, $h);
3157 }
3158 }
3159
3160 while ($self->{post_alloc_hook}) {
3161 $_->()
3162 for values %{delete $self->{post_alloc_hook}};
2769 } 3163 }
2770 3164
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3165 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3167 glClear GL_COLOR_BUFFER_BIT;
2774 3168
2775 glMatrixMode GL_PROJECTION; 3169 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3170 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3172 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3173 glLoadIdentity;
2780 3174
2781 $self->_draw; 3175 $self->_draw;
2782} 3176}
… …
2784############################################################################# 3178#############################################################################
2785 3179
2786package CFClient::UI; 3180package CFClient::UI;
2787 3181
2788$ROOT = new CFClient::UI::Root; 3182$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3183$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3184
27911 31851
2792 3186

Diff Legend

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