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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.209 by root, Wed May 17 00:26:55 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
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
127 } 158 }
128} 159}
129 160
130############################################################################# 161#############################################################################
131 162
… …
150 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
152 } 183 }
153 } 184 }
154 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
155 $self 188 $self
156} 189}
157 190
158sub destroy { 191sub destroy {
159 my ($self) = @_; 192 my ($self) = @_;
… …
224 $self->{y} = $y; 257 $self->{y} = $y;
225 $self->update; 258 $self->update;
226 } 259 }
227 260
228 if ($self->{w} != $w || $self->{h} != $h) { 261 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 263 }
235} 264}
236 265
237sub size_allocate { 266sub size_allocate {
238 # nothing to be done 267 # nothing to be done
239} 268}
240 269
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children {
278}
279
241sub set_max_size { 280sub set_max_size {
242 my ($self, $w, $h) = @_; 281 my ($self, $w, $h) = @_;
243 282
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 284 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 285}
247 286
248# return top left coordinates 287sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 288 my ($self, $tooltip) = @_;
251 289
252 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 290 $self->{tooltip} = $tooltip;
291
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip;
295 }
253} 296}
254 297
255# translate global coordinates to local coordinate system 298# translate global coordinates to local coordinate system
256sub coord2local { 299sub coord2local {
257 my ($self, $x, $y) = @_; 300 my ($self, $x, $y) = @_;
258 301
259 my ($X, $Y) = $self->_topleft; 302 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 303}
262 304
263# translate local coordinates to global coordinate system 305# translate local coordinates to global coordinate system
264sub coord2global { 306sub coord2global {
265 my ($self, $x, $y) = @_; 307 my ($self, $x, $y) = @_;
266 308
267 my ($X, $Y) = $self->_topleft; 309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 310}
270 311
271sub focus_in { 312sub focus_in {
272 my ($self) = @_; 313 my ($self) = @_;
273 314
… …
345 glVertex $self->{w}, 0; 386 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h}; 387 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h}; 388 glVertex 0 , $self->{h};
348 glEnd; 389 glEnd;
349 glPopMatrix; 390 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 392 }
352} 393}
353 394
354sub _draw { 395sub _draw {
355 my ($self) = @_; 396 my ($self) = @_;
… …
371 412
372sub set_parent { 413sub set_parent {
373 my ($self, $parent) = @_; 414 my ($self, $parent) = @_;
374 415
375 Scalar::Util::weaken ($self->{parent} = $parent); 416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
376} 421}
377 422
378sub check_size { 423sub check_size {
379 my ($self) = @_; 424 my ($self, $forced) = @_;
380 425
381 $self->{parent} 426 $self->{force_alloc} = 1 if $forced;
382 or return 1; 427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402} 428}
403 429
404sub update { 430sub update {
405 my ($self) = @_; 431 my ($self) = @_;
406 432
… …
421} 447}
422 448
423sub DESTROY { 449sub DESTROY {
424 my ($self) = @_; 450 my ($self) = @_;
425 451
452 delete $WIDGET{$self+0};
426 #$self->deactivate; 453 #$self->deactivate;
427} 454}
428 455
429############################################################################# 456#############################################################################
430 457
… …
439 my $class = shift; 466 my $class = shift;
440 467
441 # range [value, low, high, page] 468 # range [value, low, high, page]
442 469
443 $class->SUPER::new ( 470 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 471 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 472 #active_bg => [1, 1, 1, 0.5],
446 @_ 473 @_
447 ) 474 )
448} 475}
449 476
450sub _draw { 477sub _draw {
451 my ($self) = @_; 478 my ($self) = @_;
452 479
480 my $color = $FOCUS == $self && $self->{active_bg}
481 ? $self->{active_bg}
482 : $self->{bg};
483
484 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 485 my ($w, $h) = @$self{qw(w h)};
454 486
455 glEnable GL_BLEND; 487 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 489 glColor @$color;
458 490
459 glBegin GL_QUADS; 491 glBegin GL_QUADS;
460 glVertex 0 , 0; 492 glVertex 0 , 0;
461 glVertex 0 , $h; 493 glVertex 0 , $h;
462 glVertex $w, $h; 494 glVertex $w, $h;
463 glVertex $w, 0; 495 glVertex $w, 0;
464 glEnd; 496 glEnd;
465 497
466 glDisable GL_BLEND; 498 glDisable GL_BLEND;
499 }
467} 500}
468 501
469############################################################################# 502#############################################################################
470 503
471package CFClient::UI::Empty; 504package CFClient::UI::Empty;
… …
503 536
504 $self 537 $self
505} 538}
506 539
507sub add { 540sub add {
508 my ($self, $child) = @_; 541 my ($self, @widgets) = @_;
509 542
510 $child->set_parent ($self); 543 $_->set_parent ($self)
544 for @widgets;
511 545
512 use sort 'stable'; 546 use sort 'stable';
513 547
514 $self->{children} = [ 548 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 550 @{$self->{children}}, @widgets
517 ]; 551 ];
518 552
519 $child->check_size; 553 $self->check_size (1);
554 $self->update;
555}
556
557sub children {
558 @{ $_[0]{children} }
520} 559}
521 560
522sub remove { 561sub remove {
523 my ($self, $child) = @_; 562 my ($self, $child) = @_;
524 563
… …
539 578
540 for (@$children) { 579 for (@$children) {
541 delete $_->{parent}; 580 delete $_->{parent};
542 $_->hide; 581 $_->hide;
543 } 582 }
583
584 $self->check_size;
585 $self->update;
544} 586}
545 587
546sub find_widget { 588sub find_widget {
547 my ($self, $x, $y) = @_; 589 my ($self, $x, $y) = @_;
548 590
… …
623} 665}
624 666
625sub update { 667sub update {
626 my ($self) = @_; 668 my ($self) = @_;
627 669
628 # we want to do this delayed... 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 671 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 672}
642 673
643sub size_allocate { 674sub size_allocate {
644 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
645 676
646 $self->child->configure (0, 0, $w, $h); 677 $self->SUPER::size_allocate ($w, $h);
678 $self->update;
679}
647 680
681sub _render {
682 $_[0]{children}[0]->draw;
683}
684
685sub render_child {
686 my ($self) = @_;
687
688 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT;
691
648 $self->render_chld; 692 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 };
649} 701}
650 702
651sub _draw { 703sub _draw {
652 my ($self) = @_; 704 my ($self) = @_;
653 705
654 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
655 707
656 my $tex = $self->{texture} 708 my $tex = $self->{texture}
657 or return; 709 or return;
658 710
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713 glColor 0, 0, 0, 1;
663 714
664 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 716
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
668} 718}
669 719
670############################################################################# 720#############################################################################
671 721
672package CFClient::UI::ViewPort; 722package CFClient::UI::ViewPort;
673 723
674our @ISA = CFClient::UI::Window::; 724our @ISA = CFClient::UI::Window::;
675 725
676sub new { die }
677
678sub size_request { 726sub size_request {
679 my ($self) = @_; 727 my ($self) = @_;
680 728
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
683 731
684 @$self{qw(child_w child_h)} 732 @$self{qw(child_w child_h)}
685} 733}
686 734
687sub _draw { 735sub size_allocate {
688 my ($self) = @_; 736 my ($self, $w, $h) = @_;
689 737
690 $self->{children}[1]->draw; 738 $self->update;
691} 739}
692 740
741sub set_offset {
742 my ($self, $x, $y) = @_;
693 743
694############################################################################# 744 $self->{view_x} = int $x;
745 $self->{view_y} = int $y;
695 746
747 $self->update;
748}
749
750# hmm, this does not work for topleft of $self... but we should not ask for that
751sub coord2local {
752 my ($self, $x, $y) = @_;
753
754 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
755}
756
757sub coord2global {
758 my ($self, $x, $y) = @_;
759
760 $x = List::Util::min $self->{w}, $x - $self->{view_x};
761 $y = List::Util::min $self->{h}, $y - $self->{view_y};
762
763 $self->SUPER::coord2global ($x, $y)
764}
765
766sub find_widget {
767 my ($self, $x, $y) = @_;
768
769 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
770 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
771 ) {
772 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
773 } else {
774 $self->CFClient::UI::Base::find_widget ($x, $y)
775 }
776}
777
778sub _render {
779 my ($self) = @_;
780
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782
783 $self->SUPER::_render;
784}
785
786#############################################################################
787
696package CFClient::UI::Frame; 788package CFClient::UI::ScrolledWindow;
697 789
698our @ISA = CFClient::UI::Bin::; 790our @ISA = CFClient::UI::HBox::;
699
700use CFClient::OpenGL;
701 791
702sub new { 792sub new {
703 my $class = shift; 793 my $class = shift;
704 794
795 my $self;
796
797 my $slider = new CFClient::UI::Slider
798 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
802 },
803 ;
804
705 my $self = $class->SUPER::new ( 805 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 806 vp => (new CFClient::UI::ViewPort),
707 border_bg => [1, 1, 1, 1], 807 slider => $slider,
708 border => 0.8,
709 @_ 808 @_,
710 ); 809 );
711 810
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider});
814
712 $self 815 $self
713} 816}
714 817
818#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll
820
821#############################################################################
822
823package CFClient::UI::Frame;
824
825our @ISA = CFClient::UI::Bin::;
826
827use CFClient::OpenGL;
828
829sub new {
830 my $class = shift;
831
832 $class->SUPER::new (
833 bg => undef,
834 @_,
835 )
836}
837
715sub _draw { 838sub _draw {
716 my ($self) = @_; 839 my ($self) = @_;
717 840
718 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
719 843
720 glEnable GL_BLEND; 844 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724 847
725# glBegin GL_QUADS; 848 glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0; 849 glVertex 0 , 0;
728# glVertex 0 , $h; 850 glVertex 0 , $h;
729# glVertex $w, $h; 851 glVertex $w, $h;
730# glVertex $w, 0; 852 glVertex $w, 0;
731# glEnd; 853 glEnd;
732 854
733
734 $self->child->draw;
735 glDisable GL_BLEND; 855 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
737} 859}
738 860
739############################################################################# 861#############################################################################
740 862
741package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
754 # TODO: user_x, user_y, overwrite moveto? 876 # TODO: user_x, user_y, overwrite moveto?
755 877
756 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
759 border => 0.8, 881 border => 0.6,
882 toplevel => 1,
760 can_events => 1, 883 can_events => 1,
761 @_ 884 @_
762 ); 885 );
763 886
764 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 888 align => 0,
766 valign => 1, 889 valign => 1,
767 text => $self->{title}, 890 text => $self->{title},
768 fontsize => 1; 891 fontsize => $self->{border};
769 892
770 $self 893 $self
771} 894}
772 895
773sub border { 896sub border {
… …
789 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
790 913
791 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
793 916
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
795 if $self->{title}; 918 if $self->{title};
796 919
797 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
798} 921}
799 922
800sub button_down { 923sub button_down {
801 my ($self, $ev, $x, $y) = @_; 924 my ($self, $ev, $x, $y) = @_;
802 925
926 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 927 my $border = $self->border;
804 928
805 if ($x < $self->{w} && $x >= $self->{w} - $border 929 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 930 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 931
932 if ($lr & $td) {
933 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 934 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 935 my ($bw, $bh) = ($self->{w}, $self->{h});
810 936
937 my $mx = $x < $border;
938 my $my = $y < $border;
939
811 $self->{motion} = sub { 940 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
813 942
814 ($x, $y) = ($ev->{x}, $ev->{y}); 943 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy;
815 945
816 $self->{user_w} = $bw + $x - $ox; 946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 949 $self->check_size;
819 }; 950 };
820 951
821 } elsif ($x >= 0 && $x < $self->{w} 952 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 953 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 954 my ($bx, $by) = ($self->{x}, $self->{y});
826 955
827 $self->{motion} = sub { 956 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 957 my ($ev, $x, $y) = @_;
… …
851 my ($self) = @_; 980 my ($self) = @_;
852 981
853 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855 984
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 987
861 my $border = $self->border; 988 my $border = $self->border;
862 989
863 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868 995
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 997 my $bg = $tex[0];
870 998
871 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 1000 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 1001 my $rep_y = $ch / $bg->{h};
874 1002
875 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
876 1004
877 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
881 1010
882 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1012
885 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1014
886 $self->child->draw; 1015 $self->child->draw;
887} 1016}
888 1017
889############################################################################# 1018#############################################################################
890 1019
… …
912 $self->{children}[$y][$x] = $child; 1041 $self->{children}[$y][$x] = $child;
913 1042
914 $child->check_size; 1043 $child->check_size;
915} 1044}
916 1045
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
917# TODO: move to container class maybe? send childs a signal on removal? 1050# TODO: move to container class maybe? send childs a signal on removal?
918sub clear { 1051sub clear {
919 my ($self) = @_; 1052 my ($self) = @_;
920 1053
921 my $children = delete $self->{children}; 1054 my @children = $self->children;
1055 delete $self->{children};
922 1056
923 for (grep $_, map @$_, grep $_, @$children) { 1057 for (@children) {
924 delete $_->{parent}; 1058 delete $_->{parent};
925 $_->hide; 1059 $_->hide;
926 } 1060 }
927 1061
928 $self->update; 1062 $self->update;
… …
1109} 1243}
1110 1244
1111sub size_allocate { 1245sub size_allocate {
1112 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1113 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1114 my $children = $self->{children}; 1250 my $children = $self->{children};
1115 1251
1116 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1117 1253
1118 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1147 1283
1148############################################################################# 1284#############################################################################
1149 1285
1150package CFClient::UI::Label; 1286package CFClient::UI::Label;
1151 1287
1152our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1153 1289
1154use CFClient::OpenGL; 1290use CFClient::OpenGL;
1155 1291
1156sub new { 1292sub new {
1157 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1158 1294
1159 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1161 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1162 fontsize => 1, 1303 fontsize => 1,
1163 text => "",
1164 align => -1, 1304 align => -1,
1165 valign => -1, 1305 valign => -1,
1166 padding => 2, 1306 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1307 can_events => 0,
1169 %arg 1308 %arg
1170 ); 1309 );
1171 1310
1172 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1314 $self->{template} = $layout;
1176 } 1315 }
1177 1316
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1318 $self->set_markup (delete $self->{markup});
1319 } else {
1320 $self->set_text (delete $self->{text});
1321 }
1180 1322
1181 $self 1323 $self
1182} 1324}
1183 1325
1184sub escape { 1326sub escape($) {
1185 local $_ = $_[1]; 1327 local $_ = $_[0];
1186 1328
1187 s/&/&amp;/g; 1329 s/&/&amp;/g;
1188 s/>/&gt;/g; 1330 s/>/&gt;/g;
1189 s/</&lt;/g; 1331 s/</&lt;/g;
1190 1332
1191 $_[1] 1333 $_
1334}
1335
1336sub update {
1337 my ($self) = @_;
1338
1339 delete $self->{texture};
1340 $self->SUPER::update;
1192} 1341}
1193 1342
1194sub set_text { 1343sub set_text {
1195 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1196 1345
1346 return if $self->{text} eq "T$text";
1347 $self->{text} = "T$text";
1348
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1197 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1198 1351
1199 delete $self->{texture}; 1352 $self->update;
1200 $self->check_size; 1353 $self->check_size;
1201 $self->update;
1202} 1354}
1203 1355
1204sub set_markup { 1356sub set_markup {
1205 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1206 1358
1359 return if $self->{text} eq "M$markup";
1360 $self->{text} = "M$markup";
1361
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363
1364 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1207 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1208 1366
1209 delete $self->{texture}; 1367 $self->update;
1210 $self->check_size; 1368 $self->check_size;
1211 $self->update;
1212} 1369}
1213 1370
1214sub size_request { 1371sub size_request {
1215 my ($self) = @_; 1372 my ($self) = @_;
1216 1373
… …
1245sub set_fontsize { 1402sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1247 1404
1248 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1250 $self->check_size; 1409 $self->check_size;
1251 $self->update;
1252} 1410}
1253 1411
1254sub _draw { 1412sub _draw {
1255 my ($self) = @_; 1413 my ($self) = @_;
1256 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1257 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1422
1261 new_from_layout CFClient::Texture $self->{layout} 1423 my $tex = new_from_layout CFClient::Texture $self->{layout};
1424
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1427 : ($self->{w} - $tex->{w}) * 0.5);
1428
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1431 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1262 }; 1434 };
1263 1435
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1438
1439 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy}); 1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1442 } else {
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1444 }
1284 1445
1285 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1447}
1288 1448
1289############################################################################# 1449#############################################################################
1290 1450
1291package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1326 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1327 1487
1328 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1329} 1489}
1330 1490
1331sub get_text {
1332 $_[0]{text}
1333}
1334
1335sub size_request {
1336 my ($self) = @_;
1337
1338 my ($w, $h) = $self->SUPER::size_request;
1339
1340 ($w + 1, $h) # add 1 for cursor
1341}
1342
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text { 1491sub set_text {
1350 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1351 1493
1352 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1353 $self->_set_text ($text); 1495 $self->_set_text ($text);
1354 $self->update; 1496 $self->update;
1497 $self->check_size;
1498}
1499
1500sub get_text {
1501 $_[0]{text}
1502}
1503
1504sub size_request {
1505 my ($self) = @_;
1506
1507 my ($w, $h) = $self->SUPER::size_request;
1508
1509 ($w + 1, $h) # add 1 for cursor
1510}
1511
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1355} 1516}
1356 1517
1357sub key_down { 1518sub key_down {
1358 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1359 1520
… …
1361 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1363 1524
1364 my $text = $self->get_text; 1525 my $text = $self->get_text;
1365 1526
1366 if ($sym == 8) { 1527 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1540 $self->emit ('escape');
1380 } elsif ($uni) { 1541 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1382 } 1543 }
1383 1544
1384 $self->_set_text ($text); 1545 $self->_set_text ($text);
1385 $self->update; 1546 $self->update;
1547 $self->check_size;
1386} 1548}
1387 1549
1388sub focus_in { 1550sub focus_in {
1389 my ($self) = @_; 1551 my ($self) = @_;
1390 1552
… …
1469 1631
1470 if ($sym == 13) { 1632 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1633 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1634 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1635 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1637 $self->emit (activate => $txt);
1475 $self->update; 1638 $self->update;
1476 1639
1477 } elsif ($sym == CFClient::SDLK_UP) { 1640 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1641 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1642 $self->{history_saveback} = $self->get_text;
1480 } 1643 }
1644 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1645 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1646 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1647 $self->{history_pointer} = @{$self->{history} || []} - 1;
1648 }
1649 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1650 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1651
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1652 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1653 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1654 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1655
… …
1516 my $class = shift; 1681 my $class = shift;
1517 1682
1518 $class->SUPER::new ( 1683 $class->SUPER::new (
1519 padding => 4, 1684 padding => 4,
1520 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1521 bg => [1, 1, 1, 0.2],
1522 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1523 can_hover => 1, 1687 can_hover => 1,
1524 align => 0, 1688 align => 0,
1525 valign => 0, 1689 valign => 0,
1526 can_events => 1, 1690 can_events => 1,
… …
1544 1708
1545 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1546 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1547 } 1711 }
1548 1712
1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1554 1716
1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556 1718
1557 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1558 glDisable GL_BLEND;
1559 1720
1560 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1561} 1722}
1562 1723
1563############################################################################# 1724#############################################################################
… …
1577 1738
1578 $class->SUPER::new ( 1739 $class->SUPER::new (
1579 padding => 2, 1740 padding => 2,
1580 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1581 active_fg => [1, 1, 0], 1742 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5],
1582 state => 0, 1745 state => 0,
1583 can_hover => 1, 1746 can_hover => 1,
1584 @_ 1747 @_
1585 ) 1748 )
1586} 1749}
… …
1610 1773
1611 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1774 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1612 1775
1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614 1777
1615 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1616 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619 my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625} 1783}
1626 1784
1627############################################################################# 1785#############################################################################
1628 1786
1629package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1672 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1673 1831
1674 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1675 } 1833 }
1676 1834
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 1837
1682 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1683 1839
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1686} 1841}
1687 1842
1688############################################################################# 1843#############################################################################
1689 1844
… …
1737} 1892}
1738 1893
1739sub set_max { 1894sub set_max {
1740 my ($self, $max) = @_; 1895 my ($self, $max) = @_;
1741 1896
1897 return if $self->{max_val} == $max;
1898
1742 $self->{max_val} = $max; 1899 $self->{max_val} = $max;
1900 $self->update;
1743} 1901}
1744 1902
1745sub set_value { 1903sub set_value {
1746 my ($self, $val, $max) = @_; 1904 my ($self, $val, $max) = @_;
1747 1905
1748 $self->set_max ($max) 1906 $self->set_max ($max)
1749 if defined $max; 1907 if defined $max;
1750 1908
1751 $max = $self->{max_val}; 1909 return if $self->{val} == $val;
1910
1752 $self->{val} = $val; 1911 $self->{val} = $val;
1753
1754 $self->update; 1912 $self->update;
1755} 1913}
1756 1914
1757sub _draw { 1915sub _draw {
1758 my ($self) = @_; 1916 my ($self) = @_;
… …
1821 1979
1822sub new { 1980sub new {
1823 my ($class, %arg) = @_; 1981 my ($class, %arg) = @_;
1824 1982
1825 my $self = $class->SUPER::new ( 1983 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 1984 tooltip => $arg{type},
1827 can_hover => 1, 1985 can_hover => 1,
1986 can_events => 1,
1828 %arg, 1987 %arg,
1829 ); 1988 );
1830 1989
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1990 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1991 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1840 1999
1841 $self->{value}->set_fontsize ($fsize); 2000 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 2001 $self->{max} ->set_fontsize ($fsize);
1843} 2002}
1844 2003
2004sub set_max {
2005 my ($self, $max) = @_;
2006
2007 $self->{gauge}->set_max ($max);
2008 $self->{max}->set_text ($max);
2009}
2010
1845sub set_value { 2011sub set_value {
1846 my ($self, $val, $max) = @_; 2012 my ($self, $val, $max) = @_;
1847 2013
1848 $self->set_max ($max) 2014 $self->set_max ($max)
1849 if defined $max; 2015 if defined $max;
1850 2016
1851 $self->{gauge}->set_value ($val, $max); 2017 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 2018 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 2019}
1861 2020
1862############################################################################# 2021#############################################################################
1863 2022
1864package CFClient::UI::Slider; 2023package CFClient::UI::Slider;
… …
1874 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
1875 2034
1876sub new { 2035sub new {
1877 my $class = shift; 2036 my $class = shift;
1878 2037
1879 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
1880 2039
1881 # TODO: 0-width page 2040 # TODO: 0-width page
1882 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
1883 # TODO: calculations are off 2042 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
1886 active_fg => [0, 0, 0], 2045 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5],
1887 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
1888 req_w => 20, 2049 req_w => $::WIDTH / 80,
1889 req_h => 20, 2050 req_h => $::WIDTH / 80,
1890 vertical => 0, 2051 vertical => 0,
1891 can_hover => 1, 2052 can_hover => 1,
1892 inner_pad => 5, 2053 inner_pad => .05,
1893 @_ 2054 @_
1894 ); 2055 );
1895 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
1896 $self 2060 $self
2061}
2062
2063sub set_value {
2064 my ($self, $value) = @_;
2065
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067
2068 $hi = $lo + 1 if $hi <= $lo;
2069
2070 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi;
2072
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079
2080 if ($value != $old_value) {
2081 $self->emit (changed => $value);
2082 $self->update;
2083 }
1897} 2084}
1898 2085
1899sub size_request { 2086sub size_request {
1900 my ($self) = @_; 2087 my ($self) = @_;
1901 2088
… …
1914 2101
1915sub mouse_motion { 2102sub mouse_motion {
1916 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
1917 2104
1918 if ($GRAB == $self) { 2105 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107
2108 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2111
2112 $self->set_value ($x * ($hi - $lo) + $lo);
2113 }
2114}
2115
2116sub update {
2117 my ($self) = @_;
2118
2119 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120 $self->set_value ($self->{range}[0]);
2121
1919 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
1920 2123
1921 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
1922 2125
1923 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1924 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1925 2127
1926 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1927 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
1928 $x = $lo if $x < $lo;
1929 $x = $hi - $page if $x > $hi - $page;
1930 $self->{range}[0] = $x;
1931 2130
1932 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
1933 $self->update; 2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value;
2137 $self->{knob_w} = $page;
1934 } 2138 });
1935}
1936 2139
1937# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
1938# so that the handle doesn't leave the texture. This calculation isn't 100%
1939# correct propably, but it does the job for now
1940sub _calc_inner_pad_px {
1941 my ($self, $w) = @_;
1942 ($w / 100) * $self->{inner_pad} # % to pixels
1943} 2141}
1944 2142
1945sub _draw { 2143sub _draw {
1946 my ($self) = @_; 2144 my ($self) = @_;
1947 2145
1948 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
1949 2147
1950 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
1951 2149
1952 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
1953 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
1954 2152
1955 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
1956 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
1957
1958 ($w, $h) = ($h, $w);
1959 } 2155 }
1960 2156
1961 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963 2159
1964 my ($value, $lo, $hi, $page) = @{$self->{range}};
1965
1966 $hi = $value + 1 if $lo == $hi;
1967
1968 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1971 $page = int $page * $inner_w / ($hi - $lo);
1972 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1973
1974 $w -= $page;
1975 $page &= ~1;
1976 glTranslate $page * 0.5, 0, 0;
1977 $page ||= 2;
1978
1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981
1982 glEnable GL_BLEND;
1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2162
1987 # draw background 2163 # draw background
1988 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989 2165
1990 # draw handle 2166 # draw handle
1991 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2167 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1992 2168
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
1995} 2170}
1996 2171
1997############################################################################# 2172#############################################################################
1998 2173
… …
2009 fontsize => 1, 2184 fontsize => 1,
2010 can_events => 0, 2185 can_events => 0,
2011 #font => default_font 2186 #font => default_font
2012 @_, 2187 @_,
2013 2188
2014 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
2015 par => [], 2190 par => [],
2016 height => 0, 2191 height => 0,
2017 children => [ 2192 children => [
2018 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
2020 ], 2195 ],
2021 ); 2196 );
2022 2197
2023 $self->{children}[1]->connect (changed => sub { 2198 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2199
2027 $self 2200 $self
2028} 2201}
2029 2202
2030sub set_fontsize { 2203sub set_fontsize {
… …
2038 my ($self, $text) = @_; 2211 my ($self, $text) = @_;
2039 2212
2040 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2041 2214
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2044 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2045 2218
2046 ($layout->size)[1] 2219 ($layout->size)[1]
2047} 2220}
2048 2221
2049sub reflow { 2222sub reflow {
… …
2087 2260
2088 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2089 2262
2090 delete $self->{texture}; 2263 delete $self->{texture};
2091 2264
2092 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2093 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2094 my $height = 0; 2267 my $height = 0;
2095 2268
2096 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2097 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2102 2275
2103 delete $self->{texture}; 2276 delete $self->{texture};
2104 } 2277 }
2105 2278
2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2279 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2107 glClearColor 0, 0, 0, 1; 2280 glClearColor 0, 0, 0, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2109 2282
2110 glEnable GL_BLEND;
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114 2285
2115 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2116 2287
… …
2125 2296
2126 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2127 my $h = $par->[0]; 2298 my $h = $par->[0];
2128 2299
2129 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2130 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2131 2303
2132 glColor @{ $par->[1] };
2133 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2134 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2135 } 2306 }
2136 2307
2137 $y += $h; 2308 $y += $h;
2138 } 2309 }
2139 2310
2140 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND;
2142 }; 2312 };
2143 }); 2313 });
2144} 2314}
2145 2315
2146sub _draw { 2316sub _draw {
2147 my ($self) = @_; 2317 my ($self) = @_;
2148 2318
2149 if ($self->{texture}) {
2150 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2321 glColor 1, 1, 1, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2153 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2154 }
2155 2324
2156 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2157 2326
2158} 2327}
2159 2328
… …
2253 @_, 2422 @_,
2254 can_events => 0, 2423 can_events => 0,
2255 ) 2424 )
2256} 2425}
2257 2426
2258sub set_markup { 2427sub set_tooltip_from {
2259 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2260 2429
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2262 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2263 $self->add ($self->{label}); 2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8,
2434 fg => [0, 0, 0, 1],
2435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 );
2264} 2437}
2265 2438
2266sub size_request { 2439sub size_request {
2267 my ($self) = @_; 2440 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270 2441
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272 2443
2273 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2274} 2445}
… …
2280} 2451}
2281 2452
2282sub _draw { 2453sub _draw {
2283 my ($self) = @_; 2454 my ($self) = @_;
2284 2455
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2287 2457
2288 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2289 2459
2290 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2301 glVertex 0 , $h; 2471 glVertex 0 , $h;
2302 glVertex $w, $h; 2472 glVertex $w, $h;
2303 glVertex $w, 0; 2473 glVertex $w, 0;
2304 glEnd; 2474 glEnd;
2305 2475
2306 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2307
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2310} 2478}
2311 2479
2312############################################################################# 2480#############################################################################
2313 2481
… …
2328 2496
2329sub size_request { 2497sub size_request {
2330 (32, 8) 2498 (32, 8)
2331} 2499}
2332 2500
2333sub draw { 2501sub _draw {
2334 my ($self) = @_; 2502 my ($self) = @_;
2335 2503
2504 return unless $::CONN;#d# manage and cache textures differently
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337 2506
2507 # TODO animation
2338 if ($tex) { 2508 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 } 2514 }
2515}
2516
2517#############################################################################
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub new {
2524 my $class = shift;
2525
2526 my %args = @_;
2527
2528 my $item = delete $args{item};
2529
2530 my $desc = $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 my $self = $class->SUPER::new (
2550 can_hover => 1,
2551 can_events => 1,
2552 tooltip => ((CFClient::UI::Label::escape $desc)
2553 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554 connect_button_down => sub {
2555 my ($self, $ev, $x, $y) = @_;
2556
2557 # todo: maybe put examine on 1? but should just be a tooltip :(
2558 if ($ev->{button} == 1) {
2559 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2560 } elsif ($ev->{button} == 2) {
2561 $::CONN->send ("apply $item->{tag}");
2562 } elsif ($ev->{button} == 3) {
2563 my @menu_items = (
2564 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2566 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2567 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568 [
2569 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571 ],
2572 );
2573
2574 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575 }
2576
2577 1
2578 },
2579 %args
2580 );
2581
2582 $self->add (new CFClient::UI::Face
2583 can_events => 0,
2584 face => $item->{face},
2585 anim => $item->{anim},
2586 animspeed => $item->{animspeed},
2587 );
2588
2589 $self->add (new CFClient::UI::Label
2590 can_events => 0,
2591 text => $desc,
2592 );
2593
2594 $self
2595}
2596
2597#############################################################################
2598
2599package CFClient::UI::Inventory;
2600
2601our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603sub new {
2604 my $class = shift;
2605
2606 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox),
2608 @_,
2609 );
2610
2611 $self
2612}
2613
2614sub set_items {
2615 my ($self, $items) = @_;
2616
2617 $self->{scrolled}->clear;
2618 return unless $items;
2619
2620 my @items = sort {
2621 ($a->{type} <=> $b->{type})
2622 or ($a->{name} cmp $b->{name})
2623 } @$items;
2624
2625 $self->{real_items} = \@items;
2626
2627 for my $item (@items) {
2628 my $desc = $item->{nrof} < 2
2629 ? $item->{name}
2630 : "$item->{nrof} $item->{name_pl}";
2631
2632 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2633 }
2634
2635 $self->{scrolled}->add (@items);
2636
2637# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638}
2639
2640sub size_request {
2641 my ($self) = @_;
2642 ($self->{req_w}, $self->{req_h});
2643}
2644
2645#############################################################################
2646
2647package CFClient::UI::Menu;
2648
2649our @ISA = CFClient::UI::FancyFrame::;
2650
2651use CFClient::OpenGL;
2652
2653sub new {
2654 my $class = shift;
2655
2656 my $self = $class->SUPER::new (
2657 items => [],
2658 z => 100,
2659 @_,
2660 );
2661
2662 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2663
2664 for my $item (@{ $self->{items} }) {
2665 my ($widget, $cb) = @$item;
2666
2667 # handle various types of items, only text for now
2668 if (!ref $widget) {
2669 $widget = new CFClient::UI::Label
2670 can_hover => 1,
2671 can_events => 1,
2672 text => $widget;
2673 }
2674
2675 $self->{item}{$widget} = $item;
2676
2677 $self->{vbox}->add ($widget);
2678 }
2679
2680 $self
2681}
2682
2683# popup given the event (must be a mouse button down event currently)
2684sub popup {
2685 my ($self, $ev) = @_;
2686
2687 $self->emit ("popdown");
2688
2689 # maybe save $GRAB? must be careful about events...
2690 $GRAB = $self;
2691 $self->{button} = $ev->{button};
2692
2693 $self->show;
2694 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2695}
2696
2697sub mouse_motion {
2698 my ($self, $ev, $x, $y) = @_;
2699
2700 # TODO: should use vbox->find_widget or so
2701 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2702 $self->{hover} = $self->{item}{$HOVER};
2703}
2704
2705sub button_up {
2706 my ($self, $ev, $x, $y) = @_;
2707
2708 if ($ev->{button} == $self->{button}) {
2709 undef $GRAB;
2710 $self->hide;
2711
2712 $self->emit ("popdown");
2713 $self->{hover}[1]->() if $self->{hover};
2714 }
2715}
2716
2717#############################################################################
2718
2719package CFClient::UI::Statusbox;
2720
2721our @ISA = CFClient::UI::VBox::;
2722
2723sub reorder {
2724 my ($self) = @_;
2725 my $NOW = time;
2726
2727 while (my ($k, $v) = each %{ $self->{item} }) {
2728 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2729 }
2730
2731 my @widgets;
2732
2733 my @items = sort {
2734 $a->{pri} <=> $b->{pri}
2735 or $b->{id} <=> $a->{id}
2736 } values %{ $self->{item} };
2737
2738 my $count = 10 + 1;
2739 for my $item (@items) {
2740 last unless --$count;
2741
2742 push @widgets, $item->{label} ||= do {
2743 # TODO: doesn't handle markup well (read as: at all)
2744 my $short = $item->{count} > 1
2745 ? "<b>$item->{count} ×</b> $item->{text}"
2746 : $item->{text};
2747
2748 for ($short) {
2749 s/^\s+//;
2750 s/\s+/ /g;
2751 my $len = int 40 / $item->{fontsize};
2752 substr $_, $len, length, "…" if $len < length;
2753 }
2754
2755 new CFClient::UI::Label
2756 markup => $short,
2757 tooltip => $item->{tooltip},
2758 tooltip_font => $::FONT_PROP,
2759 tooltip_width => 0.67,
2760 fontsize => $item->{fontsize},
2761 fg => $item->{fg},
2762 can_events => 1,
2763 can_hover => 1
2764 };
2765 }
2766
2767 $self->clear;
2768 $self->SUPER::add (reverse @widgets);
2769}
2770
2771sub add {
2772 my ($self, $text, %arg) = @_;
2773
2774 $text =~ s/^\s+//;
2775 $text =~ s/\s+$//;
2776
2777 my $timeout = time + ((delete $arg{timeout}) || 60);
2778
2779 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2780
2781 if (my $item = $self->{item}{$group}) {
2782 if ($item->{text} eq $text) {
2783 $item->{count}++;
2784 } else {
2785 $item->{count} = 1;
2786 $item->{text} = $item->{tooltip} = $text;
2787 }
2788 $item->{id} = ++$self->{id};
2789 $item->{timeout} = $timeout;
2790 delete $item->{label};
2791 } else {
2792 $self->{item}{$group} = {
2793 id => ++$self->{id},
2794 text => $text,
2795 timeout => $timeout,
2796 tooltip => $text,
2797 fontsize => 0.8,
2798 fg => [0.8, 0.8, 0.8, 0.8],
2799 pri => 0,
2800 count => 1,
2801 %arg,
2802 };
2803 }
2804
2805 $self->reorder;
2348} 2806}
2349 2807
2350############################################################################# 2808#############################################################################
2351 2809
2352package CFClient::UI::Root; 2810package CFClient::UI::Root;
2353 2811
2354our @ISA = CFClient::UI::Container::; 2812our @ISA = CFClient::UI::Container::;
2355 2813
2356use CFClient::OpenGL; 2814use CFClient::OpenGL;
2357 2815
2358sub check_size { 2816sub new {
2359 my ($self) = @_; 2817 my $class = shift;
2360 2818
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2819 $class->SUPER::new (
2362} 2820 @_,
2363 2821 )
2364sub size_request {
2365 ($::WIDTH, $::HEIGHT)
2366} 2822}
2367 2823
2368sub configure { 2824sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 2825 my ($self, $x, $y, $w, $h) = @_;
2370 2826
2371 $self->SUPER::configure ($x, $y, $w, $h); 2827 $self->{w} = $w;
2828 $self->{h} = $h;
2829}
2372 2830
2831sub check_size {
2832 my ($self) = @_;
2833
2834 $self->size_allocate ($self->{w}, $self->{h})
2835 if $self->{w};
2836}
2837
2838sub size_request {
2839 my ($self) = @_;
2840
2841 ($self->{w}, $self->{h})
2842}
2843
2844sub size_allocate {
2845 my ($self, $w, $h) = @_;
2846
2847 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2848 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2849
2850 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2851 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2852
2373 for my $child (@{$self->{children}}) { 2853 for my $child ($self->children) {
2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2854 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2375 2855
2856 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2857 if exists $child->{req_x};
2858
2859 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2860 if exists $child->{req_y};
2861
2376 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2862 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2863 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2864
2378 $child->configure ($X, $Y, $W,$H); 2865 $child->configure ($X, $Y, $W, $H);
2379 } 2866 }
2380} 2867}
2381 2868
2382sub _topleft { 2869sub coord2local {
2383 my ($self, $x, $y) = @_; 2870 my ($self, $x, $y) = @_;
2384 2871
2385 ($x, $y) 2872 ($x, $y)
2386} 2873}
2387 2874
2875sub coord2global {
2876 my ($self, $x, $y) = @_;
2877
2878 ($x, $y)
2879}
2880
2388sub update { 2881sub update {
2389 my ($self) = @_; 2882 my ($self) = @_;
2390 2883
2391 $self->check_size; 2884 $self->check_size;
2392 ::refresh (); 2885 $::WANT_REFRESH++;
2393} 2886}
2394 2887
2395sub add { 2888sub add {
2396 my ($self, $child) = @_; 2889 my ($self, @children) = @_;
2397 2890
2891 for my $child (@children) {
2892 $child->{toplevel} = 1;
2893
2398 # integerize window positions 2894 # integerise window positions
2399 $child->{x} = int $child->{x}; 2895 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y}; 2896 $child->{y} = int $child->{y};
2897 }
2401 2898
2402 $self->SUPER::add ($child); 2899 $self->SUPER::add (@children);
2403} 2900}
2404 2901
2405sub on_refresh { 2902sub on_refresh {
2406 my ($self, $id, $cb) = @_; 2903 my ($self, $id, $cb) = @_;
2407 2904
2408 $self->{refresh_hook}{$id} = $cb; 2905 $self->{refresh_hook}{$id} = $cb;
2409} 2906}
2410 2907
2908sub on_post_alloc {
2909 my ($self, $id, $cb) = @_;
2910
2911 $self->{post_alloc_hook}{$id} = $cb;
2912}
2913
2411sub draw { 2914sub draw {
2412 my ($self) = @_; 2915 my ($self) = @_;
2413 2916
2414 while (my $rcb = delete $self->{refresh_hook}) { 2917 while ($self->{refresh_hook}) {
2415 $_->() for values %$rcb; 2918 $_->()
2919 for values %{delete $self->{refresh_hook}};
2920 }
2921
2922 if ($self->{check_size}) {
2923 my @queue = ([], []);
2924
2925 for (;;) {
2926 if ($self->{check_size}) {
2927 # heuristic: check containers last
2928 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2929 for values %{delete $self->{check_size}}
2930 }
2931
2932 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2933
2934 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2935 ? @$widget{qw(user_w user_h)}
2936 : $widget->size_request;
2937
2938 if (delete $widget->{force_alloc}
2939 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2940 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2941
2942 $widget->{req_w} = $w;
2943 $widget->{req_h} = $h;
2944
2945 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2946
2947 $widget->{parent}->check_size
2948 if $widget->{parent};
2949 }
2950 }
2951 }
2952
2953 while ($self->{size_alloc}) {
2954 for (values %{delete $self->{size_alloc}}) {
2955 my ($widget, $w, $h) = @$_;
2956
2957 $w = 0 if $w < 0;
2958 $h = 0 if $h < 0;
2959
2960 $widget->{w} = $w;
2961 $widget->{h} = $h;
2962 $widget->size_allocate ($w, $h);
2963 $widget->emit (size_allocate => $w, $h);
2964 }
2965 }
2966
2967 while ($self->{post_alloc_hook}) {
2968 $_->()
2969 for values %{delete $self->{post_alloc_hook}};
2416 } 2970 }
2417 2971
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2972 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2973 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 2974 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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