ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.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}->_topleft ($x + $self->{x}, $y + $self->{y}); 293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
253} 299}
254 300
255# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
256sub coord2local { 302sub coord2local {
257 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
258 304
259 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 306}
262 307
263# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
264sub coord2global { 309sub coord2global {
265 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
266 311
267 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 313}
270 314
271sub focus_in { 315sub focus_in {
272 my ($self) = @_; 316 my ($self) = @_;
273 317
… …
345 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
348 glEnd; 392 glEnd;
349 glPopMatrix; 393 glPopMatrix;
350 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;
351 } 395 }
352} 396}
353 397
354sub _draw { 398sub _draw {
355 my ($self) = @_; 399 my ($self) = @_;
… …
371 415
372sub set_parent { 416sub set_parent {
373 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
374 418
375 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};
376} 424}
377 425
378sub check_size { 426sub check_size {
379 my ($self) = @_; 427 my ($self, $forced) = @_;
380 428
381 $self->{parent} 429 $self->{force_alloc} = 1 if $forced;
382 or return 1; 430 $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} 431}
403 432
404sub update { 433sub update {
405 my ($self) = @_; 434 my ($self) = @_;
406 435
… …
421} 450}
422 451
423sub DESTROY { 452sub DESTROY {
424 my ($self) = @_; 453 my ($self) = @_;
425 454
455 delete $WIDGET{$self+0};
426 #$self->deactivate; 456 #$self->deactivate;
427} 457}
428 458
429############################################################################# 459#############################################################################
430 460
… …
439 my $class = shift; 469 my $class = shift;
440 470
441 # range [value, low, high, page] 471 # range [value, low, high, page]
442 472
443 $class->SUPER::new ( 473 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
446 @_ 476 @_
447 ) 477 )
448} 478}
449 479
450sub _draw { 480sub _draw {
451 my ($self) = @_; 481 my ($self) = @_;
452 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
454 489
455 glEnable GL_BLEND; 490 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
458 493
459 glBegin GL_QUADS; 494 glBegin GL_QUADS;
460 glVertex 0 , 0; 495 glVertex 0 , 0;
461 glVertex 0 , $h; 496 glVertex 0 , $h;
462 glVertex $w, $h; 497 glVertex $w, $h;
463 glVertex $w, 0; 498 glVertex $w, 0;
464 glEnd; 499 glEnd;
465 500
466 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
467} 503}
468 504
469############################################################################# 505#############################################################################
470 506
471package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
503 539
504 $self 540 $self
505} 541}
506 542
507sub add { 543sub add {
508 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
509 545
510 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
511 548
512 use sort 'stable'; 549 use sort 'stable';
513 550
514 $self->{children} = [ 551 $self->{children} = [
515 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
516 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
517 ]; 554 ];
518 555
519 $child->check_size; 556 $self->check_size (1);
557 $self->update;
558}
559
560sub children {
561 @{ $_[0]{children} }
520} 562}
521 563
522sub remove { 564sub remove {
523 my ($self, $child) = @_; 565 my ($self, $child) = @_;
524 566
… …
539 581
540 for (@$children) { 582 for (@$children) {
541 delete $_->{parent}; 583 delete $_->{parent};
542 $_->hide; 584 $_->hide;
543 } 585 }
586
587 $self->check_size;
588 $self->update;
544} 589}
545 590
546sub find_widget { 591sub find_widget {
547 my ($self, $x, $y) = @_; 592 my ($self, $x, $y) = @_;
548 593
… …
623} 668}
624 669
625sub update { 670sub update {
626 my ($self) = @_; 671 my ($self) = @_;
627 672
628 # we want to do this delayed... 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
629 $self->render_chld;
630 $self->SUPER::update; 674 $self->SUPER::update;
631}
632
633sub render_chld {
634 my ($self) = @_;
635
636 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
637 glClearColor 0, 0, 0, 1;
638 glClear GL_COLOR_BUFFER_BIT;
639 $self->child->draw;
640 };
641} 675}
642 676
643sub size_allocate { 677sub size_allocate {
644 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
645 679
646 $self->child->configure (0, 0, $w, $h); 680 $self->SUPER::size_allocate ($w, $h);
681 $self->update;
682}
647 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
648 $self->render_chld; 695 $self->_render;
696 };
649} 697}
650 698
651sub _draw { 699sub _draw {
652 my ($self) = @_; 700 my ($self) = @_;
653 701
654 my ($w, $h) = ($self->w, $self->h); 702 my ($w, $h) = ($self->w, $self->h);
655 703
656 my $tex = $self->{texture} 704 my $tex = $self->{texture}
657 or return; 705 or return;
658 706
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
662 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;
663 710
664 $tex->draw_quad (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
665 712
666 glDisable GL_BLEND;
667 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
668} 714}
669 715
670############################################################################# 716#############################################################################
671 717
672package CFClient::UI::ViewPort; 718package CFClient::UI::ViewPort;
673 719
674our @ISA = CFClient::UI::Window::; 720our @ISA = CFClient::UI::Window::;
675 721
676sub new { die }
677
678sub size_request { 722sub size_request {
679 my ($self) = @_; 723 my ($self) = @_;
680 724
681 @$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)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
683 727
684 @$self{qw(child_w child_h)} 728 @$self{qw(child_w child_h)}
685} 729}
686 730
687sub _draw { 731sub size_allocate {
688 my ($self) = @_; 732 my ($self, $w, $h) = @_;
689 733
690 $self->{children}[1]->draw; 734 $self->update;
691} 735}
692 736
737sub set_offset {
738 my ($self, $x, $y) = @_;
693 739
694############################################################################# 740 $self->{view_x} = int $x;
741 $self->{view_y} = int $y;
695 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
696package CFClient::UI::Frame; 784package CFClient::UI::ScrolledWindow;
697 785
698our @ISA = CFClient::UI::Bin::; 786our @ISA = CFClient::UI::HBox::;
699
700use CFClient::OpenGL;
701 787
702sub new { 788sub new {
703 my $class = shift; 789 my $class = shift;
704 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
705 my $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
706 bg => [1, 1, 1, 1], 802 vp => (new CFClient::UI::ViewPort expand => 1),
707 border_bg => [1, 1, 1, 1], 803 slider => $slider,
708 border => 0.8,
709 @_ 804 @_,
710 ); 805 );
711 806
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider});
810
712 $self 811 $self
713} 812}
714 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
715sub _draw { 834sub _draw {
716 my ($self) = @_; 835 my ($self) = @_;
717 836
718 my ($w, $h) = ($self->{w}, $self->{h}); 837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
719 839
720 glEnable GL_BLEND; 840 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D; 842 glColor @{ $self->{bg} };
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724 843
725# glBegin GL_QUADS; 844 glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0; 845 glVertex 0 , 0;
728# glVertex 0 , $h; 846 glVertex 0 , $h;
729# glVertex $w, $h; 847 glVertex $w, $h;
730# glVertex $w, 0; 848 glVertex $w, 0;
731# glEnd; 849 glEnd;
732 850
733
734 $self->child->draw;
735 glDisable GL_BLEND; 851 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D; 852 }
853
854 $self->SUPER::_draw;
737} 855}
738 856
739############################################################################# 857#############################################################################
740 858
741package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
… …
754 # TODO: user_x, user_y, overwrite moveto? 872 # TODO: user_x, user_y, overwrite moveto?
755 873
756 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
759 border => 0.8, 877 border => 0.6,
878 toplevel => 1,
760 can_events => 1, 879 can_events => 1,
761 @_ 880 @_
762 ); 881 );
763 882
764 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
765 align => 0, 884 align => 0,
766 valign => 1, 885 valign => 1,
767 text => $self->{title}, 886 text => $self->{title},
768 fontsize => 1; 887 fontsize => $self->{border};
769 888
770 $self 889 $self
771} 890}
772 891
773sub border { 892sub border {
… …
789 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
790 909
791 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
792 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
793 912
794 $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)
795 if $self->{title}; 914 if $self->{title};
796 915
797 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
798} 917}
799 918
800sub button_down { 919sub button_down {
801 my ($self, $ev, $x, $y) = @_; 920 my ($self, $ev, $x, $y) = @_;
802 921
922 my ($w, $h) = @$self{qw(w h)};
803 my $border = $self->border; 923 my $border = $self->border;
804 924
805 if ($x < $self->{w} && $x >= $self->{w} - $border 925 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
806 && $y < $self->{h} && $y >= $self->{h} - $border) { 926 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
807 927
928 if ($lr & $td) {
929 my ($wx, $wy) = ($self->{x}, $self->{y});
808 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 930 my ($ox, $oy) = ($ev->{x}, $ev->{y});
809 my ($bw, $bh) = ($self->{w}, $self->{h}); 931 my ($bw, $bh) = ($self->{w}, $self->{h});
810 932
933 my $mx = $x < $border;
934 my $my = $y < $border;
935
811 $self->{motion} = sub { 936 $self->{motion} = sub {
812 my ($ev, $x, $y) = @_; 937 my ($ev, $x, $y) = @_;
813 938
814 ($x, $y) = ($ev->{x}, $ev->{y}); 939 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy;
815 941
816 $self->{user_w} = $bw + $x - $ox; 942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
817 $self->{user_h} = $bh + $y - $oy; 943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
818 $self->check_size; 945 $self->check_size;
819 }; 946 };
820 947
821 } elsif ($x >= 0 && $x < $self->{w} 948 } elsif ($lr ^ $td) {
822 && $y >= 0 && $y < $border) {
823
824 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 949 my ($ox, $oy) = ($ev->{x}, $ev->{y});
825 my ($bx, $by) = ($self->{x}, $self->{y}); 950 my ($bx, $by) = ($self->{x}, $self->{y});
826 951
827 $self->{motion} = sub { 952 $self->{motion} = sub {
828 my ($ev, $x, $y) = @_; 953 my ($ev, $x, $y) = @_;
… …
851 my ($self) = @_; 976 my ($self) = @_;
852 977
853 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
854 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
855 980
856 glEnable GL_BLEND;
857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
858 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
860 983
861 my $border = $self->border; 984 my $border = $self->border;
862 985
863 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
864 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
865 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
867 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
868 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
869 my $bg = $tex[0]; 993 my $bg = $tex[0];
870 994
871 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
872 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
873 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
874 998
875 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
876 1000
877 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
878 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
879 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
880 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
881 1006
882 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
883 glDisable GL_BLEND;
884 1008
885 $self->{title}->draw if $self->{title}; 1009 $self->{title}->draw if $self->{title};
1010
886 $self->child->draw; 1011 $self->child->draw;
887} 1012}
888 1013
889############################################################################# 1014#############################################################################
890 1015
… …
912 $self->{children}[$y][$x] = $child; 1037 $self->{children}[$y][$x] = $child;
913 1038
914 $child->check_size; 1039 $child->check_size;
915} 1040}
916 1041
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
917# 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?
918sub clear { 1047sub clear {
919 my ($self) = @_; 1048 my ($self) = @_;
920 1049
921 my $children = delete $self->{children}; 1050 my @children = $self->children;
1051 delete $self->{children};
922 1052
923 for (grep $_, map @$_, grep $_, @$children) { 1053 for (@children) {
924 delete $_->{parent}; 1054 delete $_->{parent};
925 $_->hide; 1055 $_->hide;
926 } 1056 }
927 1057
928 $self->update; 1058 $self->update;
… …
1109} 1239}
1110 1240
1111sub size_allocate { 1241sub size_allocate {
1112 my ($self, $w, $h) = @_; 1242 my ($self, $w, $h) = @_;
1113 1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1114 my $children = $self->{children}; 1246 my $children = $self->{children};
1115 1247
1116 my @h = map $_->{req_h}, @$children; 1248 my @h = map $_->{req_h}, @$children;
1117 1249
1118 my $req_h = List::Util::sum @h; 1250 my $req_h = List::Util::sum @h;
… …
1147 1279
1148############################################################################# 1280#############################################################################
1149 1281
1150package CFClient::UI::Label; 1282package CFClient::UI::Label;
1151 1283
1152our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1153 1285
1154use CFClient::OpenGL; 1286use CFClient::OpenGL;
1155 1287
1156sub new { 1288sub new {
1157 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1158 1290
1159 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1160 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1161 #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),
1162 fontsize => 1, 1301 fontsize => 1,
1163 text => "",
1164 align => -1, 1302 align => -1,
1165 valign => -1, 1303 valign => -1,
1166 padding => 2, 1304 padding => 2,
1167 layout => new CFClient::Layout,
1168 can_events => 0, 1305 can_events => 0,
1169 %arg 1306 %arg
1170 ); 1307 );
1171 1308
1172 if (exists $self->{template}) { 1309 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout; 1310 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template}); 1311 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout; 1312 $self->{template} = $layout;
1176 } 1313 }
1177 1314
1178 $self->set_text (delete $self->{text}) if exists $self->{text}; 1315 if (exists $self->{markup}) {
1179 $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 }
1180 1320
1181 $self 1321 $self
1182} 1322}
1183 1323
1184sub escape { 1324sub escape($) {
1185 local $_ = $_[1]; 1325 local $_ = $_[0];
1186 1326
1187 s/&/&amp;/g; 1327 s/&/&amp;/g;
1188 s/>/&gt;/g; 1328 s/>/&gt;/g;
1189 s/</&lt;/g; 1329 s/</&lt;/g;
1190 1330
1191 $_[1] 1331 $_
1332}
1333
1334sub update {
1335 my ($self) = @_;
1336
1337 delete $self->{texture};
1338 $self->SUPER::update;
1192} 1339}
1193 1340
1194sub set_text { 1341sub set_text {
1195 my ($self, $text) = @_; 1342 my ($self, $text) = @_;
1196 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;
1197 $self->{layout}->set_text ($text); 1348 $self->{layout}->set_text ($text);
1198 1349
1199 delete $self->{texture}; 1350 $self->update;
1200 $self->check_size; 1351 $self->check_size;
1201 $self->update;
1202} 1352}
1203 1353
1204sub set_markup { 1354sub set_markup {
1205 my ($self, $markup) = @_; 1355 my ($self, $markup) = @_;
1206 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;
1207 $self->{layout}->set_markup ($markup); 1363 $self->{layout}->set_markup ($markup);
1208 1364
1209 delete $self->{texture}; 1365 $self->update;
1210 $self->check_size; 1366 $self->check_size;
1211 $self->update;
1212} 1367}
1213 1368
1214sub size_request { 1369sub size_request {
1215 my ($self) = @_; 1370 my ($self) = @_;
1216 1371
1217 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $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});
1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220 1377
1221 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1222 1379
1223 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1245sub set_fontsize { 1402sub set_fontsize {
1246 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1247 1404
1248 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1249 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1250 $self->check_size; 1409 $self->check_size;
1251 $self->update;
1252} 1410}
1253 1411
1254sub _draw { 1412sub _draw {
1255 my ($self) = @_; 1413 my ($self) = @_;
1256 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1257 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1258 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1259 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424
1261 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
1262 }; 1436 };
1263 1437
1264 glEnable GL_BLEND;
1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1266 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1268 1440
1441 if ($tex->{format} == GL_ALPHA) {
1269 glColor @{$self->{fg}}; 1442 glColor @{$self->{fg}};
1270
1271 $self->{ox} = int (
1272 $self->{align} < 0 ? $self->{padding}
1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
1276
1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy}); 1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 }
1284 1447
1285 glDisable GL_TEXTURE_2D; 1448 glDisable GL_TEXTURE_2D;
1286 glDisable GL_BLEND;
1287} 1449}
1288 1450
1289############################################################################# 1451#############################################################################
1290 1452
1291package CFClient::UI::EntryBase; 1453package CFClient::UI::EntryBase;
… …
1326 $self->{layout}->set_text ("$text "); 1488 $self->{layout}->set_text ("$text ");
1327 1489
1328 $self->emit (changed => $self->{text}); 1490 $self->emit (changed => $self->{text});
1329} 1491}
1330 1492
1331sub get_text {
1332 $_[0]{text}
1333}
1334
1335sub size_request {
1336 my ($self) = @_;
1337
1338 my ($w, $h) = $self->SUPER::size_request;
1339
1340 ($w + 1, $h) # add 1 for cursor
1341}
1342
1343sub size_allocate {
1344 my ($self, $w, $h) = @_;
1345
1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1347}
1348
1349sub set_text { 1493sub set_text {
1350 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1351 1495
1352 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1353 $self->_set_text ($text); 1497 $self->_set_text ($text);
1354 $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
1355} 1518}
1356 1519
1357sub key_down { 1520sub key_down {
1358 my ($self, $ev) = @_; 1521 my ($self, $ev) = @_;
1359 1522
… …
1361 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1362 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1363 1526
1364 my $text = $self->get_text; 1527 my $text = $self->get_text;
1365 1528
1366 if ($sym == 8) { 1529 if ($uni == 8) {
1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1368 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1369 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1370 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1371 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1372 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1373 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1374 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1375 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1376 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1377 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1378 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1379 $self->emit ('escape'); 1542 $self->emit ('escape');
1380 } elsif ($uni) { 1543 } elsif ($uni) {
1381 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1382 } 1545 }
1383 1546
1384 $self->_set_text ($text); 1547 $self->_set_text ($text);
1385 $self->update; 1548 $self->update;
1549 $self->check_size;
1386} 1550}
1387 1551
1388sub focus_in { 1552sub focus_in {
1389 my ($self) = @_; 1553 my ($self) = @_;
1390 1554
… …
1469 1633
1470 if ($sym == 13) { 1634 if ($sym == 13) {
1471 unshift @{$self->{history}}, 1635 unshift @{$self->{history}},
1472 my $txt = $self->get_text; 1636 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1; 1637 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = '';
1474 $self->emit (activate => $txt); 1639 $self->emit (activate => $txt);
1475 $self->update; 1640 $self->update;
1476 1641
1477 } elsif ($sym == CFClient::SDLK_UP) { 1642 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) { 1643 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text; 1644 $self->{history_saveback} = $self->get_text;
1480 } 1645 }
1646 if (@{$self->{history} || []} > 0) {
1481 $self->{history_pointer}++; 1647 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) { 1648 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1; 1649 $self->{history_pointer} = @{$self->{history} || []} - 1;
1650 }
1651 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1484 } 1652 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486 1653
1487 } elsif ($sym == CFClient::SDLK_DOWN) { 1654 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--; 1655 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1656 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490 1657
… …
1516 my $class = shift; 1683 my $class = shift;
1517 1684
1518 $class->SUPER::new ( 1685 $class->SUPER::new (
1519 padding => 4, 1686 padding => 4,
1520 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1521 bg => [1, 1, 1, 0.2],
1522 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1523 can_hover => 1, 1689 can_hover => 1,
1524 align => 0, 1690 align => 0,
1525 valign => 0, 1691 valign => 0,
1526 can_events => 1, 1692 can_events => 1,
… …
1544 1710
1545 if ($GRAB == $self) { 1711 if ($GRAB == $self) {
1546 $self->{fg} = $self->{active_fg}; 1712 $self->{fg} = $self->{active_fg};
1547 } 1713 }
1548 1714
1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D; 1715 glEnable GL_TEXTURE_2D;
1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1; 1717 glColor 0, 0, 0, 1;
1554 1718
1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1556 1720
1557 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1558 glDisable GL_BLEND;
1559 1722
1560 $self->SUPER::_draw; 1723 $self->SUPER::_draw;
1561} 1724}
1562 1725
1563############################################################################# 1726#############################################################################
… …
1577 1740
1578 $class->SUPER::new ( 1741 $class->SUPER::new (
1579 padding => 2, 1742 padding => 2,
1580 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1581 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],
1582 state => 0, 1747 state => 0,
1583 can_hover => 1, 1748 can_hover => 1,
1584 @_ 1749 @_
1585 ) 1750 )
1586} 1751}
… …
1610 1775
1611 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;
1612 1777
1613 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1614 1779
1615 glEnable GL_BLEND; 1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1616 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618
1619 my $tex = $self->{state} ? $tex[1] : $tex[0];
1620
1621 $tex->draw_quad (0, 0, $s, $s); 1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1622
1623 glDisable GL_TEXTURE_2D; 1784 glDisable GL_TEXTURE_2D;
1624 glDisable GL_BLEND;
1625} 1785}
1626 1786
1627############################################################################# 1787#############################################################################
1628 1788
1629package CFClient::UI::Image; 1789package CFClient::UI::Image;
… …
1672 glTranslate 0, -$self->{w}, 0; 1832 glTranslate 0, -$self->{w}, 0;
1673 1833
1674 ($w, $h) = ($h, $w); 1834 ($w, $h) = ($h, $w);
1675 } 1835 }
1676 1836
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 1839
1682 $tex->draw_quad (0, 0, $w, $h); 1840 $tex->draw_quad_alpha (0, 0, $w, $h);
1683 1841
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D; 1842 glDisable GL_TEXTURE_2D;
1686} 1843}
1687 1844
1688############################################################################# 1845#############################################################################
1689 1846
… …
1737} 1894}
1738 1895
1739sub set_max { 1896sub set_max {
1740 my ($self, $max) = @_; 1897 my ($self, $max) = @_;
1741 1898
1899 return if $self->{max_val} == $max;
1900
1742 $self->{max_val} = $max; 1901 $self->{max_val} = $max;
1902 $self->update;
1743} 1903}
1744 1904
1745sub set_value { 1905sub set_value {
1746 my ($self, $val, $max) = @_; 1906 my ($self, $val, $max) = @_;
1747 1907
1748 $self->set_max ($max) 1908 $self->set_max ($max)
1749 if defined $max; 1909 if defined $max;
1750 1910
1751 $max = $self->{max_val}; 1911 return if $self->{val} == $val;
1912
1752 $self->{val} = $val; 1913 $self->{val} = $val;
1753
1754 $self->update; 1914 $self->update;
1755} 1915}
1756 1916
1757sub _draw { 1917sub _draw {
1758 my ($self) = @_; 1918 my ($self) = @_;
… …
1821 1981
1822sub new { 1982sub new {
1823 my ($class, %arg) = @_; 1983 my ($class, %arg) = @_;
1824 1984
1825 my $self = $class->SUPER::new ( 1985 my $self = $class->SUPER::new (
1826 tooltip => $arg{type}, 1986 tooltip => $arg{type},
1827 can_hover => 1, 1987 can_hover => 1,
1988 can_events => 1,
1828 %arg, 1989 %arg,
1829 ); 1990 );
1830 1991
1831 $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");
1832 $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);
… …
1840 2001
1841 $self->{value}->set_fontsize ($fsize); 2002 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize); 2003 $self->{max} ->set_fontsize ($fsize);
1843} 2004}
1844 2005
2006sub set_max {
2007 my ($self, $max) = @_;
2008
2009 $self->{gauge}->set_max ($max);
2010 $self->{max}->set_text ($max);
2011}
2012
1845sub set_value { 2013sub set_value {
1846 my ($self, $val, $max) = @_; 2014 my ($self, $val, $max) = @_;
1847 2015
1848 $self->set_max ($max) 2016 $self->set_max ($max)
1849 if defined $max; 2017 if defined $max;
1850 2018
1851 $self->{gauge}->set_value ($val, $max); 2019 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val); 2020 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860} 2021}
1861 2022
1862############################################################################# 2023#############################################################################
1863 2024
1864package CFClient::UI::Slider; 2025package CFClient::UI::Slider;
… …
1874 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1875 2036
1876sub new { 2037sub new {
1877 my $class = shift; 2038 my $class = shift;
1878 2039
1879 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
1880 2041
1881 # TODO: 0-width page 2042 # TODO: 0-width page
1882 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
1883 # TODO: calculations are off 2044 # TODO: calculations are off
1884 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
1885 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1886 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],
1887 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
1888 req_w => 20, 2051 req_w => $::WIDTH / 80,
1889 req_h => 20, 2052 req_h => $::WIDTH / 80,
1890 vertical => 0, 2053 vertical => 0,
1891 can_hover => 1, 2054 can_hover => 1,
1892 inner_pad => 5, 2055 inner_pad => 0.02,
1893 @_ 2056 @_
1894 ); 2057 );
1895 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
1896 $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 }
1897} 2086}
1898 2087
1899sub size_request { 2088sub size_request {
1900 my ($self) = @_; 2089 my ($self) = @_;
1901 2090
… …
1914 2103
1915sub mouse_motion { 2104sub mouse_motion {
1916 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
1917 2106
1918 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
1919 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
1920 2125
1921 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
1922 2127
1923 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1924 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1925 2129
1926 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1927 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
1928 $x = $lo if $x < $lo;
1929 $x = $hi - $page if $x > $hi - $page;
1930 $self->{range}[0] = $x;
1931 2132
1932 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
1933 $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;
1934 } 2140 });
1935}
1936 2141
1937# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
1938# so that the handle doesn't leave the texture. This calculation isn't 100%
1939# correct propably, but it does the job for now
1940sub _calc_inner_pad_px {
1941 my ($self, $w) = @_;
1942 ($w / 100) * $self->{inner_pad} # % to pixels
1943} 2143}
1944 2144
1945sub _draw { 2145sub _draw {
1946 my ($self) = @_; 2146 my ($self) = @_;
1947 2147
1948 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
1949 2149
1950 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
1951 2151
1952 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
1953 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
1954 2154
2155 glTranslate 1, 0, 0;
1955 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
1956 glTranslate 0, -$self->{w}, 0;
1957
1958 ($w, $h) = ($h, $w);
1959 } 2157 }
1960 2158
1961 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1962 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1963 2161
1964 my ($value, $lo, $hi, $page) = @{$self->{range}};
1965
1966 $hi = $value + 1 if $lo == $hi;
1967
1968 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1969 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1970
1971 $page = int $page * $inner_w / ($hi - $lo);
1972 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1973
1974 $w -= $page;
1975 $page &= ~1;
1976 glTranslate $page * 0.5, 0, 0;
1977 $page ||= 2;
1978
1979 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1980 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1981
1982 glEnable GL_BLEND;
1983 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1984 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 2164
1987 # draw background 2165 # draw background
1988 $tex[1]->draw_quad (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1989 2167
1990 # draw handle 2168 # draw handle
1991 $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);
1992 2170
1993 glDisable GL_BLEND;
1994 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
1995} 2172}
1996 2173
1997############################################################################# 2174#############################################################################
1998 2175
… …
2009 fontsize => 1, 2186 fontsize => 1,
2010 can_events => 0, 2187 can_events => 0,
2011 #font => default_font 2188 #font => default_font
2012 @_, 2189 @_,
2013 2190
2014 layout => (new CFClient::Layout), 2191 layout => (new CFClient::Layout 1),
2015 par => [], 2192 par => [],
2016 height => 0, 2193 height => 0,
2017 children => [ 2194 children => [
2018 (new CFClient::UI::Empty expand => 1), 2195 (new CFClient::UI::Empty expand => 1),
2019 (new CFClient::UI::Slider vertical => 1), 2196 (new CFClient::UI::Slider vertical => 1),
2020 ], 2197 ],
2021 ); 2198 );
2022 2199
2023 $self->{children}[1]->connect (changed => sub { 2200 $self->{children}[1]->connect (changed => sub { $self->update });
2024 $self->update;
2025 });
2026 2201
2027 $self 2202 $self
2028} 2203}
2029 2204
2030sub set_fontsize { 2205sub set_fontsize {
… …
2038 my ($self, $text) = @_; 2213 my ($self, $text) = @_;
2039 2214
2040 my $layout = $self->{layout}; 2215 my $layout = $self->{layout};
2041 2216
2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2043 $layout->set_width ($self->{w}); 2218 $layout->set_width ($self->{children}[0]{w});
2044 $layout->set_text ($text); 2219 $layout->set_markup ($text);
2045 2220
2046 ($layout->size)[1] 2221 ($layout->size)[1]
2047} 2222}
2048 2223
2049sub reflow { 2224sub reflow {
… …
2087 2262
2088 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2089 2264
2090 delete $self->{texture}; 2265 delete $self->{texture};
2091 2266
2092 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2093 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2094 my $height = 0; 2269 my $height = 0;
2095 2270
2096 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2097 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2102 2277
2103 delete $self->{texture}; 2278 delete $self->{texture};
2104 } 2279 }
2105 2280
2106 $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 {
2107 glClearColor 0, 0, 0, 1; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2108 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2109 2284
2110 glEnable GL_BLEND;
2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2112 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2114 2287
2115 my $top = int $self->{children}[1]{range}[0]; 2288 my $top = int $self->{children}[1]{range}[0];
2116 2289
… …
2125 2298
2126 for my $par (@{$self->{par}}) { 2299 for my $par (@{$self->{par}}) {
2127 my $h = $par->[0]; 2300 my $h = $par->[0];
2128 2301
2129 if ($y0 < $y + $h && $y < $y1) { 2302 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2130 $layout->set_text ($par->[2]); 2304 $layout->set_markup ($par->[2]);
2131 2305
2132 glColor @{ $par->[1] };
2133 my ($W, $H) = $layout->size; 2306 my ($W, $H) = $layout->size;
2134 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);
2135 } 2308 }
2136 2309
2137 $y += $h; 2310 $y += $h;
2138 } 2311 }
2139 2312
2140 glDisable GL_TEXTURE_2D; 2313 glDisable GL_TEXTURE_2D;
2141 glDisable GL_BLEND;
2142 }; 2314 };
2143 }); 2315 });
2144} 2316}
2145 2317
2146sub _draw { 2318sub _draw {
2147 my ($self) = @_; 2319 my ($self) = @_;
2148 2320
2149 if ($self->{texture}) {
2150 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2151 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;
2152 $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});
2153 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2154 }
2155 2326
2156 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2157 2328
2158} 2329}
2159 2330
… …
2253 @_, 2424 @_,
2254 can_events => 0, 2425 can_events => 0,
2255 ) 2426 )
2256} 2427}
2257 2428
2258sub set_markup { 2429sub set_tooltip_from {
2259 my ($self, $text) = @_; 2430 my ($self, $widget) = @_;
2260 2431
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2432 $self->add (new CFClient::UI::Label
2262 $self->{label}->set_markup ($text); 2433 markup => $widget->{tooltip},
2263 $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 );
2264} 2440}
2265 2441
2266sub size_request { 2442sub size_request {
2267 my ($self) = @_; 2443 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270 2444
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272 2446
2273 ($w + 4, $h + 4) 2447 ($w + 4, $h + 4)
2274} 2448}
… …
2280} 2454}
2281 2455
2282sub _draw { 2456sub _draw {
2283 my ($self) = @_; 2457 my ($self) = @_;
2284 2458
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375; 2459 glTranslate 0.375, 0.375;
2287 2460
2288 my ($w, $h) = @$self{qw(w h)}; 2461 my ($w, $h) = @$self{qw(w h)};
2289 2462
2290 glColor 1, 0.8, 0.4; 2463 glColor 1, 0.8, 0.4;
… …
2301 glVertex 0 , $h; 2474 glVertex 0 , $h;
2302 glVertex $w, $h; 2475 glVertex $w, $h;
2303 glVertex $w, 0; 2476 glVertex $w, 0;
2304 glEnd; 2477 glEnd;
2305 2478
2306 glPopMatrix; 2479 glTranslate 2 - 0.375, 2 - 0.375;
2307
2308 glTranslate 2, 2;
2309 $self->SUPER::_draw; 2480 $self->SUPER::_draw;
2310} 2481}
2311 2482
2312############################################################################# 2483#############################################################################
2313 2484
… …
2318use CFClient::OpenGL; 2489use CFClient::OpenGL;
2319 2490
2320sub new { 2491sub new {
2321 my $class = shift; 2492 my $class = shift;
2322 2493
2323 $class->SUPER::new ( 2494 my $self = $class->SUPER::new (
2324 aspect => 1, 2495 aspect => 1,
2325 @_, 2496 @_,
2326 ) 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
2327} 2514}
2328 2515
2329sub size_request { 2516sub size_request {
2330 (32, 8) 2517 (32, 8)
2331} 2518}
2332 2519
2333sub draw { 2520sub _draw {
2334 my ($self) = @_; 2521 my ($self) = @_;
2335 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
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2337 2535
2338 if ($tex) { 2536 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D; 2537 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1; 2539 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D; 2541 glDisable GL_TEXTURE_2D;
2346 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 @_,
2347 } 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;
2348} 2882}
2349 2883
2350############################################################################# 2884#############################################################################
2351 2885
2352package CFClient::UI::Root; 2886package CFClient::UI::Root;
2353 2887
2354our @ISA = CFClient::UI::Container::; 2888our @ISA = CFClient::UI::Container::;
2355 2889
2356use CFClient::OpenGL; 2890use CFClient::OpenGL;
2357 2891
2358sub check_size { 2892sub new {
2359 my ($self) = @_; 2893 my $class = shift;
2360 2894
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2895 $class->SUPER::new (
2362} 2896 @_,
2363 2897 )
2364sub size_request {
2365 ($::WIDTH, $::HEIGHT)
2366} 2898}
2367 2899
2368sub configure { 2900sub configure {
2369 my ($self, $x, $y, $w, $h) = @_; 2901 my ($self, $x, $y, $w, $h) = @_;
2370 2902
2371 $self->SUPER::configure ($x, $y, $w, $h); 2903 $self->{w} = $w;
2904 $self->{h} = $h;
2905}
2372 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
2373 for my $child (@{$self->{children}}) { 2929 for my $child ($self->children) {
2374 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)};
2375 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
2376 $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;
2377 $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
2378 $child->configure ($X, $Y, $W,$H); 2941 $child->configure ($X, $Y, $W, $H);
2379 } 2942 }
2380} 2943}
2381 2944
2382sub _topleft { 2945sub coord2local {
2383 my ($self, $x, $y) = @_; 2946 my ($self, $x, $y) = @_;
2384 2947
2385 ($x, $y) 2948 ($x, $y)
2386} 2949}
2387 2950
2951sub coord2global {
2952 my ($self, $x, $y) = @_;
2953
2954 ($x, $y)
2955}
2956
2388sub update { 2957sub update {
2389 my ($self) = @_; 2958 my ($self) = @_;
2390 2959
2391 $self->check_size; 2960 $self->check_size;
2392 ::refresh (); 2961 $::WANT_REFRESH++;
2393} 2962}
2394 2963
2395sub add { 2964sub add {
2396 my ($self, $child) = @_; 2965 my ($self, @children) = @_;
2397 2966
2967 for my $child (@children) {
2968 $child->{toplevel} = 1;
2969
2398 # integerize window positions 2970 # integerise window positions
2399 $child->{x} = int $child->{x}; 2971 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y}; 2972 $child->{y} = int $child->{y};
2973 }
2401 2974
2402 $self->SUPER::add ($child); 2975 $self->SUPER::add (@children);
2403} 2976}
2404 2977
2405sub on_refresh { 2978sub on_refresh {
2406 my ($self, $id, $cb) = @_; 2979 my ($self, $id, $cb) = @_;
2407 2980
2408 $self->{refresh_hook}{$id} = $cb; 2981 $self->{refresh_hook}{$id} = $cb;
2409} 2982}
2410 2983
2984sub on_post_alloc {
2985 my ($self, $id, $cb) = @_;
2986
2987 $self->{post_alloc_hook}{$id} = $cb;
2988}
2989
2411sub draw { 2990sub draw {
2412 my ($self) = @_; 2991 my ($self) = @_;
2413 2992
2414 while (my $rcb = delete $self->{refresh_hook}) { 2993 while ($self->{refresh_hook}) {
2415 $_->() 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}};
2416 } 3046 }
2417 3047
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3048 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3049 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT; 3050 glClear GL_COLOR_BUFFER_BIT;
… …
2431############################################################################# 3061#############################################################################
2432 3062
2433package CFClient::UI; 3063package CFClient::UI;
2434 3064
2435$ROOT = new CFClient::UI::Root; 3065$ROOT = new CFClient::UI::Root;
2436$TOOLTIP = new CFClient::UI::Tooltip; 3066$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2437 3067
24381 30681
2439 3069

Diff Legend

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