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.181 by root, Sat Apr 29 16:17:09 2006 UTC vs.
Revision 1.222 by root, Mon May 22 03:59:51 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $i; 137 $_ = $i;
138 }
139}
140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
135 } 169 }
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
179} 214}
180 215
232 $self->{y} = $y; 267 $self->{y} = $y;
233 $self->update; 268 $self->update;
234 } 269 }
235 270
236 if ($self->{w} != $w || $self->{h} != $h) { 271 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 272 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 273 }
243} 274}
244 275
245sub size_allocate { 276sub size_allocate {
246 # nothing to be done 277 # nothing to be done
247} 278}
248 279
280sub reconfigure {
281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
249sub children { 287sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 288}
261 289
262sub set_max_size { 290sub set_max_size {
263 my ($self, $w, $h) = @_; 291 my ($self, $w, $h) = @_;
264 292
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 293 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 294 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 295}
268 296
269# return top left coordinates 297sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 298 my ($self, $tooltip) = @_;
272 299
273 $self->{parent} 300 $self->{tooltip} = $tooltip;
274 or Carp::confess "no parent widget in _topleft\n";#d#
275 301
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 302 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner};
304 CFClient::UI::check_tooltip;
305 }
277} 306}
278 307
279# translate global coordinates to local coordinate system 308# translate global coordinates to local coordinate system
280sub coord2local { 309sub coord2local {
281 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
282 311
283 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 313}
286 314
287# translate local coordinates to global coordinate system 315# translate local coordinates to global coordinate system
288sub coord2global { 316sub coord2global {
289 my ($self, $x, $y) = @_; 317 my ($self, $x, $y) = @_;
290 318
291 my ($X, $Y) = $self->_topleft; 319 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 320}
294 321
295sub focus_in { 322sub focus_in {
296 my ($self) = @_; 323 my ($self) = @_;
297 324
369 glVertex $self->{w}, 0; 396 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 397 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 398 glVertex 0 , $self->{h};
372 glEnd; 399 glEnd;
373 glPopMatrix; 400 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 401 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 } 402 }
376} 403}
377 404
378sub _draw { 405sub _draw {
379 my ($self) = @_; 406 my ($self) = @_;
395 422
396sub set_parent { 423sub set_parent {
397 my ($self, $parent) = @_; 424 my ($self, $parent) = @_;
398 425
399 Scalar::Util::weaken ($self->{parent} = $parent); 426 Scalar::Util::weaken ($self->{parent} = $parent);
427
428 # TODO: req_w _does_change after ->reconfigure
429 $self->check_size
430 unless exists $self->{req_w};
431
432 $self->show;
400} 433}
401 434
402sub check_size { 435sub check_size {
403 my ($self) = @_; 436 my ($self, $forced) = @_;
404 437
405 $self->{parent} 438 $self->{force_alloc} = 1 if $forced;
406 or return 1; 439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 440}
427 441
428sub update { 442sub update {
429 my ($self) = @_; 443 my ($self) = @_;
430 444
445} 459}
446 460
447sub DESTROY { 461sub DESTROY {
448 my ($self) = @_; 462 my ($self) = @_;
449 463
464 delete $WIDGET{$self+0};
450 #$self->deactivate; 465 #$self->deactivate;
451} 466}
452 467
453############################################################################# 468#############################################################################
454 469
463 my $class = shift; 478 my $class = shift;
464 479
465 # range [value, low, high, page] 480 # range [value, low, high, page]
466 481
467 $class->SUPER::new ( 482 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 483 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 484 #active_bg => [1, 1, 1, 0.5],
470 @_ 485 @_
471 ) 486 )
472} 487}
473 488
474sub _draw { 489sub _draw {
475 my ($self) = @_; 490 my ($self) = @_;
476 491
492 my $color = $FOCUS == $self && $self->{active_bg}
493 ? $self->{active_bg}
494 : $self->{bg};
495
496 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 497 my ($w, $h) = @$self{qw(w h)};
478 498
479 glEnable GL_BLEND; 499 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 501 glColor @$color;
482 502
483 glBegin GL_QUADS; 503 glBegin GL_QUADS;
484 glVertex 0 , 0; 504 glVertex 0 , 0;
485 glVertex 0 , $h; 505 glVertex 0 , $h;
486 glVertex $w, $h; 506 glVertex $w, $h;
487 glVertex $w, 0; 507 glVertex $w, 0;
488 glEnd; 508 glEnd;
489 509
490 glDisable GL_BLEND; 510 glDisable GL_BLEND;
511 }
491} 512}
492 513
493############################################################################# 514#############################################################################
494 515
495package CFClient::UI::Empty; 516package CFClient::UI::Empty;
527 548
528 $self 549 $self
529} 550}
530 551
531sub add { 552sub add {
532 my ($self, $child) = @_; 553 my ($self, @widgets) = @_;
533 554
534 $child->set_parent ($self); 555 $_->set_parent ($self)
556 for @widgets;
535 557
536 use sort 'stable'; 558 use sort 'stable';
537 559
538 $self->{children} = [ 560 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 561 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 562 @{$self->{children}}, @widgets
541 ]; 563 ];
542 564
543 $child->check_size; 565 $self->check_size (1);
566 $self->update;
544} 567}
545 568
546sub children { 569sub children {
547 @{ $_[0]{children} } 570 @{ $_[0]{children} }
548} 571}
567 590
568 for (@$children) { 591 for (@$children) {
569 delete $_->{parent}; 592 delete $_->{parent};
570 $_->hide; 593 $_->hide;
571 } 594 }
595
596 $self->check_size;
597 $self->update;
572} 598}
573 599
574sub find_widget { 600sub find_widget {
575 my ($self, $x, $y) = @_; 601 my ($self, $x, $y) = @_;
576 602
651} 677}
652 678
653sub update { 679sub update {
654 my ($self) = @_; 680 my ($self) = @_;
655 681
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 682 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 683 $self->SUPER::update;
658} 684}
659 685
660sub size_allocate { 686sub size_allocate {
661 my ($self, $w, $h) = @_; 687 my ($self, $w, $h) = @_;
662 688
663 $self->SUPER::size_allocate ($w, $h); 689 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 690 $self->update;
691}
692
693sub _render {
694 $_[0]{children}[0]->draw;
665} 695}
666 696
667sub render_child { 697sub render_child {
668 my ($self) = @_; 698 my ($self) = @_;
669 699
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 700 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 701 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 702 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 703
674# glColorMask 1, 1, 1, 0; 704 $self->_render;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
681 }; 705 };
682} 706}
683 707
684sub _draw { 708sub _draw {
685 my ($self) = @_; 709 my ($self) = @_;
687 my ($w, $h) = ($self->w, $self->h); 711 my ($w, $h) = ($self->w, $self->h);
688 712
689 my $tex = $self->{texture} 713 my $tex = $self->{texture}
690 or return; 714 or return;
691 715
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 716 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 718 glColor 1, 1, 1, 1;
697 719
698 $tex->draw_quad (0, 0, $w, $h); 720 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 721
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 722 glDisable GL_TEXTURE_2D;
702} 723}
703 724
704############################################################################# 725#############################################################################
705 726
706package CFClient::UI::ViewPort; 727package CFClient::UI::ViewPort;
707 728
708our @ISA = CFClient::UI::Window::; 729our @ISA = CFClient::UI::Window::;
709 730
710sub new { die }
711
712sub size_request { 731sub size_request {
713 my ($self) = @_; 732 my ($self) = @_;
714 733
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 734 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 735 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
717 736
718 @$self{qw(child_w child_h)} 737 @$self{qw(child_w child_h)}
719} 738}
720 739
721sub _draw { 740sub size_allocate {
722 my ($self) = @_; 741 my ($self, $w, $h) = @_;
723 742
724 $self->{children}[1]->draw; 743 $self->update;
725} 744}
726 745
746sub set_offset {
747 my ($self, $x, $y) = @_;
748
749 $self->{view_x} = int $x;
750 $self->{view_y} = int $y;
751
752 $self->update;
753}
754
755# hmm, this does not work for topleft of $self... but we should not ask for that
756sub coord2local {
757 my ($self, $x, $y) = @_;
758
759 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
760}
761
762sub coord2global {
763 my ($self, $x, $y) = @_;
764
765 $x = List::Util::min $self->{w}, $x - $self->{view_x};
766 $y = List::Util::min $self->{h}, $y - $self->{view_y};
767
768 $self->SUPER::coord2global ($x, $y)
769}
770
771sub find_widget {
772 my ($self, $x, $y) = @_;
773
774 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
775 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
776 ) {
777 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
778 } else {
779 $self->CFClient::UI::Base::find_widget ($x, $y)
780 }
781}
782
783sub _render {
784 my ($self) = @_;
785
786 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787
788 $self->SUPER::_render;
789}
727 790
728############################################################################# 791#############################################################################
729 792
730package CFClient::UI::Frame; 793package CFClient::UI::ScrolledWindow;
731 794
732our @ISA = CFClient::UI::Bin::; 795our @ISA = CFClient::UI::HBox::;
733
734use CFClient::OpenGL;
735 796
736sub new { 797sub new {
737 my $class = shift; 798 my $class = shift;
738 799
800 my $self;
801
802 my $slider = new CFClient::UI::Slider
803 vertical => 1,
804 range => [0, 0, 1, 0.01], # HACK fix
805 connect_changed => sub {
806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
807 },
808 ;
809
739 my $self = $class->SUPER::new ( 810 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 811 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 812 slider => $slider,
742 border => 0.8,
743 @_ 813 @_,
744 ); 814 );
745 815
816 $self->{vp}->add ($self->{scrolled});
817 $self->add ($self->{vp});
818 $self->add ($self->{slider});
819
746 $self 820 $self
747} 821}
748 822
823#TODO# update range on size_allocate depending on child
824# update viewport offset on scroll
825
826#############################################################################
827
828package CFClient::UI::Frame;
829
830our @ISA = CFClient::UI::Bin::;
831
832use CFClient::OpenGL;
833
834sub new {
835 my $class = shift;
836
837 $class->SUPER::new (
838 bg => undef,
839 @_,
840 )
841}
842
749sub _draw { 843sub _draw {
750 my ($self) = @_; 844 my ($self) = @_;
751 845
752 my ($w, $h) = ($self->{w}, $self->{h}); 846 if ($self->{bg}) {
847 my ($w, $h) = @$self{qw(w h)};
753 848
754 glEnable GL_BLEND; 849 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 850 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 851 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 852
759# glBegin GL_QUADS; 853 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 854 glVertex 0 , 0;
762# glVertex 0 , $h; 855 glVertex 0 , $h;
763# glVertex $w, $h; 856 glVertex $w, $h;
764# glVertex $w, 0; 857 glVertex $w, 0;
765# glEnd; 858 glEnd;
766 859
767
768 $self->child->draw;
769 glDisable GL_BLEND; 860 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 861 }
862
863 $self->SUPER::_draw;
771} 864}
772 865
773############################################################################# 866#############################################################################
774 867
775package CFClient::UI::FancyFrame; 868package CFClient::UI::FancyFrame;
789 882
790 my $self = $class->SUPER::new ( 883 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 884 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 885 border_bg => [1, 1, 1, 1],
793 border => 0.6, 886 border => 0.6,
887 toplevel => 1,
794 can_events => 1, 888 can_events => 1,
795 @_ 889 @_
796 ); 890 );
797 891
798 $self->{title} &&= new CFClient::UI::Label 892 $self->{title} &&= new CFClient::UI::Label
823 my ($self, $w, $h) = @_; 917 my ($self, $w, $h) = @_;
824 918
825 $h -= List::Util::max 0, $self->border * 2; 919 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 920 $w -= List::Util::max 0, $self->border * 2;
827 921
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829 if $self->{title}; 923 if $self->{title};
830 924
831 $self->child->configure ($self->border, $self->border, $w, $h); 925 $self->child->configure ($self->border, $self->border, $w, $h);
832} 926}
833 927
891 my ($self) = @_; 985 my ($self) = @_;
892 986
893 my ($w, $h ) = ($self->{w}, $self->{h}); 987 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 989
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 990 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 992
901 my $border = $self->border; 993 my $border = $self->border;
902 994
903 glColor @{ $self->{border_bg} }; 995 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 996 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1000
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1002 my $bg = $tex[0];
911 1003
912 # TODO: repeat texture not scale 1004 # TODO: repeat texture not scale
916 glColor @{ $self->{bg} }; 1008 glColor @{ $self->{bg} };
917 1009
918 $bg->{s} = $rep_x; 1010 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 1011 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 1012 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 }
922 1015
923 glDisable GL_TEXTURE_2D; 1016 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1017
927 $self->{title}->draw if $self->{title}; 1018 $self->{title}->draw if $self->{title};
928 1019
929 $self->child->draw; 1020 $self->child->draw;
930} 1021}
1157} 1248}
1158 1249
1159sub size_allocate { 1250sub size_allocate {
1160 my ($self, $w, $h) = @_; 1251 my ($self, $w, $h) = @_;
1161 1252
1253 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1162 my $children = $self->{children}; 1255 my $children = $self->{children};
1163 1256
1164 my @h = map $_->{req_h}, @$children; 1257 my @h = map $_->{req_h}, @$children;
1165 1258
1166 my $req_h = List::Util::sum @h; 1259 my $req_h = List::Util::sum @h;
1195 1288
1196############################################################################# 1289#############################################################################
1197 1290
1198package CFClient::UI::Label; 1291package CFClient::UI::Label;
1199 1292
1200our @ISA = CFClient::UI::Base::; 1293our @ISA = CFClient::UI::DrawBG::;
1201 1294
1202use CFClient::OpenGL; 1295use CFClient::OpenGL;
1203 1296
1204sub new { 1297sub new {
1205 my ($class, %arg) = @_; 1298 my ($class, %arg) = @_;
1206 1299
1207 my $self = $class->SUPER::new ( 1300 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1302 #bg => none
1303 #active_bg => none
1209 #font => default_font 1304 #font => default_font
1305 #text => initial text
1306 #markup => initial narkup
1307 #max_w => maximum pixel width
1308 ellipsise => 3, # end
1309 layout => (new CFClient::Layout),
1210 fontsize => 1, 1310 fontsize => 1,
1211 text => "",
1212 align => -1, 1311 align => -1,
1213 valign => -1, 1312 valign => -1,
1214 padding => 2, 1313 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1314 can_events => 0,
1217 %arg 1315 %arg
1218 ); 1316 );
1219 1317
1220 if (exists $self->{template}) { 1318 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1319 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1320 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1321 $self->{template} = $layout;
1224 } 1322 }
1225 1323
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1324 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1325 $self->set_markup (delete $self->{markup});
1326 } else {
1327 $self->set_text (delete $self->{text});
1328 }
1228 1329
1229 $self 1330 $self
1230} 1331}
1231 1332
1232sub escape { 1333sub escape($) {
1233 local $_ = $_[1]; 1334 local $_ = $_[0];
1234 1335
1235 s/&/&amp;/g; 1336 s/&/&amp;/g;
1236 s/>/&gt;/g; 1337 s/>/&gt;/g;
1237 s/</&lt;/g; 1338 s/</&lt;/g;
1238 1339
1239 $_[1] 1340 $_
1240} 1341}
1241 1342
1242sub update { 1343sub update {
1243 my ($self) = @_; 1344 my ($self) = @_;
1244 1345
1245 delete $self->{texture}; 1346 delete $self->{texture};
1246 $self->SUPER::update; 1347 $self->SUPER::update;
1247} 1348}
1248 1349
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1350sub set_text {
1256 my ($self, $text) = @_; 1351 my ($self, $text) = @_;
1257 1352
1258 return if $self->{text} eq "T$text"; 1353 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1354 $self->{text} = "T$text";
1260 1355
1356 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1357 $self->{layout}->set_text ($text);
1262 1358
1263 delete $self->{texture};
1264 $self->update; 1359 $self->update;
1265 $self->check_size; 1360 $self->check_size;
1266} 1361}
1267 1362
1268sub set_markup { 1363sub set_markup {
1269 my ($self, $markup) = @_; 1364 my ($self, $markup) = @_;
1270 1365
1271 return if $self->{text} eq "M$markup"; 1366 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1367 $self->{text} = "M$markup";
1273 1368
1369 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370
1371 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1372 $self->{layout}->set_markup ($markup);
1275 1373
1276 delete $self->{texture};
1277 $self->update; 1374 $self->update;
1278 $self->check_size; 1375 $self->check_size;
1279} 1376}
1280 1377
1281sub size_request { 1378sub size_request {
1282 my ($self) = @_; 1379 my ($self) = @_;
1283 1380
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1381 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1); 1382 $self->{layout}->set_width ($self->{max_w} || -1);
1383 $self->{layout}->set_ellipsise ($self->{ellipsise});
1384 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1386
1288 my ($w, $h) = $self->{layout}->size; 1387 my ($w, $h) = $self->{layout}->size;
1289 1388
1290 if (exists $self->{template}) { 1389 if (exists $self->{template}) {
1312sub set_fontsize { 1411sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1412 my ($self, $fontsize) = @_;
1314 1413
1315 $self->{fontsize} = $fontsize; 1414 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1415 delete $self->{texture};
1416
1417 $self->update;
1317 $self->check_size; 1418 $self->check_size;
1318 $self->update;
1319} 1419}
1320 1420
1321sub _draw { 1421sub _draw {
1322 my ($self) = @_; 1422 my ($self) = @_;
1323 1423
1424 $self->SUPER::_draw; # draw background, if applicable
1425
1324 my $tex = $self->{texture} ||= do { 1426 my $tex = $self->{texture} ||= do {
1427 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1428 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1429 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433
1328 new_from_layout CFClient::Texture $self->{layout} 1434 my $tex = new_from_layout CFClient::Texture $self->{layout};
1435
1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1438 : ($self->{w} - $tex->{w}) * 0.5);
1439
1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1442 : ($self->{h} - $tex->{h}) * 0.5);
1443
1444 $tex
1329 }; 1445 };
1330 1446
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1447 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1449
1450 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1451 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1452 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1453 } else {
1454 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1455 }
1351 1456
1352 glDisable GL_TEXTURE_2D; 1457 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1458}
1355 1459
1356############################################################################# 1460#############################################################################
1357 1461
1358package CFClient::UI::EntryBase; 1462package CFClient::UI::EntryBase;
1393 $self->{layout}->set_text ("$text "); 1497 $self->{layout}->set_text ("$text ");
1394 1498
1395 $self->emit (changed => $self->{text}); 1499 $self->emit (changed => $self->{text});
1396} 1500}
1397 1501
1398sub get_text {
1399 $_[0]{text}
1400}
1401
1402sub size_request {
1403 my ($self) = @_;
1404
1405 my ($w, $h) = $self->SUPER::size_request;
1406
1407 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text { 1502sub set_text {
1417 my ($self, $text) = @_; 1503 my ($self, $text) = @_;
1418 1504
1419 $self->{cursor} = length $text; 1505 $self->{cursor} = length $text;
1420 $self->_set_text ($text); 1506 $self->_set_text ($text);
1421 $self->update; 1507 $self->update;
1508 $self->check_size;
1509}
1510
1511sub get_text {
1512 $_[0]{text}
1513}
1514
1515sub size_request {
1516 my ($self) = @_;
1517
1518 my ($w, $h) = $self->SUPER::size_request;
1519
1520 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1422} 1527}
1423 1528
1424sub key_down { 1529sub key_down {
1425 my ($self, $ev) = @_; 1530 my ($self, $ev) = @_;
1426 1531
1428 my $sym = $ev->{sym}; 1533 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1534 my $uni = $ev->{unicode};
1430 1535
1431 my $text = $self->get_text; 1536 my $text = $self->get_text;
1432 1537
1433 if ($sym == 8) { 1538 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1539 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1540 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1541 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1542 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1543 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1544 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1545 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1546 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1547 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1548 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1549 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1550 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1551 $self->emit ('escape');
1447 } elsif ($uni) { 1552 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1553 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1554 }
1450 1555
1451 $self->_set_text ($text); 1556 $self->_set_text ($text);
1452 $self->update; 1557 $self->update;
1558 $self->check_size;
1453} 1559}
1454 1560
1455sub focus_in { 1561sub focus_in {
1456 my ($self) = @_; 1562 my ($self) = @_;
1457 1563
1586 my $class = shift; 1692 my $class = shift;
1587 1693
1588 $class->SUPER::new ( 1694 $class->SUPER::new (
1589 padding => 4, 1695 padding => 4,
1590 fg => [1, 1, 1], 1696 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1697 active_fg => [0, 0, 1],
1593 can_hover => 1, 1698 can_hover => 1,
1594 align => 0, 1699 align => 0,
1595 valign => 0, 1700 valign => 0,
1596 can_events => 1, 1701 can_events => 1,
1614 1719
1615 if ($GRAB == $self) { 1720 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1721 $self->{fg} = $self->{active_fg};
1617 } 1722 }
1618 1723
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1724 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1725 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1726 glColor 0, 0, 0, 1;
1624 1727
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1728 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1729
1627 glDisable GL_TEXTURE_2D; 1730 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1731
1630 $self->SUPER::_draw; 1732 $self->SUPER::_draw;
1631} 1733}
1632 1734
1633############################################################################# 1735#############################################################################
1647 1749
1648 $class->SUPER::new ( 1750 $class->SUPER::new (
1649 padding => 2, 1751 padding => 2,
1650 fg => [1, 1, 1], 1752 fg => [1, 1, 1],
1651 active_fg => [1, 1, 0], 1753 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5],
1652 state => 0, 1756 state => 0,
1653 can_hover => 1, 1757 can_hover => 1,
1654 @_ 1758 @_
1655 ) 1759 )
1656} 1760}
1680 1784
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1785 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1682 1786
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1788
1685 glEnable GL_BLEND; 1789 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790
1686 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1792 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1793 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1794}
1696 1795
1697############################################################################# 1796#############################################################################
1698 1797
1699package CFClient::UI::Image; 1798package CFClient::UI::Image;
1742 glTranslate 0, -$self->{w}, 0; 1841 glTranslate 0, -$self->{w}, 0;
1743 1842
1744 ($w, $h) = ($h, $w); 1843 ($w, $h) = ($h, $w);
1745 } 1844 }
1746 1845
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1846 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1848
1752 $tex->draw_quad (0, 0, $w, $h); 1849 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1850
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1851 glDisable GL_TEXTURE_2D;
1756} 1852}
1757 1853
1758############################################################################# 1854#############################################################################
1759 1855
1948 qw(s1_slider.png s1_slider_bg.png); 2044 qw(s1_slider.png s1_slider_bg.png);
1949 2045
1950sub new { 2046sub new {
1951 my $class = shift; 2047 my $class = shift;
1952 2048
1953 # range [value, low, high, page] 2049 # range [value, low, high, page, unit]
1954 2050
1955 # TODO: 0-width page 2051 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2052 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2053 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2054 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2055 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2056 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5],
1961 range => [0, 0, 100, 10], 2059 range => [0, 0, 100, 10],
1962 req_w => 20, 2060 req_w => $::WIDTH / 80,
1963 req_h => 20, 2061 req_h => $::WIDTH / 80,
1964 vertical => 0, 2062 vertical => 0,
1965 can_hover => 1, 2063 can_hover => 1,
1966 inner_pad => 5, 2064 inner_pad => 0.02,
1967 @_ 2065 @_
1968 ); 2066 );
1969 2067
2068 $self->set_value ($self->{range}[0]);
2069 $self->update;
2070
1970 $self 2071 $self
2072}
2073
2074sub set_value {
2075 my ($self, $value) = @_;
2076
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078
2079 $hi = $lo + 1 if $hi <= $lo;
2080
2081 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi;
2083
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit;
2086
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090
2091 if ($value != $old_value) {
2092 $self->emit (changed => $value);
2093 $self->update;
2094 }
1971} 2095}
1972 2096
1973sub size_request { 2097sub size_request {
1974 my ($self) = @_; 2098 my ($self) = @_;
1975 2099
1988 2112
1989sub mouse_motion { 2113sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1991 2115
1992 if ($GRAB == $self) { 2116 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118
2119 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2122
2123 $self->set_value ($x * ($hi - $lo) + $lo);
2124 }
2125}
2126
2127sub update {
2128 my ($self) = @_;
2129
2130 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131 $self->set_value ($self->{range}[0]);
2132
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2133 my ($value, $lo, $hi, $page) = @{$self->{range}};
1994 2134
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2135 my $inner_w = 1 - 2 * $self->{inner_pad};
1996 2136
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2137 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1999 2138
2000 $x -= $inner_pad_px; # substract the padding 2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2140 $value = $self->{scale} * ($value - $lo);
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2141
2006 $self->emit (changed => $x); 2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2007 $self->update; 2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value;
2148 $self->{knob_w} = $page;
2008 } 2149 });
2009}
2010 2150
2011# the inner_* stuff is for generating a padding for the slider handle, 2151 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2152}
2018 2153
2019sub _draw { 2154sub _draw {
2020 my ($self) = @_; 2155 my ($self) = @_;
2021 2156
2022 $self->SUPER::_draw (); 2157 $self->SUPER::_draw ();
2023 2158
2024 my ($w, $h) = @$self{qw(w h)}; 2159 glScale $self->{w}, $self->{h};
2025 2160
2026 if ($self->{vertical}) { 2161 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2162 # draw a vertical slider like a rotated horizontal slider
2028 2163
2164 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2165 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2166 }
2034 2167
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2168 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2169 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2170
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2171 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2172 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2173
2061 # draw background 2174 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2175 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2176
2064 # draw handle 2177 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2178 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 2179
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2180 glDisable GL_TEXTURE_2D;
2069} 2181}
2070 2182
2071############################################################################# 2183#############################################################################
2072 2184
2083 fontsize => 1, 2195 fontsize => 1,
2084 can_events => 0, 2196 can_events => 0,
2085 #font => default_font 2197 #font => default_font
2086 @_, 2198 @_,
2087 2199
2088 layout => (new CFClient::Layout), 2200 layout => (new CFClient::Layout 1),
2089 par => [], 2201 par => [],
2090 height => 0, 2202 height => 0,
2091 children => [ 2203 children => [
2092 (new CFClient::UI::Empty expand => 1), 2204 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2205 (new CFClient::UI::Slider vertical => 1),
2104 2216
2105 $self->{fontsize} = $fontsize; 2217 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2218 $self->reflow;
2107} 2219}
2108 2220
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2221sub size_allocate {
2129 my ($self, $w, $h) = @_; 2222 my ($self, $w, $h) = @_;
2130 2223
2131 $self->SUPER::size_allocate ($w, $h); 2224 $self->SUPER::size_allocate ($w, $h);
2132 2225
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2228 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2229
2137 $self->reflow; 2230 $self->reflow;
2138} 2231}
2139 2232
2233sub text_height {
2234 my ($self, $text, $indent) = @_;
2235
2236 my $layout = $self->{layout};
2237
2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239 $layout->set_width ($self->{children}[0]{w} - $indent);
2240 $layout->set_markup ($text);
2241
2242 ($layout->size)[1]
2243}
2244
2245sub reflow {
2246 my ($self) = @_;
2247
2248 $self->{need_reflow}++;
2249 $self->update;
2250}
2251
2140sub add_paragraph { 2252sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2253 my ($self, $color, $text, $indent) = @_;
2142 2254
2143 #TODO: intelligently "reformat" paragraph 2255 #TODO: intelligently "reformat" paragraph
2144 2256
2257 for my $line (split /\n/, $text) {
2145 my $height = $self->text_height ($text); 2258 my $height = $self->text_height ($line);
2146
2147 $self->{height} += $height; 2259 $self->{height} += $height;
2148
2149 push @{$self->{par}}, [$height, $color, $text]; 2260 push @{$self->{par}}, [$height, $color, $indent, $line];
2261 }
2150 2262
2151 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2263 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2152 $self->{children}[1]->update; 2264 $self->{children}[1]->update;
2153} 2265}
2154 2266
2159 2271
2160 return unless $self->{h} > 0; 2272 return unless $self->{h} > 0;
2161 2273
2162 delete $self->{texture}; 2274 delete $self->{texture};
2163 2275
2164 $ROOT->on_refresh ($self, sub { 2276 $ROOT->on_post_alloc ($self, sub {
2165 if (delete $self->{need_reflow}) { 2277 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2278 my $height = 0;
2167 2279
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2169 for @{$self->{par}}; 2281 for @{$self->{par}};
2170 2282
2171 $self->{height} = $height; 2283 $self->{height} = $height;
2172 2284
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2286 $self->{children}[1]->update;
2174 2287
2175 delete $self->{texture}; 2288 delete $self->{texture};
2176 } 2289 }
2177 2290
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2291 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2179 glClearColor 0, 0, 0, 0; 2292 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2293 glClear GL_COLOR_BUFFER_BIT;
2181
2182 glEnable GL_BLEND;
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186 2294
2187 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2188 2296
2189 my $y0 = $top; 2297 my $y0 = $top;
2190 my $y1 = $top + $self->{h}; 2298 my $y1 = $top + $self->{h};
2193 2301
2194 my $layout = $self->{layout}; 2302 my $layout = $self->{layout};
2195 2303
2196 $layout->set_font ($self->{font}) if $self->{font}; 2304 $layout->set_font ($self->{font}) if $self->{font};
2197 2305
2306 glEnable GL_BLEND;
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308
2198 for my $par (@{$self->{par}}) { 2309 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2310 my $h = $par->[0];
2200 2311
2201 if ($y0 < $y + $h && $y < $y1) { 2312 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] });
2314 $layout->set_width ($self->{w} - $par->[2]);
2202 $layout->set_text ($par->[2]); 2315 $layout->set_markup ($par->[3]);
2203 2316
2204 glColor @{ $par->[1] }; 2317 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2318
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2319 glRasterPos $par->[2], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2207 } 2321 }
2208 2322
2209 $y += $h; 2323 $y += $h;
2210 } 2324 }
2211 2325
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2326 glDisable GL_BLEND;
2214 }; 2327 };
2215 }); 2328 });
2216} 2329}
2217 2330
2218sub _draw { 2331sub _draw {
2219 my ($self) = @_; 2332 my ($self) = @_;
2220 2333
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2334 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2336 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2337 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2339
2230 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2231 2341
2232} 2342}
2233 2343
2327 @_, 2437 @_,
2328 can_events => 0, 2438 can_events => 0,
2329 ) 2439 )
2330} 2440}
2331 2441
2332sub set_markup { 2442sub set_tooltip_from {
2333 my ($self, $text) = @_; 2443 my ($self, $widget) = @_;
2334 2444
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2445 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2446 markup => $widget->{tooltip},
2337 $self->add ($self->{label}); 2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448 fontsize => 0.8,
2449 fg => [0, 0, 0, 1],
2450 ellipsise => 0,
2451 font => ($widget->{tooltip_font} || $::FONT_PROP),
2452 );
2338} 2453}
2339 2454
2340sub size_request { 2455sub size_request {
2341 my ($self) = @_; 2456 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2457
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2458 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2459
2347 ($w + 4, $h + 4) 2460 ($w + 4, $h + 4)
2348} 2461}
2354} 2467}
2355 2468
2356sub _draw { 2469sub _draw {
2357 my ($self) = @_; 2470 my ($self) = @_;
2358 2471
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2472 glTranslate 0.375, 0.375;
2361 2473
2362 my ($w, $h) = @$self{qw(w h)}; 2474 my ($w, $h) = @$self{qw(w h)};
2363 2475
2364 glColor 1, 0.8, 0.4; 2476 glColor 1, 0.8, 0.4;
2375 glVertex 0 , $h; 2487 glVertex 0 , $h;
2376 glVertex $w, $h; 2488 glVertex $w, $h;
2377 glVertex $w, 0; 2489 glVertex $w, 0;
2378 glEnd; 2490 glEnd;
2379 2491
2380 glPopMatrix; 2492 glTranslate 2 - 0.375, 2 - 0.375;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2493 $self->SUPER::_draw;
2384} 2494}
2385 2495
2386############################################################################# 2496#############################################################################
2387 2497
2392use CFClient::OpenGL; 2502use CFClient::OpenGL;
2393 2503
2394sub new { 2504sub new {
2395 my $class = shift; 2505 my $class = shift;
2396 2506
2397 $class->SUPER::new ( 2507 my $self = $class->SUPER::new (
2398 aspect => 1, 2508 aspect => 1,
2399 @_, 2509 @_,
2400 ) 2510 );
2511
2512 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self);
2514
2515 $self->{timer} = Event->timer (
2516 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2517 hard => 1,
2518 interval => $self->{animspeed},
2519 cb => sub {
2520 ++$widget->{frame};
2521 $widget->update;
2522 },
2523 );
2524 }
2525
2526 $self
2401} 2527}
2402 2528
2403sub size_request { 2529sub size_request {
2404 (32, 8) 2530 (32, 8)
2405} 2531}
2406 2532
2533sub update {
2534 my ($self) = @_;
2535
2536 return unless $self->{visible};
2537
2538 $self->SUPER::update;
2539}
2540
2407sub _draw { 2541sub _draw {
2408 my ($self) = @_; 2542 my ($self) = @_;
2409 2543
2544 return unless $::CONN;#d# manage and cache textures differently
2545
2546 my $face;
2547
2548 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}];
2550
2551 $face = $anim->[ $self->{frame} % @$anim ]
2552 if $anim && @$anim;
2553 }
2554
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2555 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2556
2412 # TODO animation
2413 if ($tex) { 2557 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2558 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2559 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2560 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2561 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2562 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 2563 }
2564}
2565
2566sub DESTROY {
2567 my ($self) = @_;
2568
2569 $self->{timer}->cancel
2570 if $self->{timer};
2571
2572 $self->SUPER::DESTROY;
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::InventoryItem;
2578
2579our @ISA = CFClient::UI::HBox::;
2580
2581sub _item_to_desc {
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2606
2607sub new {
2608 my $class = shift;
2609
2610 my %args = @_;
2611
2612 my $item = delete $args{item};
2613
2614 my $desc = _item_to_desc ($item);
2615
2616 my $self = $class->SUPER::new (
2617 can_hover => 1,
2618 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_;
2623
2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2632 $::CONN->send ("move $targ $item->{tag} 0");
2633 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) {
2636 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2649 ),
2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653 }
2654
2655 1
2656 },
2657 %args
2658 );
2659
2660
2661 $self->add (new CFClient::UI::Face
2662 can_events => 0,
2663 face => $item->{face},
2664 anim => $item->{anim},
2665 animspeed => $item->{animspeed},
2666 );
2667
2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670 $self->{item} = $item;
2671
2672 $self->update_item;
2673
2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2683}
2684
2685#############################################################################
2686
2687package CFClient::UI::Inventory;
2688
2689our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691sub new {
2692 my $class = shift;
2693
2694 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox),
2696 @_,
2697 );
2698
2699 $self
2700}
2701
2702sub set_items {
2703 my ($self, $items) = @_;
2704
2705 $self->{scrolled}->clear;
2706 return unless $items;
2707
2708 my @items = sort {
2709 ($a->{type} <=> $b->{type})
2710 or ($a->{name} cmp $b->{name})
2711 } @$items;
2712
2713 $self->{real_items} = \@items;
2714
2715 for my $item (@items) {
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2718 }
2719
2720 $self->{scrolled}->add (@items);
2721
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727 ($self->{req_w}, $self->{req_h});
2423} 2728}
2424 2729
2425############################################################################# 2730#############################################################################
2426 2731
2427package CFClient::UI::Menu; 2732package CFClient::UI::Menu;
2475} 2780}
2476 2781
2477sub mouse_motion { 2782sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2783 my ($self, $ev, $x, $y) = @_;
2479 2784
2480 # TODO: should use vbox->fdind_widget or so 2785 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2786 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2787 $self->{hover} = $self->{item}{$HOVER};
2483} 2788}
2484 2789
2485sub button_up { 2790sub button_up {
2494 } 2799 }
2495} 2800}
2496 2801
2497############################################################################# 2802#############################################################################
2498 2803
2804package CFClient::UI::Statusbox;
2805
2806our @ISA = CFClient::UI::VBox::;
2807
2808sub new {
2809 my $class = shift;
2810
2811 $class->SUPER::new (
2812 fontsize => 0.8,
2813 @_,
2814 )
2815}
2816
2817sub reorder {
2818 my ($self) = @_;
2819 my $NOW = time;
2820
2821 while (my ($k, $v) = each %{ $self->{item} }) {
2822 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2823 }
2824
2825 my @widgets;
2826
2827 my @items = sort {
2828 $a->{pri} <=> $b->{pri}
2829 or $b->{id} <=> $a->{id}
2830 } values %{ $self->{item} };
2831
2832 my $count = 10 + 1;
2833 for my $item (@items) {
2834 last unless --$count;
2835
2836 push @widgets, $item->{label} ||= do {
2837 # TODO: doesn't handle markup well (read as: at all)
2838 my $short = $item->{count} > 1
2839 ? "<b>$item->{count} ×</b> $item->{text}"
2840 : $item->{text};
2841
2842 for ($short) {
2843 s/^\s+//;
2844 s/\s+/ /g;
2845 }
2846
2847 new CFClient::UI::Label
2848 markup => $short,
2849 tooltip => $item->{tooltip},
2850 tooltip_font => $::FONT_PROP,
2851 tooltip_width => 0.67,
2852 fontsize => $item->{fontsize} || $self->{fontsize},
2853 max_w => $::WIDTH * 0.44,
2854 fg => $item->{fg},
2855 can_events => 1,
2856 can_hover => 1
2857 };
2858 }
2859
2860 $self->clear;
2861 $self->SUPER::add (reverse @widgets);
2862}
2863
2864sub add {
2865 my ($self, $text, %arg) = @_;
2866
2867 $text =~ s/^\s+//;
2868 $text =~ s/\s+$//;
2869
2870 my $timeout = time + ((delete $arg{timeout}) || 60);
2871
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873
2874 if (my $item = $self->{item}{$group}) {
2875 if ($item->{text} eq $text) {
2876 $item->{count}++;
2877 } else {
2878 $item->{count} = 1;
2879 $item->{text} = $item->{tooltip} = $text;
2880 }
2881 $item->{id} = ++$self->{id};
2882 $item->{timeout} = $timeout;
2883 delete $item->{label};
2884 } else {
2885 $self->{item}{$group} = {
2886 id => ++$self->{id},
2887 text => $text,
2888 timeout => $timeout,
2889 tooltip => $text,
2890 fg => [0.8, 0.8, 0.8, 0.8],
2891 pri => 0,
2892 count => 1,
2893 %arg,
2894 };
2895 }
2896
2897 $self->reorder;
2898}
2899
2900sub reconfigure {
2901 my ($self) = @_;
2902
2903 delete $_->{label}
2904 for values %{ $self->{item} || {} };
2905
2906 $self->reorder;
2907 $self->SUPER::reconfigure;
2908}
2909
2910#############################################################################
2911
2499package CFClient::UI::Root; 2912package CFClient::UI::Root;
2500 2913
2501our @ISA = CFClient::UI::Container::; 2914our @ISA = CFClient::UI::Container::;
2502 2915
2503use CFClient::OpenGL; 2916use CFClient::OpenGL;
2504 2917
2505sub check_size { 2918sub new {
2506 my ($self) = @_; 2919 my $class = shift;
2507 2920
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2921 $class->SUPER::new (
2509} 2922 @_,
2510 2923 )
2511sub size_request {
2512 ($::WIDTH, $::HEIGHT)
2513} 2924}
2514 2925
2515sub configure { 2926sub configure {
2516 my ($self, $x, $y, $w, $h) = @_; 2927 my ($self, $x, $y, $w, $h) = @_;
2517 2928
2518 $self->SUPER::configure ($x, $y, $w, $h); 2929 $self->{w} = $w;
2930 $self->{h} = $h;
2931}
2519 2932
2933sub check_size {
2934 my ($self) = @_;
2935
2936 $self->size_allocate ($self->{w}, $self->{h})
2937 if $self->{w};
2938}
2939
2940sub size_request {
2941 my ($self) = @_;
2942
2943 ($self->{w}, $self->{h})
2944}
2945
2946sub size_allocate {
2947 my ($self, $w, $h) = @_;
2948
2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2520 for my $child (@{$self->{children}}) { 2955 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 2957
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2959 if exists $child->{req_x};
2960
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2962 if exists $child->{req_y};
2963
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2964 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966
2525 $child->configure ($X, $Y, $W,$H); 2967 $child->configure ($X, $Y, $W, $H);
2526 } 2968 }
2527} 2969}
2528 2970
2529sub _topleft { 2971sub coord2local {
2530 my ($self, $x, $y) = @_; 2972 my ($self, $x, $y) = @_;
2531 2973
2532 ($x, $y) 2974 ($x, $y)
2533} 2975}
2534 2976
2977sub coord2global {
2978 my ($self, $x, $y) = @_;
2979
2980 ($x, $y)
2981}
2982
2535sub update { 2983sub update {
2536 my ($self) = @_; 2984 my ($self) = @_;
2537 2985
2538 $self->check_size; 2986 $self->check_size;
2539 ::refresh (); 2987 $::WANT_REFRESH++;
2540} 2988}
2541 2989
2542sub add { 2990sub add {
2543 my ($self, $child) = @_; 2991 my ($self, @children) = @_;
2544 2992
2993 for my $child (@children) {
2994 $child->{toplevel} = 1;
2995
2545 # integerize window positions 2996 # integerise window positions
2546 $child->{x} = int $child->{x}; 2997 $child->{x} = int $child->{x};
2547 $child->{y} = int $child->{y}; 2998 $child->{y} = int $child->{y};
2999 }
2548 3000
2549 $self->SUPER::add ($child); 3001 $self->SUPER::add (@children);
3002
3003 while (@children) {
3004 my $w = pop @children;
3005 push @children, $w->children;
3006 $w->{visible} = 1;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 }
2550} 3020}
2551 3021
2552sub on_refresh { 3022sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3023 my ($self, $id, $cb) = @_;
2554 3024
2555 $self->{refresh_hook}{$id} = $cb; 3025 $self->{refresh_hook}{$id} = $cb;
2556} 3026}
2557 3027
3028sub on_post_alloc {
3029 my ($self, $id, $cb) = @_;
3030
3031 $self->{post_alloc_hook}{$id} = $cb;
3032}
3033
2558sub draw { 3034sub draw {
2559 my ($self) = @_; 3035 my ($self) = @_;
2560 3036
2561 while (my $rcb = delete $self->{refresh_hook}) { 3037 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3038 $_->()
3039 for values %{delete $self->{refresh_hook}};
3040 }
3041
3042 if ($self->{check_size}) {
3043 my @queue = ([], []);
3044
3045 for (;;) {
3046 if ($self->{check_size}) {
3047 # heuristic: check containers last
3048 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3049 for values %{delete $self->{check_size}}
3050 }
3051
3052 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3053
3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3055 ? @$widget{qw(user_w user_h)}
3056 : $widget->size_request;
3057
3058 if (delete $widget->{force_alloc}
3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061
3062 $widget->{req_w} = $w;
3063 $widget->{req_h} = $h;
3064
3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3066
3067 $widget->{parent}->check_size
3068 if $widget->{parent};
3069 }
3070 }
3071 }
3072
3073 while ($self->{size_alloc}) {
3074 for (values %{delete $self->{size_alloc}}) {
3075 my ($widget, $w, $h) = @$_;
3076
3077 $w = 0 if $w < 0;
3078 $h = 0 if $h < 0;
3079
3080 $widget->{w} = $w;
3081 $widget->{h} = $h;
3082 $widget->size_allocate ($w, $h);
3083 $widget->emit (size_allocate => $w, $h);
3084 }
3085 }
3086
3087 while ($self->{post_alloc_hook}) {
3088 $_->()
3089 for values %{delete $self->{post_alloc_hook}};
2563 } 3090 }
2564 3091
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3092 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3094 glClear GL_COLOR_BUFFER_BIT;
2568 3095
2569 glMatrixMode GL_PROJECTION; 3096 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3097 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3099 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3100 glLoadIdentity;
2574 3101
2575 $self->_draw; 3102 $self->_draw;
2576} 3103}
2577 3104
2578############################################################################# 3105#############################################################################
2579 3106
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2606
2607 $self->{real_items} = \@items;
2608
2609 for my $item (@items) {
2610 my $desc = $item->{nrof} < 2
2611 ? $item->{name}
2612 : "$item->{nrof} $item->{name_pl}";
2613
2614 $self->add (my $hb = new CFClient::UI::HBox);
2615
2616 $hb->add (my $f = new CFClient::UI::Face
2617 can_events => 0,
2618 face => $item->{face},
2619 anim => $item->{anim},
2620 animspeed => $item->{animspeed},
2621 expand => 1,
2622 );
2623 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2624 }
2625
2626 $self->{max_pos} = (scalar @items) - 1;
2627
2628 my $range = $self->{range};
2629 my $page = $self->{h} / 32; # what information source to use for face size?
2630 # it should be configurable I guess...
2631 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2632 $range->update;
2633}
2634
2635sub size_request {
2636 my ($self) = @_;
2637 (100, 200)
2638}
2639
2640sub set_range {
2641 my ($self, $range) = @_;
2642
2643 $self->{range} = $range;
2644 $range->connect (changed => sub { $self->update });
2645
2646 my $page = $self->{h} / 32; # waht information souce to use for face size?
2647 # it should be configurable i guess...
2648
2649 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2650 $range->update;
2651
2652 $self->update;
2653}
2654
2655sub _draw {
2656 my ($self) = @_;
2657
2658 my ($w, $h) = ($self->{w}, $self->{h});
2659
2660 $self->{pos} = int $self->{range}{range}[0];
2661
2662 my $y = 0;
2663 my $cnt = 0;
2664 my $hrem = $self->{h}; # horiz. remaining space
2665
2666 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2667 my $chld = $self->{children}->[$i];
2668
2669 if ($hrem >= $chld->{h}) {
2670 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2671
2672 $chld->draw;
2673
2674 $hrem -= $chld->{h};
2675 $y += $chld->{h};
2676 } else {
2677 last
2678 }
2679 }
2680}
2681
2682
2683#############################################################################
2684
2685package CFClient::UI; 3107package CFClient::UI;
2686 3108
2687$ROOT = new CFClient::UI::Root; 3109$ROOT = new CFClient::UI::Root;
2688$TOOLTIP = new CFClient::UI::Tooltip; 3110$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2689 3111
26901 31121
2691 3113

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines