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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.221 by root, Mon May 22 03:48:50 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 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
122 133
123 for (@$vals) { 134 for (@$vals) {
124 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
125 $rem += $_ - $i; 136 $rem += $_ - $i;
126 $_ = $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;
127 } 169 }
128} 170}
129 171
130############################################################################# 172#############################################################################
131 173
… …
150 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
152 } 194 }
153 } 195 }
154 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
155 $self 199 $self
156} 200}
157 201
158sub destroy { 202sub destroy {
159 my ($self) = @_; 203 my ($self) = @_;
… …
163} 207}
164 208
165sub show { 209sub show {
166 my ($self) = @_; 210 my ($self) = @_;
167 211
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
168 return if $self->{parent}; 218 return if $self->{parent};
169 219
170 $CFClient::UI::ROOT->add ($self); 220 $CFClient::UI::ROOT->add ($self);
171} 221}
172 222
173sub hide { 223sub hide {
174 my ($self) = @_; 224 my ($self) = @_;
225
226 for (my @w = $self; @w; ) {
227 my $w = pop @w;
228 push @w, $w->children;
229 $w->{visible} = 1;
230 }
175 231
176 undef $GRAB if $GRAB == $self; 232 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 233 undef $HOVER if $HOVER == $self;
178 234
179 $self->{parent}->remove ($self) 235 $self->{parent}->remove ($self)
… …
224 $self->{y} = $y; 280 $self->{y} = $y;
225 $self->update; 281 $self->update;
226 } 282 }
227 283
228 if ($self->{w} != $w || $self->{h} != $h) { 284 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 286 }
235} 287}
236 288
237sub size_allocate { 289sub size_allocate {
238 # nothing to be done 290 # nothing to be done
239} 291}
240 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
241sub children { 300sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 301}
253 302
254sub set_max_size { 303sub set_max_size {
255 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
256 305
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 308}
260 309
261# return top left coordinates 310sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 311 my ($self, $tooltip) = @_;
264 312
265 $self->{parent} 313 $self->{tooltip} = $tooltip;
266 or Carp::confess "no parent widget in _topleft\n";#d#
267 314
268 $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 }
269} 319}
270 320
271# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
272sub coord2local { 322sub coord2local {
273 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
274 324
275 my ($X, $Y) = $self->_topleft; 325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 326}
278 327
279# translate local coordinates to global coordinate system 328# translate local coordinates to global coordinate system
280sub coord2global { 329sub coord2global {
281 my ($self, $x, $y) = @_; 330 my ($self, $x, $y) = @_;
282 331
283 my ($X, $Y) = $self->_topleft; 332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 333}
286 334
287sub focus_in { 335sub focus_in {
288 my ($self) = @_; 336 my ($self) = @_;
289 337
… …
361 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
364 glEnd; 412 glEnd;
365 glPopMatrix; 413 glPopMatrix;
366 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;
367 } 415 }
368} 416}
369 417
370sub _draw { 418sub _draw {
371 my ($self) = @_; 419 my ($self) = @_;
… …
387 435
388sub set_parent { 436sub set_parent {
389 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
390 438
391 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;
392} 446}
393 447
394sub check_size { 448sub check_size {
395 my ($self) = @_; 449 my ($self, $forced) = @_;
396 450
397 $self->{parent} 451 $self->{force_alloc} = 1 if $forced;
398 or return 1; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 453}
419 454
420sub update { 455sub update {
421 my ($self) = @_; 456 my ($self) = @_;
422 457
… …
437} 472}
438 473
439sub DESTROY { 474sub DESTROY {
440 my ($self) = @_; 475 my ($self) = @_;
441 476
477 delete $WIDGET{$self+0};
442 #$self->deactivate; 478 #$self->deactivate;
443} 479}
444 480
445############################################################################# 481#############################################################################
446 482
… …
455 my $class = shift; 491 my $class = shift;
456 492
457 # range [value, low, high, page] 493 # range [value, low, high, page]
458 494
459 $class->SUPER::new ( 495 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
462 @_ 498 @_
463 ) 499 )
464} 500}
465 501
466sub _draw { 502sub _draw {
467 my ($self) = @_; 503 my ($self) = @_;
468 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
470 511
471 glEnable GL_BLEND; 512 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
474 515
475 glBegin GL_QUADS; 516 glBegin GL_QUADS;
476 glVertex 0 , 0; 517 glVertex 0 , 0;
477 glVertex 0 , $h; 518 glVertex 0 , $h;
478 glVertex $w, $h; 519 glVertex $w, $h;
479 glVertex $w, 0; 520 glVertex $w, 0;
480 glEnd; 521 glEnd;
481 522
482 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
483} 525}
484 526
485############################################################################# 527#############################################################################
486 528
487package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
519 561
520 $self 562 $self
521} 563}
522 564
523sub add { 565sub add {
524 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
525 567
526 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
527 570
528 use sort 'stable'; 571 use sort 'stable';
529 572
530 $self->{children} = [ 573 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
533 ]; 576 ];
534 577
535 $child->check_size; 578 $self->check_size (1);
579 $self->update;
536} 580}
537 581
538sub children { 582sub children {
539 @{ $_[0]{children} } 583 @{ $_[0]{children} }
540} 584}
… …
559 603
560 for (@$children) { 604 for (@$children) {
561 delete $_->{parent}; 605 delete $_->{parent};
562 $_->hide; 606 $_->hide;
563 } 607 }
608
609 $self->check_size;
610 $self->update;
564} 611}
565 612
566sub find_widget { 613sub find_widget {
567 my ($self, $x, $y) = @_; 614 my ($self, $x, $y) = @_;
568 615
… …
643} 690}
644 691
645sub update { 692sub update {
646 my ($self) = @_; 693 my ($self) = @_;
647 694
648 # we want to do this delayed... 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 696 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 697}
662 698
663sub size_allocate { 699sub size_allocate {
664 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
665 701
666 $self->child->configure (0, 0, $w, $h); 702 $self->SUPER::size_allocate ($w, $h);
703 $self->update;
704}
667 705
706sub _render {
707 $_[0]{children}[0]->draw;
708}
709
710sub render_child {
711 my ($self) = @_;
712
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT;
716
668 $self->render_chld; 717 $self->_render;
718 };
669} 719}
670 720
671sub _draw { 721sub _draw {
672 my ($self) = @_; 722 my ($self) = @_;
673 723
674 my ($w, $h) = ($self->w, $self->h); 724 my ($w, $h) = ($self->w, $self->h);
675 725
676 my $tex = $self->{texture} 726 my $tex = $self->{texture}
677 or return; 727 or return;
678 728
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1;
683 732
684 $tex->draw_quad (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 734
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
688} 736}
689 737
690############################################################################# 738#############################################################################
691 739
692package CFClient::UI::ViewPort; 740package CFClient::UI::ViewPort;
693 741
694our @ISA = CFClient::UI::Window::; 742our @ISA = CFClient::UI::Window::;
695 743
696sub new { die }
697
698sub size_request { 744sub size_request {
699 my ($self) = @_; 745 my ($self) = @_;
700 746
701 @$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)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
703 749
704 @$self{qw(child_w child_h)} 750 @$self{qw(child_w child_h)}
705} 751}
706 752
707sub _draw { 753sub size_allocate {
708 my ($self) = @_; 754 my ($self, $w, $h) = @_;
709 755
710 $self->{children}[1]->draw; 756 $self->update;
711} 757}
712 758
759sub set_offset {
760 my ($self, $x, $y) = @_;
761
762 $self->{view_x} = int $x;
763 $self->{view_y} = int $y;
764
765 $self->update;
766}
767
768# hmm, this does not work for topleft of $self... but we should not ask for that
769sub coord2local {
770 my ($self, $x, $y) = @_;
771
772 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
773}
774
775sub coord2global {
776 my ($self, $x, $y) = @_;
777
778 $x = List::Util::min $self->{w}, $x - $self->{view_x};
779 $y = List::Util::min $self->{h}, $y - $self->{view_y};
780
781 $self->SUPER::coord2global ($x, $y)
782}
783
784sub find_widget {
785 my ($self, $x, $y) = @_;
786
787 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
788 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
789 ) {
790 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
791 } else {
792 $self->CFClient::UI::Base::find_widget ($x, $y)
793 }
794}
795
796sub _render {
797 my ($self) = @_;
798
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800
801 $self->SUPER::_render;
802}
713 803
714############################################################################# 804#############################################################################
715 805
716package CFClient::UI::Frame; 806package CFClient::UI::ScrolledWindow;
717 807
718our @ISA = CFClient::UI::Bin::; 808our @ISA = CFClient::UI::HBox::;
719
720use CFClient::OpenGL;
721 809
722sub new { 810sub new {
723 my $class = shift; 811 my $class = shift;
724 812
813 my $self;
814
815 my $slider = new CFClient::UI::Slider
816 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
820 },
821 ;
822
725 my $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 824 vp => (new CFClient::UI::ViewPort expand => 1),
727 border_bg => [1, 1, 1, 1], 825 slider => $slider,
728 border => 0.8,
729 @_ 826 @_,
730 ); 827 );
731 828
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider});
832
732 $self 833 $self
733} 834}
734 835
836#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll
838
839#############################################################################
840
841package CFClient::UI::Frame;
842
843our @ISA = CFClient::UI::Bin::;
844
845use CFClient::OpenGL;
846
847sub new {
848 my $class = shift;
849
850 $class->SUPER::new (
851 bg => undef,
852 @_,
853 )
854}
855
735sub _draw { 856sub _draw {
736 my ($self) = @_; 857 my ($self) = @_;
737 858
738 my ($w, $h) = ($self->{w}, $self->{h}); 859 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)};
739 861
740 glEnable GL_BLEND; 862 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D; 864 glColor @{ $self->{bg} };
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 865
745# glBegin GL_QUADS; 866 glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0; 867 glVertex 0 , 0;
748# glVertex 0 , $h; 868 glVertex 0 , $h;
749# glVertex $w, $h; 869 glVertex $w, $h;
750# glVertex $w, 0; 870 glVertex $w, 0;
751# glEnd; 871 glEnd;
752 872
753
754 $self->child->draw;
755 glDisable GL_BLEND; 873 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 874 }
875
876 $self->SUPER::_draw;
757} 877}
758 878
759############################################################################# 879#############################################################################
760 880
761package CFClient::UI::FancyFrame; 881package CFClient::UI::FancyFrame;
… …
774 # TODO: user_x, user_y, overwrite moveto? 894 # TODO: user_x, user_y, overwrite moveto?
775 895
776 my $self = $class->SUPER::new ( 896 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 897 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 898 border_bg => [1, 1, 1, 1],
779 border => 0.8, 899 border => 0.6,
900 toplevel => 1,
780 can_events => 1, 901 can_events => 1,
781 @_ 902 @_
782 ); 903 );
783 904
784 $self->{title} &&= new CFClient::UI::Label 905 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 906 align => 0,
786 valign => 1, 907 valign => 1,
787 text => $self->{title}, 908 text => $self->{title},
788 fontsize => 1; 909 fontsize => $self->{border};
789 910
790 $self 911 $self
791} 912}
792 913
793sub border { 914sub border {
… …
809 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
810 931
811 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
813 934
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
815 if $self->{title}; 936 if $self->{title};
816 937
817 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
818} 939}
819 940
820sub button_down { 941sub button_down {
821 my ($self, $ev, $x, $y) = @_; 942 my ($self, $ev, $x, $y) = @_;
822 943
944 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 945 my $border = $self->border;
824 946
825 if ($x < $self->{w} && $x >= $self->{w} - $border 947 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 948 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 949
950 if ($lr & $td) {
951 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 952 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 953 my ($bw, $bh) = ($self->{w}, $self->{h});
830 954
955 my $mx = $x < $border;
956 my $my = $y < $border;
957
831 $self->{motion} = sub { 958 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 959 my ($ev, $x, $y) = @_;
833 960
834 ($x, $y) = ($ev->{x}, $ev->{y}); 961 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy;
835 963
836 $self->{user_w} = $bw + $x - $ox; 964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 967 $self->check_size;
839 }; 968 };
840 969
841 } elsif ($x >= 0 && $x < $self->{w} 970 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 971 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 972 my ($bx, $by) = ($self->{x}, $self->{y});
846 973
847 $self->{motion} = sub { 974 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 975 my ($ev, $x, $y) = @_;
… …
871 my ($self) = @_; 998 my ($self) = @_;
872 999
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1000 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 1002
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1003 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1005
881 my $border = $self->border; 1006 my $border = $self->border;
882 1007
883 glColor @{ $self->{border_bg} }; 1008 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1013
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 1015 my $bg = $tex[0];
890 1016
891 # TODO: repeat texture not scale 1017 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1018 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 1019 my $rep_y = $ch / $bg->{h};
894 1020
895 glColor @{ $self->{bg} }; 1021 glColor @{ $self->{bg} };
896 1022
897 $bg->{s} = $rep_x; 1023 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 1024 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 1025 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 }
901 1028
902 glDisable GL_TEXTURE_2D; 1029 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1030
905 $self->{title}->draw if $self->{title}; 1031 $self->{title}->draw if $self->{title};
1032
906 $self->child->draw; 1033 $self->child->draw;
907} 1034}
908 1035
909############################################################################# 1036#############################################################################
910 1037
… …
1134} 1261}
1135 1262
1136sub size_allocate { 1263sub size_allocate {
1137 my ($self, $w, $h) = @_; 1264 my ($self, $w, $h) = @_;
1138 1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1139 my $children = $self->{children}; 1268 my $children = $self->{children};
1140 1269
1141 my @h = map $_->{req_h}, @$children; 1270 my @h = map $_->{req_h}, @$children;
1142 1271
1143 my $req_h = List::Util::sum @h; 1272 my $req_h = List::Util::sum @h;
… …
1172 1301
1173############################################################################# 1302#############################################################################
1174 1303
1175package CFClient::UI::Label; 1304package CFClient::UI::Label;
1176 1305
1177our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1178 1307
1179use CFClient::OpenGL; 1308use CFClient::OpenGL;
1180 1309
1181sub new { 1310sub new {
1182 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1183 1312
1184 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1186 #font => default_font 1317 #font => default_font
1318 #text => initial text
1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1322 layout => (new CFClient::Layout),
1187 fontsize => 1, 1323 fontsize => 1,
1188 text => "",
1189 align => -1, 1324 align => -1,
1190 valign => -1, 1325 valign => -1,
1191 padding => 2, 1326 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1327 can_events => 0,
1194 %arg 1328 %arg
1195 ); 1329 );
1196 1330
1197 if (exists $self->{template}) { 1331 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1332 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1333 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1334 $self->{template} = $layout;
1201 } 1335 }
1202 1336
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1337 if (exists $self->{markup}) {
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1338 $self->set_markup (delete $self->{markup});
1339 } else {
1340 $self->set_text (delete $self->{text});
1341 }
1205 1342
1206 $self 1343 $self
1207} 1344}
1208 1345
1209sub escape { 1346sub escape($) {
1210 local $_ = $_[1]; 1347 local $_ = $_[0];
1211 1348
1212 s/&/&amp;/g; 1349 s/&/&amp;/g;
1213 s/>/&gt;/g; 1350 s/>/&gt;/g;
1214 s/</&lt;/g; 1351 s/</&lt;/g;
1215 1352
1216 $_[1] 1353 $_
1217} 1354}
1218 1355
1219sub update { 1356sub update {
1220 my ($self) = @_; 1357 my ($self) = @_;
1221 1358
1222 delete $self->{texture}; 1359 delete $self->{texture};
1223 $self->SUPER::update; 1360 $self->SUPER::update;
1224} 1361}
1225 1362
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1363sub set_text {
1233 my ($self, $text) = @_; 1364 my ($self, $text) = @_;
1234 1365
1235 return if $self->{text} eq "T$text"; 1366 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1367 $self->{text} = "T$text";
1237 1368
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1239 1371
1240 delete $self->{texture};
1241 $self->update; 1372 $self->update;
1242 $self->check_size; 1373 $self->check_size;
1243} 1374}
1244 1375
1245sub set_markup { 1376sub set_markup {
1246 my ($self, $markup) = @_; 1377 my ($self, $markup) = @_;
1247 1378
1248 return if $self->{text} eq "M$markup"; 1379 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1380 $self->{text} = "M$markup";
1250 1381
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1385 $self->{layout}->set_markup ($markup);
1252 1386
1253 delete $self->{texture};
1254 $self->update; 1387 $self->update;
1255 $self->check_size; 1388 $self->check_size;
1256} 1389}
1257 1390
1258sub size_request { 1391sub size_request {
1259 my ($self) = @_; 1392 my ($self) = @_;
1260 1393
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1); 1395 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1399
1265 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1266 1401
1267 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1289sub set_fontsize { 1424sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1425 my ($self, $fontsize) = @_;
1291 1426
1292 $self->{fontsize} = $fontsize; 1427 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1428 delete $self->{texture};
1429
1430 $self->update;
1294 $self->check_size; 1431 $self->check_size;
1295 $self->update;
1296} 1432}
1297 1433
1298sub _draw { 1434sub _draw {
1299 my ($self) = @_; 1435 my ($self) = @_;
1300 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1301 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1440 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w}); 1442 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446
1305 new_from_layout CFClient::Texture $self->{layout} 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1448
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5);
1452
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1455 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1306 }; 1458 };
1307 1459
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1462
1463 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1464 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy}); 1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1466 } else {
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1468 }
1328 1469
1329 glDisable GL_TEXTURE_2D; 1470 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1471}
1332 1472
1333############################################################################# 1473#############################################################################
1334 1474
1335package CFClient::UI::EntryBase; 1475package CFClient::UI::EntryBase;
… …
1370 $self->{layout}->set_text ("$text "); 1510 $self->{layout}->set_text ("$text ");
1371 1511
1372 $self->emit (changed => $self->{text}); 1512 $self->emit (changed => $self->{text});
1373} 1513}
1374 1514
1375sub get_text {
1376 $_[0]{text}
1377}
1378
1379sub size_request {
1380 my ($self) = @_;
1381
1382 my ($w, $h) = $self->SUPER::size_request;
1383
1384 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391}
1392
1393sub set_text { 1515sub set_text {
1394 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1395 1517
1396 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1397 $self->_set_text ($text); 1519 $self->_set_text ($text);
1398 $self->update; 1520 $self->update;
1521 $self->check_size;
1522}
1523
1524sub get_text {
1525 $_[0]{text}
1526}
1527
1528sub size_request {
1529 my ($self) = @_;
1530
1531 my ($w, $h) = $self->SUPER::size_request;
1532
1533 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1399} 1540}
1400 1541
1401sub key_down { 1542sub key_down {
1402 my ($self, $ev) = @_; 1543 my ($self, $ev) = @_;
1403 1544
… …
1405 my $sym = $ev->{sym}; 1546 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1547 my $uni = $ev->{unicode};
1407 1548
1408 my $text = $self->get_text; 1549 my $text = $self->get_text;
1409 1550
1410 if ($sym == 8) { 1551 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1552 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1553 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1554 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1555 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1556 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1557 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1558 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1559 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1560 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1561 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1562 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1563 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1564 $self->emit ('escape');
1424 } elsif ($uni) { 1565 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1567 }
1427 1568
1428 $self->_set_text ($text); 1569 $self->_set_text ($text);
1429 $self->update; 1570 $self->update;
1571 $self->check_size;
1430} 1572}
1431 1573
1432sub focus_in { 1574sub focus_in {
1433 my ($self) = @_; 1575 my ($self) = @_;
1434 1576
… …
1563 my $class = shift; 1705 my $class = shift;
1564 1706
1565 $class->SUPER::new ( 1707 $class->SUPER::new (
1566 padding => 4, 1708 padding => 4,
1567 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1570 can_hover => 1, 1711 can_hover => 1,
1571 align => 0, 1712 align => 0,
1572 valign => 0, 1713 valign => 0,
1573 can_events => 1, 1714 can_events => 1,
… …
1591 1732
1592 if ($GRAB == $self) { 1733 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1734 $self->{fg} = $self->{active_fg};
1594 } 1735 }
1595 1736
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1737 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1739 glColor 0, 0, 0, 1;
1601 1740
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1741 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1742
1604 glDisable GL_TEXTURE_2D; 1743 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1744
1607 $self->SUPER::_draw; 1745 $self->SUPER::_draw;
1608} 1746}
1609 1747
1610############################################################################# 1748#############################################################################
… …
1624 1762
1625 $class->SUPER::new ( 1763 $class->SUPER::new (
1626 padding => 2, 1764 padding => 2,
1627 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1628 active_fg => [1, 1, 0], 1766 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5],
1629 state => 0, 1769 state => 0,
1630 can_hover => 1, 1770 can_hover => 1,
1631 @_ 1771 @_
1632 ) 1772 )
1633} 1773}
… …
1657 1797
1658 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1659 1799
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1801
1662 glEnable GL_BLEND; 1802 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803
1663 glEnable GL_TEXTURE_2D; 1804 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1805 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1806 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1807}
1673 1808
1674############################################################################# 1809#############################################################################
1675 1810
1676package CFClient::UI::Image; 1811package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1854 glTranslate 0, -$self->{w}, 0;
1720 1855
1721 ($w, $h) = ($h, $w); 1856 ($w, $h) = ($h, $w);
1722 } 1857 }
1723 1858
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1859 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1861
1729 $tex->draw_quad (0, 0, $w, $h); 1862 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1863
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1864 glDisable GL_TEXTURE_2D;
1733} 1865}
1734 1866
1735############################################################################# 1867#############################################################################
1736 1868
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
1926 2058
1927sub new { 2059sub new {
1928 my $class = shift; 2060 my $class = shift;
1929 2061
1930 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
1931 2063
1932 # TODO: 0-width page 2064 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2066 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5],
1938 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
1939 req_w => 20, 2073 req_w => $::WIDTH / 80,
1940 req_h => 20, 2074 req_h => $::WIDTH / 80,
1941 vertical => 0, 2075 vertical => 0,
1942 can_hover => 1, 2076 can_hover => 1,
1943 inner_pad => 5, 2077 inner_pad => 0.02,
1944 @_ 2078 @_
1945 ); 2079 );
1946 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
1947 $self 2084 $self
2085}
2086
2087sub set_value {
2088 my ($self, $value) = @_;
2089
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091
2092 $hi = $lo + 1 if $hi <= $lo;
2093
2094 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi;
2096
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103
2104 if ($value != $old_value) {
2105 $self->emit (changed => $value);
2106 $self->update;
2107 }
1948} 2108}
1949 2109
1950sub size_request { 2110sub size_request {
1951 my ($self) = @_; 2111 my ($self) = @_;
1952 2112
… …
1965 2125
1966sub mouse_motion { 2126sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
1968 2128
1969 if ($GRAB == $self) { 2129 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131
2132 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2135
2136 $self->set_value ($x * ($hi - $lo) + $lo);
2137 }
2138}
2139
2140sub update {
2141 my ($self) = @_;
2142
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]);
2145
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
1971 2147
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
1973 2149
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1976 2151
1977 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2154
1983 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
1984 $self->update; 2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value;
2161 $self->{knob_w} = $page;
1985 } 2162 });
1986}
1987 2163
1988# the inner_* stuff is for generating a padding for the slider handle, 2164 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2165}
1995 2166
1996sub _draw { 2167sub _draw {
1997 my ($self) = @_; 2168 my ($self) = @_;
1998 2169
1999 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
2000 2171
2001 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
2002 2173
2003 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
2005 2176
2177 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2179 }
2011 2180
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2183
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2186
2038 # draw background 2187 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2189
2041 # draw handle 2190 # draw handle
2042 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2043 2192
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
2046} 2194}
2047 2195
2048############################################################################# 2196#############################################################################
2049 2197
… …
2060 fontsize => 1, 2208 fontsize => 1,
2061 can_events => 0, 2209 can_events => 0,
2062 #font => default_font 2210 #font => default_font
2063 @_, 2211 @_,
2064 2212
2065 layout => (new CFClient::Layout), 2213 layout => (new CFClient::Layout 1),
2066 par => [], 2214 par => [],
2067 height => 0, 2215 height => 0,
2068 children => [ 2216 children => [
2069 (new CFClient::UI::Empty expand => 1), 2217 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2218 (new CFClient::UI::Slider vertical => 1),
2071 ], 2219 ],
2072 ); 2220 );
2073 2221
2074 $self->{children}[1]->connect (changed => sub { 2222 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2223
2078 $self 2224 $self
2079} 2225}
2080 2226
2081sub set_fontsize { 2227sub set_fontsize {
2082 my ($self, $fontsize) = @_; 2228 my ($self, $fontsize) = @_;
2083 2229
2084 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
2085 $self->reflow; 2231 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105} 2232}
2106 2233
2107sub size_allocate { 2234sub size_allocate {
2108 my ($self, $w, $h) = @_; 2235 my ($self, $w, $h) = @_;
2109 2236
… …
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 2241 $self->{layout}->set_width ($self->{children}[0]{w});
2115 2242
2116 $self->reflow; 2243 $self->reflow;
2117} 2244}
2118 2245
2246sub text_height {
2247 my ($self, $text, $indent) = @_;
2248
2249 my $layout = $self->{layout};
2250
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text);
2254
2255 ($layout->size)[1]
2256}
2257
2258sub reflow {
2259 my ($self) = @_;
2260
2261 $self->{need_reflow}++;
2262 $self->update;
2263}
2264
2119sub add_paragraph { 2265sub add_paragraph {
2120 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2121 2267
2122 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2123 2269
2270 for my $line (split /\n/, $text) {
2124 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2125
2126 $self->{height} += $height; 2272 $self->{height} += $height;
2127
2128 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2129 2275
2130 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2131 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2132} 2278}
2133 2279
… …
2138 2284
2139 return unless $self->{h} > 0; 2285 return unless $self->{h} > 0;
2140 2286
2141 delete $self->{texture}; 2287 delete $self->{texture};
2142 2288
2143 $ROOT->on_refresh ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2144 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2291 my $height = 0;
2146 2292
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2148 for @{$self->{par}}; 2294 for @{$self->{par}};
2149 2295
2150 $self->{height} = $height; 2296 $self->{height} = $height;
2151 2297
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2299 $self->{children}[1]->update;
2153 2300
2154 delete $self->{texture}; 2301 delete $self->{texture};
2155 } 2302 }
2156 2303
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2158 glClearColor 0, 0, 0, 1; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2160
2161 glEnable GL_BLEND;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165 2307
2166 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2167 2309
2168 my $y0 = $top; 2310 my $y0 = $top;
2169 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2172 2314
2173 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2174 2316
2175 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2176 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2177 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2323 my $h = $par->[0];
2179 2324
2180 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2181 $layout->set_text ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2182 2329
2183 glColor @{ $par->[1] }; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2184 my ($W, $H) = $layout->size; 2331
2185 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2332 glRasterPos $par->[2], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2186 } 2334 }
2187 2335
2188 $y += $h; 2336 $y += $h;
2189 } 2337 }
2190 2338
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND; 2339 glDisable GL_BLEND;
2193 }; 2340 };
2194 }); 2341 });
2195} 2342}
2196 2343
2197sub _draw { 2344sub _draw {
2198 my ($self) = @_; 2345 my ($self) = @_;
2199 2346
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2349 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2206 }
2207 2352
2208 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2209 2354
2210} 2355}
2211 2356
… …
2305 @_, 2450 @_,
2306 can_events => 0, 2451 can_events => 0,
2307 ) 2452 )
2308} 2453}
2309 2454
2310sub set_markup { 2455sub set_tooltip_from {
2311 my ($self, $text) = @_; 2456 my ($self, $widget) = @_;
2312 2457
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2458 $self->add (new CFClient::UI::Label
2314 $self->{label}->set_markup ($text); 2459 markup => $widget->{tooltip},
2315 $self->add ($self->{label}); 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8,
2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2465 );
2316} 2466}
2317 2467
2318sub size_request { 2468sub size_request {
2319 my ($self) = @_; 2469 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2470
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2471 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2472
2325 ($w + 4, $h + 4) 2473 ($w + 4, $h + 4)
2326} 2474}
… …
2332} 2480}
2333 2481
2334sub _draw { 2482sub _draw {
2335 my ($self) = @_; 2483 my ($self) = @_;
2336 2484
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2485 glTranslate 0.375, 0.375;
2339 2486
2340 my ($w, $h) = @$self{qw(w h)}; 2487 my ($w, $h) = @$self{qw(w h)};
2341 2488
2342 glColor 1, 0.8, 0.4; 2489 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2500 glVertex 0 , $h;
2354 glVertex $w, $h; 2501 glVertex $w, $h;
2355 glVertex $w, 0; 2502 glVertex $w, 0;
2356 glEnd; 2503 glEnd;
2357 2504
2358 glPopMatrix; 2505 glTranslate 2 - 0.375, 2 - 0.375;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2506 $self->SUPER::_draw;
2362} 2507}
2363 2508
2364############################################################################# 2509#############################################################################
2365 2510
… …
2370use CFClient::OpenGL; 2515use CFClient::OpenGL;
2371 2516
2372sub new { 2517sub new {
2373 my $class = shift; 2518 my $class = shift;
2374 2519
2375 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2376 aspect => 1, 2521 aspect => 1,
2377 @_, 2522 @_,
2378 ) 2523 );
2524
2525 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self);
2527
2528 $self->{timer} = Event->timer (
2529 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2530 hard => 1,
2531 interval => $self->{animspeed},
2532 cb => sub {
2533 ++$widget->{frame};
2534 $widget->update;
2535 },
2536 );
2537 }
2538
2539 $self
2379} 2540}
2380 2541
2381sub size_request { 2542sub size_request {
2382 (32, 8) 2543 (32, 8)
2383} 2544}
2384 2545
2385sub draw { 2546sub _draw {
2386 my ($self) = @_; 2547 my ($self) = @_;
2387 2548
2549 return unless $::CONN;#d# manage and cache textures differently
2550
2551 my $face;
2552
2553 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}];
2555
2556 $face = $anim->[ $self->{frame} % @$anim ]
2557 if $anim && @$anim;
2558 }
2559
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2560 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2389 2561
2390 if ($tex) { 2562 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2563 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2565 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2567 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 2568 }
2569}
2570
2571sub DESTROY {
2572 my ($self) = @_;
2573
2574 $self->{timer}->cancel
2575 if $self->{timer};
2576
2577 $self->SUPER::DESTROY;
2400} 2578}
2401 2579
2402############################################################################# 2580#############################################################################
2403 2581
2582package CFClient::UI::InventoryItem;
2583
2584our @ISA = CFClient::UI::HBox::;
2585
2586sub _item_to_desc {
2587 my ($item) = @_;
2588
2589 my $desc =
2590 $item->{nrof} < 2
2591 ? $item->{name}
2592 : "$item->{nrof} × $item->{name_pl}";
2593
2594 $item->{flags} & Crossfire::Protocol::F_OPEN
2595 and $desc .= " (open)";
2596 $item->{flags} & Crossfire::Protocol::F_APPLIED
2597 and $desc .= " (applied)";
2598 $item->{flags} & Crossfire::Protocol::F_UNPAID
2599 and $desc .= " (unpaid)";
2600 $item->{flags} & Crossfire::Protocol::F_MAGIC
2601 and $desc .= " (magic)";
2602 $item->{flags} & Crossfire::Protocol::F_CURSED
2603 and $desc .= " (cursed)";
2604 $item->{flags} & Crossfire::Protocol::F_DAMNED
2605 and $desc .= " (damned)";
2606 $item->{flags} & Crossfire::Protocol::F_LOCKED
2607 and $desc .= " *";
2608
2609 $desc
2610}
2611
2612sub new {
2613 my $class = shift;
2614
2615 my %args = @_;
2616
2617 my $item = delete $args{item};
2618
2619 my $desc = _item_to_desc ($item);
2620
2621 my $self = $class->SUPER::new (
2622 can_hover => 1,
2623 can_events => 1,
2624 tooltip => ((CFClient::UI::Label::escape $desc)
2625 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2626 connect_button_down => sub {
2627 my ($self, $ev, $x, $y) = @_;
2628
2629 # todo: maybe put examine on 1? but should just be a tooltip :(
2630 if ($ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag};
2632
2633 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT;
2635 }
2636
2637 $::CONN->send ("move $targ $item->{tag} 0");
2638 } elsif ($ev->{button} == 2) {
2639 $::CONN->send ("apply $item->{tag}");
2640 } elsif ($ev->{button} == 3) {
2641 my @menu_items = (
2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2643 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2644 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645 (
2646 $item->{flags} & Crossfire::Protocol::F_LOCKED
2647 ? (
2648 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649 )
2650 : (
2651 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2652 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653 )
2654 ),
2655 );
2656
2657 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2658 }
2659
2660 1
2661 },
2662 %args
2663 );
2664
2665
2666 $self->add (new CFClient::UI::Face
2667 can_events => 0,
2668 face => $item->{face},
2669 anim => $item->{anim},
2670 animspeed => $item->{animspeed},
2671 );
2672
2673 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2674
2675 $self->{item} = $item;
2676
2677 $self->update_item;
2678
2679 $self
2680}
2681
2682sub update_item {
2683 my ($self) = @_;
2684
2685 my $desc = _item_to_desc ($self->{item});
2686
2687 $self->{name_lbl}->set_text ($desc);
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI::Inventory;
2693
2694our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696sub new {
2697 my $class = shift;
2698
2699 my $self = $class->SUPER::new (
2700 scrolled => (new CFClient::UI::VBox),
2701 @_,
2702 );
2703
2704 $self
2705}
2706
2707sub set_items {
2708 my ($self, $items) = @_;
2709
2710 $self->{scrolled}->clear;
2711 return unless $items;
2712
2713 my @items = sort {
2714 ($a->{type} <=> $b->{type})
2715 or ($a->{name} cmp $b->{name})
2716 } @$items;
2717
2718 $self->{real_items} = \@items;
2719
2720 for my $item (@items) {
2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item ();
2723 }
2724
2725 $self->{scrolled}->add (@items);
2726
2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2728}
2729
2730sub size_request {
2731 my ($self) = @_;
2732 ($self->{req_w}, $self->{req_h});
2733}
2734
2735#############################################################################
2736
2737package CFClient::UI::Menu;
2738
2739our @ISA = CFClient::UI::FancyFrame::;
2740
2741use CFClient::OpenGL;
2742
2743sub new {
2744 my $class = shift;
2745
2746 my $self = $class->SUPER::new (
2747 items => [],
2748 z => 100,
2749 @_,
2750 );
2751
2752 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2753
2754 for my $item (@{ $self->{items} }) {
2755 my ($widget, $cb) = @$item;
2756
2757 # handle various types of items, only text for now
2758 if (!ref $widget) {
2759 $widget = new CFClient::UI::Label
2760 can_hover => 1,
2761 can_events => 1,
2762 text => $widget;
2763 }
2764
2765 $self->{item}{$widget} = $item;
2766
2767 $self->{vbox}->add ($widget);
2768 }
2769
2770 $self
2771}
2772
2773# popup given the event (must be a mouse button down event currently)
2774sub popup {
2775 my ($self, $ev) = @_;
2776
2777 $self->emit ("popdown");
2778
2779 # maybe save $GRAB? must be careful about events...
2780 $GRAB = $self;
2781 $self->{button} = $ev->{button};
2782
2783 $self->show;
2784 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2785}
2786
2787sub mouse_motion {
2788 my ($self, $ev, $x, $y) = @_;
2789
2790 # TODO: should use vbox->find_widget or so
2791 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2792 $self->{hover} = $self->{item}{$HOVER};
2793}
2794
2795sub button_up {
2796 my ($self, $ev, $x, $y) = @_;
2797
2798 if ($ev->{button} == $self->{button}) {
2799 undef $GRAB;
2800 $self->hide;
2801
2802 $self->emit ("popdown");
2803 $self->{hover}[1]->() if $self->{hover};
2804 }
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Statusbox;
2810
2811our @ISA = CFClient::UI::VBox::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 $class->SUPER::new (
2817 fontsize => 0.8,
2818 @_,
2819 )
2820}
2821
2822sub reorder {
2823 my ($self) = @_;
2824 my $NOW = time;
2825
2826 while (my ($k, $v) = each %{ $self->{item} }) {
2827 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2828 }
2829
2830 my @widgets;
2831
2832 my @items = sort {
2833 $a->{pri} <=> $b->{pri}
2834 or $b->{id} <=> $a->{id}
2835 } values %{ $self->{item} };
2836
2837 my $count = 10 + 1;
2838 for my $item (@items) {
2839 last unless --$count;
2840
2841 push @widgets, $item->{label} ||= do {
2842 # TODO: doesn't handle markup well (read as: at all)
2843 my $short = $item->{count} > 1
2844 ? "<b>$item->{count} ×</b> $item->{text}"
2845 : $item->{text};
2846
2847 for ($short) {
2848 s/^\s+//;
2849 s/\s+/ /g;
2850 }
2851
2852 new CFClient::UI::Label
2853 markup => $short,
2854 tooltip => $item->{tooltip},
2855 tooltip_font => $::FONT_PROP,
2856 tooltip_width => 0.67,
2857 fontsize => $item->{fontsize} || $self->{fontsize},
2858 max_w => $::WIDTH * 0.44,
2859 fg => $item->{fg},
2860 can_events => 1,
2861 can_hover => 1
2862 };
2863 }
2864
2865 $self->clear;
2866 $self->SUPER::add (reverse @widgets);
2867}
2868
2869sub add {
2870 my ($self, $text, %arg) = @_;
2871
2872 $text =~ s/^\s+//;
2873 $text =~ s/\s+$//;
2874
2875 my $timeout = time + ((delete $arg{timeout}) || 60);
2876
2877 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2878
2879 if (my $item = $self->{item}{$group}) {
2880 if ($item->{text} eq $text) {
2881 $item->{count}++;
2882 } else {
2883 $item->{count} = 1;
2884 $item->{text} = $item->{tooltip} = $text;
2885 }
2886 $item->{id} = ++$self->{id};
2887 $item->{timeout} = $timeout;
2888 delete $item->{label};
2889 } else {
2890 $self->{item}{$group} = {
2891 id => ++$self->{id},
2892 text => $text,
2893 timeout => $timeout,
2894 tooltip => $text,
2895 fg => [0.8, 0.8, 0.8, 0.8],
2896 pri => 0,
2897 count => 1,
2898 %arg,
2899 };
2900 }
2901
2902 $self->reorder;
2903}
2904
2905sub reconfigure {
2906 my ($self) = @_;
2907
2908 delete $_->{label}
2909 for values %{ $self->{item} || {} };
2910
2911 $self->reorder;
2912 $self->SUPER::reconfigure;
2913}
2914
2915#############################################################################
2916
2404package CFClient::UI::Root; 2917package CFClient::UI::Root;
2405 2918
2406our @ISA = CFClient::UI::Container::; 2919our @ISA = CFClient::UI::Container::;
2407 2920
2408use CFClient::OpenGL; 2921use CFClient::OpenGL;
2409 2922
2410sub check_size { 2923sub new {
2411 my ($self) = @_; 2924 my $class = shift;
2412 2925
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2926 $class->SUPER::new (
2414} 2927 @_,
2415 2928 )
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418} 2929}
2419 2930
2420sub configure { 2931sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 2932 my ($self, $x, $y, $w, $h) = @_;
2422 2933
2423 $self->SUPER::configure ($x, $y, $w, $h); 2934 $self->{w} = $w;
2935 $self->{h} = $h;
2936}
2424 2937
2938sub check_size {
2939 my ($self) = @_;
2940
2941 $self->size_allocate ($self->{w}, $self->{h})
2942 if $self->{w};
2943}
2944
2945sub size_request {
2946 my ($self) = @_;
2947
2948 ($self->{w}, $self->{h})
2949}
2950
2951sub size_allocate {
2952 my ($self, $w, $h) = @_;
2953
2954 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2955 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2956
2957 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2959
2425 for my $child (@{$self->{children}}) { 2960 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2961 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 2962
2963 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2964 if exists $child->{req_x};
2965
2966 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2967 if exists $child->{req_y};
2968
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2969 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2970 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971
2430 $child->configure ($X, $Y, $W,$H); 2972 $child->configure ($X, $Y, $W, $H);
2431 } 2973 }
2432} 2974}
2433 2975
2434sub _topleft { 2976sub coord2local {
2435 my ($self, $x, $y) = @_; 2977 my ($self, $x, $y) = @_;
2436 2978
2437 ($x, $y) 2979 ($x, $y)
2438} 2980}
2439 2981
2982sub coord2global {
2983 my ($self, $x, $y) = @_;
2984
2985 ($x, $y)
2986}
2987
2440sub update { 2988sub update {
2441 my ($self) = @_; 2989 my ($self) = @_;
2442 2990
2443 $self->check_size; 2991 $self->check_size;
2444 ::refresh (); 2992 $::WANT_REFRESH++;
2445} 2993}
2446 2994
2447sub add { 2995sub add {
2448 my ($self, $child) = @_; 2996 my ($self, @children) = @_;
2449 2997
2998 for my $child (@children) {
2999 $child->{toplevel} = 1;
3000
2450 # integerize window positions 3001 # integerise window positions
2451 $child->{x} = int $child->{x}; 3002 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 3003 $child->{y} = int $child->{y};
3004 }
2453 3005
2454 $self->SUPER::add ($child); 3006 $self->SUPER::add (@children);
2455} 3007}
2456 3008
2457sub on_refresh { 3009sub on_refresh {
2458 my ($self, $id, $cb) = @_; 3010 my ($self, $id, $cb) = @_;
2459 3011
2460 $self->{refresh_hook}{$id} = $cb; 3012 $self->{refresh_hook}{$id} = $cb;
2461} 3013}
2462 3014
3015sub on_post_alloc {
3016 my ($self, $id, $cb) = @_;
3017
3018 $self->{post_alloc_hook}{$id} = $cb;
3019}
3020
2463sub draw { 3021sub draw {
2464 my ($self) = @_; 3022 my ($self) = @_;
2465 3023
2466 while (my $rcb = delete $self->{refresh_hook}) { 3024 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 3025 $_->()
3026 for values %{delete $self->{refresh_hook}};
3027 }
3028
3029 if ($self->{check_size}) {
3030 my @queue = ([], []);
3031
3032 for (;;) {
3033 if ($self->{check_size}) {
3034 # heuristic: check containers last
3035 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3036 for values %{delete $self->{check_size}}
3037 }
3038
3039 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3040
3041 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3042 ? @$widget{qw(user_w user_h)}
3043 : $widget->size_request;
3044
3045 if (delete $widget->{force_alloc}
3046 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3047 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3048
3049 $widget->{req_w} = $w;
3050 $widget->{req_h} = $h;
3051
3052 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3053
3054 $widget->{parent}->check_size
3055 if $widget->{parent};
3056 }
3057 }
3058 }
3059
3060 while ($self->{size_alloc}) {
3061 for (values %{delete $self->{size_alloc}}) {
3062 my ($widget, $w, $h) = @$_;
3063
3064 $w = 0 if $w < 0;
3065 $h = 0 if $h < 0;
3066
3067 $widget->{w} = $w;
3068 $widget->{h} = $h;
3069 $widget->size_allocate ($w, $h);
3070 $widget->emit (size_allocate => $w, $h);
3071 }
3072 }
3073
3074 while ($self->{post_alloc_hook}) {
3075 $_->()
3076 for values %{delete $self->{post_alloc_hook}};
2468 } 3077 }
2469 3078
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3079 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3081 glClear GL_COLOR_BUFFER_BIT;
2473 3082
2474 glMatrixMode GL_PROJECTION; 3083 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 3084 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3085 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 3086 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 3087 glLoadIdentity;
2479 3088
2480 $self->_draw; 3089 $self->_draw;
2481} 3090}
… …
2483############################################################################# 3092#############################################################################
2484 3093
2485package CFClient::UI; 3094package CFClient::UI;
2486 3095
2487$ROOT = new CFClient::UI::Root; 3096$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3097$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3098
24901 30991
2491 3100

Diff Legend

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