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

Diff Legend

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