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.164 by root, Mon Apr 24 06:57:39 2006 UTC vs.
Revision 1.212 by elmex, Wed May 17 14:55:14 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;
… …
492sub new { 525sub new {
493 my ($class, %arg) = @_; 526 my ($class, %arg) = @_;
494 527
495 my $children = delete $arg{children} || []; 528 my $children = delete $arg{children} || [];
496 529
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 530 my $self = $class->SUPER::new (
531 children => [],
532 can_events => 0,
533 %arg,
534 );
498 $self->add ($_) for @$children; 535 $self->add ($_) for @$children;
499 536
500 $self 537 $self
501} 538}
502 539
503sub add { 540sub add {
504 my ($self, $child) = @_; 541 my ($self, @widgets) = @_;
505 542
506 $child->set_parent ($self); 543 $_->set_parent ($self)
544 for @widgets;
507 545
508 use sort 'stable'; 546 use sort 'stable';
509 547
510 $self->{children} = [ 548 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 549 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 550 @{$self->{children}}, @widgets
513 ]; 551 ];
514 552
515 $child->check_size; 553 $self->check_size (1);
554 $self->update;
555}
556
557sub children {
558 @{ $_[0]{children} }
516} 559}
517 560
518sub remove { 561sub remove {
519 my ($self, $child) = @_; 562 my ($self, $child) = @_;
520 563
… …
535 578
536 for (@$children) { 579 for (@$children) {
537 delete $_->{parent}; 580 delete $_->{parent};
538 $_->hide; 581 $_->hide;
539 } 582 }
583
584 $self->check_size;
585 $self->update;
540} 586}
541 587
542sub find_widget { 588sub find_widget {
543 my ($self, $x, $y) = @_; 589 my ($self, $x, $y) = @_;
544 590
… …
619} 665}
620 666
621sub update { 667sub update {
622 my ($self) = @_; 668 my ($self) = @_;
623 669
624 # we want to do this delayed... 670 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 671 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 672}
638 673
639sub size_allocate { 674sub size_allocate {
640 my ($self, $w, $h) = @_; 675 my ($self, $w, $h) = @_;
641 676
642 $self->child->configure (0, 0, $w, $h); 677 $self->SUPER::size_allocate ($w, $h);
678 $self->update;
679}
643 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
644 $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 };
645} 701}
646 702
647sub _draw { 703sub _draw {
648 my ($self) = @_; 704 my ($self) = @_;
649 705
650 my ($w, $h) = ($self->w, $self->h); 706 my ($w, $h) = ($self->w, $self->h);
651 707
652 my $tex = $self->{texture} 708 my $tex = $self->{texture}
653 or return; 709 or return;
654 710
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 711 glEnable GL_TEXTURE_2D;
658 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;
659 714
660 $tex->draw_quad (0, 0, $w, $h); 715 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 716
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 717 glDisable GL_TEXTURE_2D;
664} 718}
665 719
666############################################################################# 720#############################################################################
667 721
668package CFClient::UI::ViewPort; 722package CFClient::UI::ViewPort;
669 723
670our @ISA = CFClient::UI::Window::; 724our @ISA = CFClient::UI::Window::;
671 725
672sub new { die }
673
674sub size_request { 726sub size_request {
675 my ($self) = @_; 727 my ($self) = @_;
676 728
677 @$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)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
679 731
680 @$self{qw(child_w child_h)} 732 @$self{qw(child_w child_h)}
681} 733}
682 734
683sub _draw { 735sub size_allocate {
684 my ($self) = @_; 736 my ($self, $w, $h) = @_;
685 737
686 $self->{children}[1]->draw; 738 $self->update;
687} 739}
688 740
741sub set_offset {
742 my ($self, $x, $y) = @_;
689 743
690############################################################################# 744 $self->{view_x} = int $x;
745 $self->{view_y} = int $y;
691 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
692package CFClient::UI::Frame; 788package CFClient::UI::ScrolledWindow;
693 789
694our @ISA = CFClient::UI::Bin::; 790our @ISA = CFClient::UI::HBox::;
695
696use CFClient::OpenGL;
697 791
698sub new { 792sub new {
699 my $class = shift; 793 my $class = shift;
700 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
701 my $self = $class->SUPER::new ( 805 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 806 vp => (new CFClient::UI::ViewPort),
703 border_bg => [1, 1, 1, 1], 807 slider => $slider,
704 border => 0.8,
705 @_ 808 @_,
706 ); 809 );
707 810
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider});
814
708 $self 815 $self
709} 816}
710 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
711sub _draw { 838sub _draw {
712 my ($self) = @_; 839 my ($self) = @_;
713 840
714 my ($w, $h) = ($self->{w}, $self->{h}); 841 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)};
715 843
716 glEnable GL_BLEND; 844 glEnable GL_BLEND;
717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
718 glEnable GL_TEXTURE_2D; 846 glColor @{ $self->{bg} };
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720 847
721# glBegin GL_QUADS; 848 glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0; 849 glVertex 0 , 0;
724# glVertex 0 , $h; 850 glVertex 0 , $h;
725# glVertex $w, $h; 851 glVertex $w, $h;
726# glVertex $w, 0; 852 glVertex $w, 0;
727# glEnd; 853 glEnd;
728 854
729
730 $self->child->draw;
731 glDisable GL_BLEND; 855 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D; 856 }
857
858 $self->SUPER::_draw;
733} 859}
734 860
735############################################################################# 861#############################################################################
736 862
737package CFClient::UI::FancyFrame; 863package CFClient::UI::FancyFrame;
… …
750 # TODO: user_x, user_y, overwrite moveto? 876 # TODO: user_x, user_y, overwrite moveto?
751 877
752 my $self = $class->SUPER::new ( 878 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 879 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 880 border_bg => [1, 1, 1, 1],
755 border => 0.8, 881 border => 0.6,
882 toplevel => 1,
756 can_events => 0, 883 can_events => 1,
757 @_ 884 @_
758 ); 885 );
759 886
760 $self->{title} &&= new CFClient::UI::Label 887 $self->{title} &&= new CFClient::UI::Label
761 align => 0, 888 align => 0,
762 valign => 1, 889 valign => 1,
763 text => $self->{title}, 890 text => $self->{title},
764 fontsize => 1; 891 fontsize => $self->{border};
765 892
766 $self 893 $self
767} 894}
768 895
769sub border { 896sub border {
… …
785 my ($self, $w, $h) = @_; 912 my ($self, $w, $h) = @_;
786 913
787 $h -= List::Util::max 0, $self->border * 2; 914 $h -= List::Util::max 0, $self->border * 2;
788 $w -= List::Util::max 0, $self->border * 2; 915 $w -= List::Util::max 0, $self->border * 2;
789 916
790 $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)
791 if $self->{title}; 918 if $self->{title};
792 919
793 $self->child->configure ($self->border, $self->border, $w, $h); 920 $self->child->configure ($self->border, $self->border, $w, $h);
794} 921}
795 922
796sub button_down { 923sub button_down {
797 my ($self, $ev, $x, $y) = @_; 924 my ($self, $ev, $x, $y) = @_;
798 925
926 my ($w, $h) = @$self{qw(w h)};
799 my $border = $self->border; 927 my $border = $self->border;
800 928
801 if ($x < $self->{w} && $x >= $self->{w} - $border 929 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
802 && $y < $self->{h} && $y >= $self->{h} - $border) { 930 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
803 931
932 if ($lr & $td) {
933 my ($wx, $wy) = ($self->{x}, $self->{y});
804 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 934 my ($ox, $oy) = ($ev->{x}, $ev->{y});
805 my ($bw, $bh) = ($self->{w}, $self->{h}); 935 my ($bw, $bh) = ($self->{w}, $self->{h});
806 936
937 my $mx = $x < $border;
938 my $my = $y < $border;
939
807 $self->{motion} = sub { 940 $self->{motion} = sub {
808 my ($ev, $x, $y) = @_; 941 my ($ev, $x, $y) = @_;
809 942
810 ($x, $y) = ($ev->{x}, $ev->{y}); 943 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy;
811 945
812 $self->{user_w} = $bw + $x - $ox; 946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
813 $self->{user_h} = $bh + $y - $oy; 947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
814 $self->check_size; 949 $self->check_size;
815 }; 950 };
816 951
817 } elsif ($x >= 0 && $x < $self->{w} 952 } elsif ($lr ^ $td) {
818 && $y >= 0 && $y < $border) {
819
820 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 953 my ($ox, $oy) = ($ev->{x}, $ev->{y});
821 my ($bx, $by) = ($self->{x}, $self->{y}); 954 my ($bx, $by) = ($self->{x}, $self->{y});
822 955
823 $self->{motion} = sub { 956 $self->{motion} = sub {
824 my ($ev, $x, $y) = @_; 957 my ($ev, $x, $y) = @_;
… …
847 my ($self) = @_; 980 my ($self) = @_;
848 981
849 my ($w, $h ) = ($self->{w}, $self->{h}); 982 my ($w, $h ) = ($self->{w}, $self->{h});
850 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
851 984
852 glEnable GL_BLEND;
853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
854 glEnable GL_TEXTURE_2D; 985 glEnable GL_TEXTURE_2D;
855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
856 987
857 my $border = $self->border; 988 my $border = $self->border;
858 989
859 glColor @{ $self->{border_bg} }; 990 glColor @{ $self->{border_bg} };
860 $tex[1]->draw_quad (0, 0, $w, $border); 991 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
861 $tex[3]->draw_quad (0, $border, $border, $ch); 992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
863 $tex[4]->draw_quad (0, $h - $border, $w, $border); 994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
864 995
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
865 my $bg = $tex[0]; 997 my $bg = $tex[0];
866 998
867 # TODO: repeat texture not scale 999 # TODO: repeat texture not scale
868 my $rep_x = $cw / $bg->{w}; 1000 my $rep_x = $cw / $bg->{w};
869 my $rep_y = $ch / $bg->{h}; 1001 my $rep_y = $ch / $bg->{h};
870 1002
871 glColor @{ $self->{bg} }; 1003 glColor @{ $self->{bg} };
872 1004
873 $bg->{s} = $rep_x; 1005 $bg->{s} = $rep_x;
874 $bg->{t} = $rep_y; 1006 $bg->{t} = $rep_y;
875 $bg->{wrap_mode} = 1; 1007 $bg->{wrap_mode} = 1;
876 $bg->draw_quad ($border, $border, $cw, $ch); 1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 }
877 1010
878 glDisable GL_TEXTURE_2D; 1011 glDisable GL_TEXTURE_2D;
879 glDisable GL_BLEND;
880 1012
881 $self->{title}->draw if $self->{title}; 1013 $self->{title}->draw if $self->{title};
1014
882 $self->child->draw; 1015 $self->child->draw;
883} 1016}
884 1017
885############################################################################# 1018#############################################################################
886 1019
… …
908 $self->{children}[$y][$x] = $child; 1041 $self->{children}[$y][$x] = $child;
909 1042
910 $child->check_size; 1043 $child->check_size;
911} 1044}
912 1045
1046sub children {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048}
1049
913# 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?
914sub clear { 1051sub clear {
915 my ($self) = @_; 1052 my ($self) = @_;
916 1053
917 my $children = delete $self->{children}; 1054 my @children = $self->children;
1055 delete $self->{children};
918 1056
919 for (grep $_, map @$_, grep $_, @$children) { 1057 for (@children) {
920 delete $_->{parent}; 1058 delete $_->{parent};
921 $_->hide; 1059 $_->hide;
922 } 1060 }
923 1061
924 $self->update; 1062 $self->update;
… …
1105} 1243}
1106 1244
1107sub size_allocate { 1245sub size_allocate {
1108 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h) = @_;
1109 1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1110 my $children = $self->{children}; 1250 my $children = $self->{children};
1111 1251
1112 my @h = map $_->{req_h}, @$children; 1252 my @h = map $_->{req_h}, @$children;
1113 1253
1114 my $req_h = List::Util::sum @h; 1254 my $req_h = List::Util::sum @h;
… …
1143 1283
1144############################################################################# 1284#############################################################################
1145 1285
1146package CFClient::UI::Label; 1286package CFClient::UI::Label;
1147 1287
1148our @ISA = CFClient::UI::Base::; 1288our @ISA = CFClient::UI::DrawBG::;
1149 1289
1150use CFClient::OpenGL; 1290use CFClient::OpenGL;
1151 1291
1152sub new { 1292sub new {
1153 my ($class, %arg) = @_; 1293 my ($class, %arg) = @_;
1154 1294
1155 my $self = $class->SUPER::new ( 1295 my $self = $class->SUPER::new (
1156 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1297 #bg => none
1298 #active_bg => none
1157 #font => default_font 1299 #font => default_font
1300 #text => initial text
1301 #markup => initial narkup
1302 layout => (new CFClient::Layout),
1158 fontsize => 1, 1303 fontsize => 1,
1159 text => "",
1160 align => -1, 1304 align => -1,
1161 valign => -1, 1305 valign => -1,
1162 padding => 2, 1306 padding => 2,
1163 layout => new CFClient::Layout,
1164 can_events => 0, 1307 can_events => 0,
1165 %arg 1308 %arg
1166 ); 1309 );
1167 1310
1168 if (exists $self->{template}) { 1311 if (exists $self->{template}) {
1169 my $layout = new CFClient::Layout; 1312 my $layout = new CFClient::Layout;
1170 $layout->set_text (delete $self->{template}); 1313 $layout->set_text (delete $self->{template});
1171 $self->{template} = $layout; 1314 $self->{template} = $layout;
1172 } 1315 }
1173 1316
1174 $self->set_text (delete $self->{text}) if exists $self->{text}; 1317 if (exists $self->{markup}) {
1175 $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 }
1176 1322
1177 $self 1323 $self
1178} 1324}
1179 1325
1180sub escape { 1326sub escape($) {
1181 local $_ = $_[1]; 1327 local $_ = $_[0];
1182 1328
1183 s/&/&amp;/g; 1329 s/&/&amp;/g;
1184 s/>/&gt;/g; 1330 s/>/&gt;/g;
1185 s/</&lt;/g; 1331 s/</&lt;/g;
1186 1332
1187 $_[1] 1333 $_
1334}
1335
1336sub update {
1337 my ($self) = @_;
1338
1339 delete $self->{texture};
1340 $self->SUPER::update;
1188} 1341}
1189 1342
1190sub set_text { 1343sub set_text {
1191 my ($self, $text) = @_; 1344 my ($self, $text) = @_;
1192 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;
1193 $self->{layout}->set_text ($text); 1350 $self->{layout}->set_text ($text);
1194 1351
1195 delete $self->{texture}; 1352 $self->update;
1196 $self->check_size; 1353 $self->check_size;
1197 $self->update;
1198} 1354}
1199 1355
1200sub set_markup { 1356sub set_markup {
1201 my ($self, $markup) = @_; 1357 my ($self, $markup) = @_;
1202 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;
1203 $self->{layout}->set_markup ($markup); 1365 $self->{layout}->set_markup ($markup);
1204 1366
1205 delete $self->{texture}; 1367 $self->update;
1206 $self->check_size; 1368 $self->check_size;
1207 $self->update;
1208} 1369}
1209 1370
1210sub size_request { 1371sub size_request {
1211 my ($self) = @_; 1372 my ($self) = @_;
1212 1373
… …
1241sub set_fontsize { 1402sub set_fontsize {
1242 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1243 1404
1244 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1245 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1246 $self->check_size; 1409 $self->check_size;
1247 $self->update;
1248} 1410}
1249 1411
1250sub _draw { 1412sub _draw {
1251 my ($self) = @_; 1413 my ($self) = @_;
1252 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1253 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1254 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1255 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1256 $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
1257 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
1258 }; 1434 };
1259 1435
1260 glEnable GL_BLEND;
1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1262 glEnable GL_TEXTURE_2D; 1436 glEnable GL_TEXTURE_2D;
1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1264 1438
1439 if ($tex->{format} == GL_ALPHA) {
1265 glColor @{$self->{fg}}; 1440 glColor @{$self->{fg}};
1266
1267 $self->{ox} = int (
1268 $self->{align} < 0 ? $self->{padding}
1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1272
1273 $self->{oy} = int (
1274 $self->{valign} < 0 ? $self->{padding}
1275 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1276 : ($self->{h} - $tex->{h}) * 0.5
1277 );
1278
1279 $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 }
1280 1445
1281 glDisable GL_TEXTURE_2D; 1446 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283} 1447}
1284 1448
1285############################################################################# 1449#############################################################################
1286 1450
1287package CFClient::UI::EntryBase; 1451package CFClient::UI::EntryBase;
… …
1322 $self->{layout}->set_text ("$text "); 1486 $self->{layout}->set_text ("$text ");
1323 1487
1324 $self->emit (changed => $self->{text}); 1488 $self->emit (changed => $self->{text});
1325} 1489}
1326 1490
1327sub get_text {
1328 $_[0]{text}
1329}
1330
1331sub size_request {
1332 my ($self) = @_;
1333
1334 my ($w, $h) = $self->SUPER::size_request;
1335
1336 ($w + 1, $h) # add 1 for cursor
1337}
1338
1339sub size_allocate {
1340 my ($self, $w, $h) = @_;
1341
1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1343}
1344
1345sub set_text { 1491sub set_text {
1346 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1347 1493
1348 $self->{cursor} = length $text; 1494 $self->{cursor} = length $text;
1349 $self->_set_text ($text); 1495 $self->_set_text ($text);
1350 $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
1351} 1516}
1352 1517
1353sub key_down { 1518sub key_down {
1354 my ($self, $ev) = @_; 1519 my ($self, $ev) = @_;
1355 1520
… …
1357 my $sym = $ev->{sym}; 1522 my $sym = $ev->{sym};
1358 my $uni = $ev->{unicode}; 1523 my $uni = $ev->{unicode};
1359 1524
1360 my $text = $self->get_text; 1525 my $text = $self->get_text;
1361 1526
1362 if ($sym == 8) { 1527 if ($uni == 8) {
1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1528 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1364 } elsif ($sym == 127) { 1529 } elsif ($uni == 127) {
1365 substr $text, $self->{cursor}, 1, ""; 1530 substr $text, $self->{cursor}, 1, "";
1366 } elsif ($sym == CFClient::SDLK_LEFT) { 1531 } elsif ($sym == CFClient::SDLK_LEFT) {
1367 --$self->{cursor} if $self->{cursor}; 1532 --$self->{cursor} if $self->{cursor};
1368 } elsif ($sym == CFClient::SDLK_RIGHT) { 1533 } elsif ($sym == CFClient::SDLK_RIGHT) {
1369 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1534 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1370 } elsif ($sym == CFClient::SDLK_HOME) { 1535 } elsif ($sym == CFClient::SDLK_HOME) {
1371 $self->{cursor} = 0; 1536 $self->{cursor} = 0;
1372 } elsif ($sym == CFClient::SDLK_END) { 1537 } elsif ($sym == CFClient::SDLK_END) {
1373 $self->{cursor} = length $text; 1538 $self->{cursor} = length $text;
1374 } elsif ($sym == 27) { 1539 } elsif ($uni == 27) {
1375 $self->emit ('escape'); 1540 $self->emit ('escape');
1376 } elsif ($uni) { 1541 } elsif ($uni) {
1377 substr $text, $self->{cursor}++, 0, chr $uni; 1542 substr $text, $self->{cursor}++, 0, chr $uni;
1378 } 1543 }
1379 1544
1380 $self->_set_text ($text); 1545 $self->_set_text ($text);
1381 $self->update; 1546 $self->update;
1547 $self->check_size;
1382} 1548}
1383 1549
1384sub focus_in { 1550sub focus_in {
1385 my ($self) = @_; 1551 my ($self) = @_;
1386 1552
… …
1462 my ($self, $ev) = @_; 1628 my ($self, $ev) = @_;
1463 1629
1464 my $sym = $ev->{sym}; 1630 my $sym = $ev->{sym};
1465 1631
1466 if ($sym == 13) { 1632 if ($sym == 13) {
1633 unshift @{$self->{history}},
1634 my $txt = $self->get_text;
1635 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = '';
1467 $self->emit (activate => $self->get_text); 1637 $self->emit (activate => $txt);
1468 $self->update; 1638 $self->update;
1639
1640 } elsif ($sym == CFClient::SDLK_UP) {
1641 if ($self->{history_pointer} < 0) {
1642 $self->{history_saveback} = $self->get_text;
1643 }
1644 if (@{$self->{history} || []} > 0) {
1645 $self->{history_pointer}++;
1646 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1647 $self->{history_pointer} = @{$self->{history} || []} - 1;
1648 }
1649 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1650 }
1651
1652 } elsif ($sym == CFClient::SDLK_DOWN) {
1653 $self->{history_pointer}--;
1654 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1655
1656 if ($self->{history_pointer} >= 0) {
1657 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1658 } else {
1659 $self->set_text ($self->{history_saveback});
1660 }
1469 1661
1470 } else { 1662 } else {
1471 $self->SUPER::key_down ($ev); 1663 $self->SUPER::key_down ($ev);
1472 } 1664 }
1473 1665
… …
1489 my $class = shift; 1681 my $class = shift;
1490 1682
1491 $class->SUPER::new ( 1683 $class->SUPER::new (
1492 padding => 4, 1684 padding => 4,
1493 fg => [1, 1, 1], 1685 fg => [1, 1, 1],
1494 bg => [1, 1, 1, 0.2],
1495 active_fg => [0, 0, 1], 1686 active_fg => [0, 0, 1],
1496 can_hover => 1, 1687 can_hover => 1,
1497 align => 0, 1688 align => 0,
1498 valign => 0, 1689 valign => 0,
1499 can_events => 1, 1690 can_events => 1,
… …
1517 1708
1518 if ($GRAB == $self) { 1709 if ($GRAB == $self) {
1519 $self->{fg} = $self->{active_fg}; 1710 $self->{fg} = $self->{active_fg};
1520 } 1711 }
1521 1712
1522 glEnable GL_BLEND;
1523 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1524 glEnable GL_TEXTURE_2D; 1713 glEnable GL_TEXTURE_2D;
1525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1526 glColor 0, 0, 0, 1; 1715 glColor 0, 0, 0, 1;
1527 1716
1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1717 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1529 1718
1530 glDisable GL_TEXTURE_2D; 1719 glDisable GL_TEXTURE_2D;
1531 glDisable GL_BLEND;
1532 1720
1533 $self->SUPER::_draw; 1721 $self->SUPER::_draw;
1534} 1722}
1535 1723
1536############################################################################# 1724#############################################################################
… …
1550 1738
1551 $class->SUPER::new ( 1739 $class->SUPER::new (
1552 padding => 2, 1740 padding => 2,
1553 fg => [1, 1, 1], 1741 fg => [1, 1, 1],
1554 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],
1555 state => 0, 1745 state => 0,
1556 can_hover => 1, 1746 can_hover => 1,
1557 @_ 1747 @_
1558 ) 1748 )
1559} 1749}
… …
1583 1773
1584 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;
1585 1775
1586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1587 1777
1588 glEnable GL_BLEND; 1778 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779
1589 glEnable GL_TEXTURE_2D; 1780 glEnable GL_TEXTURE_2D;
1590 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1591
1592 my $tex = $self->{state} ? $tex[1] : $tex[0];
1593
1594 $tex->draw_quad (0, 0, $s, $s); 1781 $tex->draw_quad_alpha (0, 0, $s, $s);
1595
1596 glDisable GL_TEXTURE_2D; 1782 glDisable GL_TEXTURE_2D;
1597 glDisable GL_BLEND;
1598} 1783}
1599 1784
1600############################################################################# 1785#############################################################################
1601 1786
1602package CFClient::UI::Image; 1787package CFClient::UI::Image;
… …
1645 glTranslate 0, -$self->{w}, 0; 1830 glTranslate 0, -$self->{w}, 0;
1646 1831
1647 ($w, $h) = ($h, $w); 1832 ($w, $h) = ($h, $w);
1648 } 1833 }
1649 1834
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 1837
1655 $tex->draw_quad (0, 0, $w, $h); 1838 $tex->draw_quad_alpha (0, 0, $w, $h);
1656 1839
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D; 1840 glDisable GL_TEXTURE_2D;
1659} 1841}
1660 1842
1661############################################################################# 1843#############################################################################
1662 1844
… …
1710} 1892}
1711 1893
1712sub set_max { 1894sub set_max {
1713 my ($self, $max) = @_; 1895 my ($self, $max) = @_;
1714 1896
1897 return if $self->{max_val} == $max;
1898
1715 $self->{max_val} = $max; 1899 $self->{max_val} = $max;
1900 $self->update;
1716} 1901}
1717 1902
1718sub set_value { 1903sub set_value {
1719 my ($self, $val, $max) = @_; 1904 my ($self, $val, $max) = @_;
1720 1905
1721 $self->set_max ($max) 1906 $self->set_max ($max)
1722 if defined $max; 1907 if defined $max;
1723 1908
1724 $max = $self->{max_val}; 1909 return if $self->{val} == $val;
1910
1725 $self->{val} = $val; 1911 $self->{val} = $val;
1726
1727 $self->update; 1912 $self->update;
1728} 1913}
1729 1914
1730sub _draw { 1915sub _draw {
1731 my ($self) = @_; 1916 my ($self) = @_;
… …
1794 1979
1795sub new { 1980sub new {
1796 my ($class, %arg) = @_; 1981 my ($class, %arg) = @_;
1797 1982
1798 my $self = $class->SUPER::new ( 1983 my $self = $class->SUPER::new (
1799 tooltip => $arg{type}, 1984 tooltip => $arg{type},
1800 can_hover => 1, 1985 can_hover => 1,
1986 can_events => 1,
1801 %arg, 1987 %arg,
1802 ); 1988 );
1803 1989
1804 $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");
1805 $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);
… …
1813 1999
1814 $self->{value}->set_fontsize ($fsize); 2000 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize); 2001 $self->{max} ->set_fontsize ($fsize);
1816} 2002}
1817 2003
2004sub set_max {
2005 my ($self, $max) = @_;
2006
2007 $self->{gauge}->set_max ($max);
2008 $self->{max}->set_text ($max);
2009}
2010
1818sub set_value { 2011sub set_value {
1819 my ($self, $val, $max) = @_; 2012 my ($self, $val, $max) = @_;
1820 2013
1821 $self->set_max ($max) 2014 $self->set_max ($max)
1822 if defined $max; 2015 if defined $max;
1823 2016
1824 $self->{gauge}->set_value ($val, $max); 2017 $self->{gauge}->set_value ($val, $max);
1825 $self->{value}->set_text ($val); 2018 $self->{value}->set_text ($val);
1826}
1827
1828sub set_max {
1829 my ($self, $max) = @_;
1830
1831 $self->{gauge}->set_max ($max);
1832 $self->{max}->set_text ($max);
1833} 2019}
1834 2020
1835############################################################################# 2021#############################################################################
1836 2022
1837package CFClient::UI::Slider; 2023package CFClient::UI::Slider;
… …
1847 qw(s1_slider.png s1_slider_bg.png); 2033 qw(s1_slider.png s1_slider_bg.png);
1848 2034
1849sub new { 2035sub new {
1850 my $class = shift; 2036 my $class = shift;
1851 2037
1852 # range [value, low, high, page] 2038 # range [value, low, high, page, unit]
1853 2039
1854 # TODO: 0-width page 2040 # TODO: 0-width page
1855 # TODO: req_w/h are wrong with vertical 2041 # TODO: req_w/h are wrong with vertical
1856 # TODO: calculations are off 2042 # TODO: calculations are off
1857 my $self = $class->SUPER::new ( 2043 my $self = $class->SUPER::new (
1858 fg => [1, 1, 1], 2044 fg => [1, 1, 1],
1859 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],
1860 range => [0, 0, 100, 10], 2048 range => [0, 0, 100, 10],
1861 req_w => 20, 2049 req_w => $::WIDTH / 80,
1862 req_h => 20, 2050 req_h => $::WIDTH / 80,
1863 vertical => 0, 2051 vertical => 0,
1864 can_hover => 1, 2052 can_hover => 1,
1865 inner_pad => 5, 2053 inner_pad => .05,
1866 @_ 2054 @_
1867 ); 2055 );
1868 2056
2057 $self->set_value ($self->{range}[0]);
2058 $self->update;
2059
1869 $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 }
1870} 2084}
1871 2085
1872sub size_request { 2086sub size_request {
1873 my ($self) = @_; 2087 my ($self) = @_;
1874 2088
… …
1887 2101
1888sub mouse_motion { 2102sub mouse_motion {
1889 my ($self, $ev, $x, $y) = @_; 2103 my ($self, $ev, $x, $y) = @_;
1890 2104
1891 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
1892 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2122 my ($value, $lo, $hi, $page) = @{$self->{range}};
1893 2123
1894 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2124 my $inner_w = 1 - 2 * $self->{inner_pad};
1895 2125
1896 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2126 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1897 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1898 2127
1899 $x -= $inner_pad_px; # substract the padding 2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1900 $x = $x * ($hi - $lo) / $inner_w + $lo; 2129 $value = $self->{scale} * ($value - $lo);
1901 $x = $lo if $x < $lo;
1902 $x = $hi - $page if $x > $hi - $page;
1903 $self->{range}[0] = $x;
1904 2130
1905 $self->emit (changed => $x); 2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
1906 $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;
1907 } 2138 });
1908}
1909 2139
1910# the inner_* stuff is for generating a padding for the slider handle, 2140 $self->SUPER::update;
1911# so that the handle doesn't leave the texture. This calculation isn't 100%
1912# correct propably, but it does the job for now
1913sub _calc_inner_pad_px {
1914 my ($self, $w) = @_;
1915 ($w / 100) * $self->{inner_pad} # % to pixels
1916} 2141}
1917 2142
1918sub _draw { 2143sub _draw {
1919 my ($self) = @_; 2144 my ($self) = @_;
1920 2145
1921 $self->SUPER::_draw (); 2146 $self->SUPER::_draw ();
1922 2147
1923 my ($w, $h) = @$self{qw(w h)}; 2148 glScale $self->{w}, $self->{h};
1924 2149
1925 if ($self->{vertical}) { 2150 if ($self->{vertical}) {
1926 # draw a vertical slider like a rotated horizontal slider 2151 # draw a vertical slider like a rotated horizontal slider
1927 2152
1928 glRotate 90, 0, 0, 1; 2153 glRotate 90, 0, 0, 1;
1929 glTranslate 0, -$self->{w}, 0; 2154 glTranslate 0, 1, 0;
1930
1931 ($w, $h) = ($h, $w);
1932 } 2155 }
1933 2156
1934 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1935 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1936 2159
1937 my ($value, $lo, $hi, $page) = @{$self->{range}};
1938
1939 $hi = $value + 1 if $lo == $hi;
1940
1941 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1942 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1943
1944 $page = int $page * $inner_w / ($hi - $lo);
1945 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1946
1947 $w -= $page;
1948 $page &= ~1;
1949 glTranslate $page * 0.5, 0, 0;
1950 $page ||= 2;
1951
1952 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1953 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1954
1955 glEnable GL_BLEND;
1956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1957 glEnable GL_TEXTURE_2D; 2160 glEnable GL_TEXTURE_2D;
1958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2161 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1959 2162
1960 # draw background 2163 # draw background
1961 $tex[1]->draw_quad (0, 0, $w, $h); 2164 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1962 2165
1963 # draw handle 2166 # draw handle
1964 $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);
1965 2168
1966 glDisable GL_BLEND;
1967 glDisable GL_TEXTURE_2D; 2169 glDisable GL_TEXTURE_2D;
1968} 2170}
1969 2171
1970############################################################################# 2172#############################################################################
1971 2173
… …
1982 fontsize => 1, 2184 fontsize => 1,
1983 can_events => 0, 2185 can_events => 0,
1984 #font => default_font 2186 #font => default_font
1985 @_, 2187 @_,
1986 2188
1987 layout => (new CFClient::Layout), 2189 layout => (new CFClient::Layout 1),
1988 par => [], 2190 par => [],
1989 height => 0, 2191 height => 0,
1990 children => [ 2192 children => [
1991 (new CFClient::UI::Empty expand => 1), 2193 (new CFClient::UI::Empty expand => 1),
1992 (new CFClient::UI::Slider vertical => 1), 2194 (new CFClient::UI::Slider vertical => 1),
1993 ], 2195 ],
1994 ); 2196 );
1995 2197
1996 $self->{children}[1]->connect (changed => sub { 2198 $self->{children}[1]->connect (changed => sub { $self->update });
1997 $self->update;
1998 });
1999 2199
2000 $self 2200 $self
2001} 2201}
2002 2202
2003sub set_fontsize { 2203sub set_fontsize {
… …
2011 my ($self, $text) = @_; 2211 my ($self, $text) = @_;
2012 2212
2013 my $layout = $self->{layout}; 2213 my $layout = $self->{layout};
2014 2214
2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2016 $layout->set_width ($self->{w}); 2216 $layout->set_width ($self->{children}[0]{w});
2017 $layout->set_text ($text); 2217 $layout->set_markup ($text);
2018 2218
2019 ($layout->size)[1] 2219 ($layout->size)[1]
2020} 2220}
2021 2221
2022sub reflow { 2222sub reflow {
… …
2060 2260
2061 return unless $self->{h} > 0; 2261 return unless $self->{h} > 0;
2062 2262
2063 delete $self->{texture}; 2263 delete $self->{texture};
2064 2264
2065 $ROOT->on_refresh ($self, sub { 2265 $ROOT->on_post_alloc ($self, sub {
2066 if (delete $self->{need_reflow}) { 2266 if (delete $self->{need_reflow}) {
2067 my $height = 0; 2267 my $height = 0;
2068 2268
2069 $height += $_->[0] = $self->text_height ($_->[2]) 2269 $height += $_->[0] = $self->text_height ($_->[2])
2070 for @{$self->{par}}; 2270 for @{$self->{par}};
… …
2074 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2274 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2075 2275
2076 delete $self->{texture}; 2276 delete $self->{texture};
2077 } 2277 }
2078 2278
2079 $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 {
2080 glClearColor 0, 0, 0, 1; 2280 glClearColor 0, 0, 0, 0;
2081 glClear GL_COLOR_BUFFER_BIT; 2281 glClear GL_COLOR_BUFFER_BIT;
2082 2282
2083 glEnable GL_BLEND;
2084 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2085 glEnable GL_TEXTURE_2D; 2283 glEnable GL_TEXTURE_2D;
2086 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2087 2285
2088 my $top = int $self->{children}[1]{range}[0]; 2286 my $top = int $self->{children}[1]{range}[0];
2089 2287
… …
2098 2296
2099 for my $par (@{$self->{par}}) { 2297 for my $par (@{$self->{par}}) {
2100 my $h = $par->[0]; 2298 my $h = $par->[0];
2101 2299
2102 if ($y0 < $y + $h && $y < $y1) { 2300 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2103 $layout->set_text ($par->[2]); 2302 $layout->set_markup ($par->[2]);
2104 2303
2105 glColor @{ $par->[1] };
2106 my ($W, $H) = $layout->size; 2304 my ($W, $H) = $layout->size;
2107 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);
2108 } 2306 }
2109 2307
2110 $y += $h; 2308 $y += $h;
2111 } 2309 }
2112 2310
2113 glDisable GL_TEXTURE_2D; 2311 glDisable GL_TEXTURE_2D;
2114 glDisable GL_BLEND;
2115 }; 2312 };
2116 }); 2313 });
2117} 2314}
2118 2315
2119sub _draw { 2316sub _draw {
2120 my ($self) = @_; 2317 my ($self) = @_;
2121 2318
2122 if ($self->{texture}) {
2123 glEnable GL_TEXTURE_2D; 2319 glEnable GL_TEXTURE_2D;
2124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2125 $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});
2126 glDisable GL_TEXTURE_2D; 2323 glDisable GL_TEXTURE_2D;
2127 }
2128 2324
2129 $self->{children}[1]->draw; 2325 $self->{children}[1]->draw;
2130 2326
2131} 2327}
2132 2328
… …
2226 @_, 2422 @_,
2227 can_events => 0, 2423 can_events => 0,
2228 ) 2424 )
2229} 2425}
2230 2426
2231sub set_markup { 2427sub set_tooltip_from {
2232 my ($self, $text) = @_; 2428 my ($self, $widget) = @_;
2233 2429
2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2430 $self->add (new CFClient::UI::Label
2235 $self->{label}->set_markup ($text); 2431 markup => $widget->{tooltip},
2236 $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 );
2237} 2437}
2238 2438
2239sub size_request { 2439sub size_request {
2240 my ($self) = @_; 2440 my ($self) = @_;
2241
2242 $self->child->set_max_size ($::WIDTH * 0.3);
2243 2441
2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2245 2443
2246 ($w + 4, $h + 4) 2444 ($w + 4, $h + 4)
2247} 2445}
… …
2253} 2451}
2254 2452
2255sub _draw { 2453sub _draw {
2256 my ($self) = @_; 2454 my ($self) = @_;
2257 2455
2258 glPushMatrix;
2259 glTranslate 0.375, 0.375; 2456 glTranslate 0.375, 0.375;
2260 2457
2261 my ($w, $h) = @$self{qw(w h)}; 2458 my ($w, $h) = @$self{qw(w h)};
2262 2459
2263 glColor 1, 0.8, 0.4; 2460 glColor 1, 0.8, 0.4;
… …
2274 glVertex 0 , $h; 2471 glVertex 0 , $h;
2275 glVertex $w, $h; 2472 glVertex $w, $h;
2276 glVertex $w, 0; 2473 glVertex $w, 0;
2277 glEnd; 2474 glEnd;
2278 2475
2279 glPopMatrix; 2476 glTranslate 2 - 0.375, 2 - 0.375;
2280
2281 glTranslate 2, 2;
2282 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
2283} 2478}
2284 2479
2285############################################################################# 2480#############################################################################
2286 2481
… …
2301 2496
2302sub size_request { 2497sub size_request {
2303 (32, 8) 2498 (32, 8)
2304} 2499}
2305 2500
2306sub draw { 2501sub _draw {
2307 my ($self) = @_; 2502 my ($self) = @_;
2308 2503
2504 return unless $::CONN;#d# manage and cache textures differently
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2310 2506
2507 # TODO animation
2311 if ($tex) { 2508 if ($tex) {
2312 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D; 2509 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2316 glColor 1, 1, 1, 1; 2511 glColor 1, 1, 1, 1;
2317 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2318 glDisable GL_TEXTURE_2D; 2513 glDisable GL_TEXTURE_2D;
2319 glDisable GL_BLEND; 2514 }
2515}
2516
2517#############################################################################
2518
2519package CFClient::UI::InventoryItem;
2520
2521our @ISA = CFClient::UI::HBox::;
2522
2523sub _item_to_desc {
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665}
2666
2667#############################################################################
2668
2669package CFClient::UI::Menu;
2670
2671our @ISA = CFClient::UI::FancyFrame::;
2672
2673use CFClient::OpenGL;
2674
2675sub new {
2676 my $class = shift;
2677
2678 my $self = $class->SUPER::new (
2679 items => [],
2680 z => 100,
2681 @_,
2682 );
2683
2684 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2685
2686 for my $item (@{ $self->{items} }) {
2687 my ($widget, $cb) = @$item;
2688
2689 # handle various types of items, only text for now
2690 if (!ref $widget) {
2691 $widget = new CFClient::UI::Label
2692 can_hover => 1,
2693 can_events => 1,
2694 text => $widget;
2695 }
2696
2697 $self->{item}{$widget} = $item;
2698
2699 $self->{vbox}->add ($widget);
2700 }
2701
2702 $self
2703}
2704
2705# popup given the event (must be a mouse button down event currently)
2706sub popup {
2707 my ($self, $ev) = @_;
2708
2709 $self->emit ("popdown");
2710
2711 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self;
2713 $self->{button} = $ev->{button};
2714
2715 $self->show;
2716 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2717}
2718
2719sub mouse_motion {
2720 my ($self, $ev, $x, $y) = @_;
2721
2722 # TODO: should use vbox->find_widget or so
2723 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2724 $self->{hover} = $self->{item}{$HOVER};
2725}
2726
2727sub button_up {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB;
2732 $self->hide;
2733
2734 $self->emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover};
2736 }
2737}
2738
2739#############################################################################
2740
2741package CFClient::UI::Statusbox;
2742
2743our @ISA = CFClient::UI::VBox::;
2744
2745sub new {
2746 my $class = shift;
2747
2748 $class->SUPER::new (
2749 fontsize => 0.8,
2750 @_,
2320 } 2751 )
2752}
2753
2754sub reorder {
2755 my ($self) = @_;
2756 my $NOW = time;
2757
2758 while (my ($k, $v) = each %{ $self->{item} }) {
2759 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2760 }
2761
2762 my @widgets;
2763
2764 my @items = sort {
2765 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} };
2768
2769 my $count = 10 + 1;
2770 for my $item (@items) {
2771 last unless --$count;
2772
2773 push @widgets, $item->{label} ||= do {
2774 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text};
2778
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) {
2782 s/^\s+//;
2783 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 }
2787
2788 new CFClient::UI::Label
2789 markup => $short,
2790 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67,
2793 fontsize => $fontsize,
2794 fg => $item->{fg},
2795 can_events => 1,
2796 can_hover => 1
2797 };
2798 }
2799
2800 $self->clear;
2801 $self->SUPER::add (reverse @widgets);
2802}
2803
2804sub add {
2805 my ($self, $text, %arg) = @_;
2806
2807 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//;
2809
2810 my $timeout = time + ((delete $arg{timeout}) || 60);
2811
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813
2814 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) {
2816 $item->{count}++;
2817 } else {
2818 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text;
2820 }
2821 $item->{id} = ++$self->{id};
2822 $item->{timeout} = $timeout;
2823 delete $item->{label};
2824 } else {
2825 $self->{item}{$group} = {
2826 id => ++$self->{id},
2827 text => $text,
2828 timeout => $timeout,
2829 tooltip => $text,
2830 fg => [0.8, 0.8, 0.8, 0.8],
2831 pri => 0,
2832 count => 1,
2833 %arg,
2834 };
2835 }
2836
2837 $self->reorder;
2321} 2838}
2322 2839
2323############################################################################# 2840#############################################################################
2324 2841
2325package CFClient::UI::Root; 2842package CFClient::UI::Root;
2326 2843
2327our @ISA = CFClient::UI::Container::; 2844our @ISA = CFClient::UI::Container::;
2328 2845
2329use CFClient::OpenGL; 2846use CFClient::OpenGL;
2330 2847
2331sub check_size { 2848sub new {
2332 my ($self) = @_; 2849 my $class = shift;
2333 2850
2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2851 $class->SUPER::new (
2335} 2852 @_,
2336 2853 )
2337sub size_request {
2338 ($::WIDTH, $::HEIGHT)
2339} 2854}
2340 2855
2341sub configure { 2856sub configure {
2342 my ($self, $x, $y, $w, $h) = @_; 2857 my ($self, $x, $y, $w, $h) = @_;
2343 2858
2344 $self->SUPER::configure ($x, $y, $w, $h); 2859 $self->{w} = $w;
2860 $self->{h} = $h;
2861}
2345 2862
2863sub check_size {
2864 my ($self) = @_;
2865
2866 $self->size_allocate ($self->{w}, $self->{h})
2867 if $self->{w};
2868}
2869
2870sub size_request {
2871 my ($self) = @_;
2872
2873 ($self->{w}, $self->{h})
2874}
2875
2876sub size_allocate {
2877 my ($self, $w, $h) = @_;
2878
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2346 for my $child (@{$self->{children}}) { 2885 for my $child ($self->children) {
2347 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2886 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2348 2887
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889 if exists $child->{req_x};
2890
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2892 if exists $child->{req_y};
2893
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2350 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896
2351 $child->configure ($X, $Y, $W,$H); 2897 $child->configure ($X, $Y, $W, $H);
2352 } 2898 }
2353} 2899}
2354 2900
2355sub _topleft { 2901sub coord2local {
2356 my ($self, $x, $y) = @_; 2902 my ($self, $x, $y) = @_;
2357 2903
2358 ($x, $y) 2904 ($x, $y)
2359} 2905}
2360 2906
2907sub coord2global {
2908 my ($self, $x, $y) = @_;
2909
2910 ($x, $y)
2911}
2912
2361sub update { 2913sub update {
2362 my ($self) = @_; 2914 my ($self) = @_;
2363 2915
2364 $self->check_size; 2916 $self->check_size;
2365 ::refresh (); 2917 $::WANT_REFRESH++;
2366} 2918}
2367 2919
2368sub add { 2920sub add {
2369 my ($self, $child) = @_; 2921 my ($self, @children) = @_;
2370 2922
2923 for my $child (@children) {
2924 $child->{toplevel} = 1;
2925
2371 # integerize window positions 2926 # integerise window positions
2372 $child->{x} = int $child->{x}; 2927 $child->{x} = int $child->{x};
2373 $child->{y} = int $child->{y}; 2928 $child->{y} = int $child->{y};
2929 }
2374 2930
2375 $self->SUPER::add ($child); 2931 $self->SUPER::add (@children);
2376} 2932}
2377 2933
2378sub on_refresh { 2934sub on_refresh {
2379 my ($self, $id, $cb) = @_; 2935 my ($self, $id, $cb) = @_;
2380 2936
2381 $self->{refresh_hook}{$id} = $cb; 2937 $self->{refresh_hook}{$id} = $cb;
2382} 2938}
2383 2939
2940sub on_post_alloc {
2941 my ($self, $id, $cb) = @_;
2942
2943 $self->{post_alloc_hook}{$id} = $cb;
2944}
2945
2384sub draw { 2946sub draw {
2385 my ($self) = @_; 2947 my ($self) = @_;
2386 2948
2387 while (my $rcb = delete $self->{refresh_hook}) { 2949 while ($self->{refresh_hook}) {
2388 $_->() for values %$rcb; 2950 $_->()
2951 for values %{delete $self->{refresh_hook}};
2952 }
2953
2954 if ($self->{check_size}) {
2955 my @queue = ([], []);
2956
2957 for (;;) {
2958 if ($self->{check_size}) {
2959 # heuristic: check containers last
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2961 for values %{delete $self->{check_size}}
2962 }
2963
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2965
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2967 ? @$widget{qw(user_w user_h)}
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973
2974 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h;
2976
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2978
2979 $widget->{parent}->check_size
2980 if $widget->{parent};
2981 }
2982 }
2983 }
2984
2985 while ($self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) {
2987 my ($widget, $w, $h) = @$_;
2988
2989 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0;
2991
2992 $widget->{w} = $w;
2993 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h);
2995 $widget->emit (size_allocate => $w, $h);
2996 }
2997 }
2998
2999 while ($self->{post_alloc_hook}) {
3000 $_->()
3001 for values %{delete $self->{post_alloc_hook}};
2389 } 3002 }
2390 3003
2391 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3004 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2392 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2393 glClear GL_COLOR_BUFFER_BIT; 3006 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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