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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.222 by root, Mon May 22 03:59:51 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines