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

Diff Legend

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