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.174 by root, Tue Apr 25 11:18:49 2006 UTC vs.
Revision 1.227 by root, Wed May 24 03:29:20 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
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $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;
135 } 169 }
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
179} 227}
180 228
181sub hide { 229sub hide {
182 my ($self) = @_; 230 my ($self) = @_;
183 231
232 $self->{y} = $y; 280 $self->{y} = $y;
233 $self->update; 281 $self->update;
234 } 282 }
235 283
236 if ($self->{w} != $w || $self->{h} != $h) { 284 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 286 }
243} 287}
244 288
245sub size_allocate { 289sub size_allocate {
246 # nothing to be done 290 # nothing to be done
247} 291}
248 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
249sub children { 300sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 301}
261 302
262sub set_max_size { 303sub set_max_size {
263 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
264 305
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 308}
268 309
269# return top left coordinates 310sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 311 my ($self, $tooltip) = @_;
272 312
273 $self->{parent} 313 $self->{tooltip} = $tooltip;
274 or Carp::confess "no parent widget in _topleft\n";#d#
275 314
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
277} 319}
278 320
279# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
280sub coord2local { 322sub coord2local {
281 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
282 324
283 my ($X, $Y) = $self->_topleft; 325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 326}
286 327
287# translate local coordinates to global coordinate system 328# translate local coordinates to global coordinate system
288sub coord2global { 329sub coord2global {
289 my ($self, $x, $y) = @_; 330 my ($self, $x, $y) = @_;
290 331
291 my ($X, $Y) = $self->_topleft; 332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 333}
294 334
295sub focus_in { 335sub focus_in {
296 my ($self) = @_; 336 my ($self) = @_;
297 337
369 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
372 glEnd; 412 glEnd;
373 glPopMatrix; 413 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 } 415 }
376} 416}
377 417
378sub _draw { 418sub _draw {
379 my ($self) = @_; 419 my ($self) = @_;
395 435
396sub set_parent { 436sub set_parent {
397 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
398 438
399 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
400} 446}
401 447
402sub check_size { 448sub check_size {
403 my ($self) = @_; 449 my ($self, $forced) = @_;
404 450
405 $self->{parent} 451 $self->{force_alloc} = 1 if $forced;
406 or return 1; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 453}
427 454
428sub update { 455sub update {
429 my ($self) = @_; 456 my ($self) = @_;
430 457
445} 472}
446 473
447sub DESTROY { 474sub DESTROY {
448 my ($self) = @_; 475 my ($self) = @_;
449 476
477 delete $WIDGET{$self+0};
450 #$self->deactivate; 478 #$self->deactivate;
451} 479}
452 480
453############################################################################# 481#############################################################################
454 482
463 my $class = shift; 491 my $class = shift;
464 492
465 # range [value, low, high, page] 493 # range [value, low, high, page]
466 494
467 $class->SUPER::new ( 495 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
470 @_ 498 @_
471 ) 499 )
472} 500}
473 501
474sub _draw { 502sub _draw {
475 my ($self) = @_; 503 my ($self) = @_;
476 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
478 511
479 glEnable GL_BLEND; 512 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
482 515
483 glBegin GL_QUADS; 516 glBegin GL_QUADS;
484 glVertex 0 , 0; 517 glVertex 0 , 0;
485 glVertex 0 , $h; 518 glVertex 0 , $h;
486 glVertex $w, $h; 519 glVertex $w, $h;
487 glVertex $w, 0; 520 glVertex $w, 0;
488 glEnd; 521 glEnd;
489 522
490 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
491} 525}
492 526
493############################################################################# 527#############################################################################
494 528
495package CFClient::UI::Empty; 529package CFClient::UI::Empty;
527 561
528 $self 562 $self
529} 563}
530 564
531sub add { 565sub add {
532 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
533 567
534 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
535 570
536 use sort 'stable'; 571 use sort 'stable';
537 572
538 $self->{children} = [ 573 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
541 ]; 576 ];
542 577
543 $child->check_size; 578 $self->check_size (1);
579 $self->update;
544} 580}
545 581
546sub children { 582sub children {
547 @{ $_[0]{children} } 583 @{ $_[0]{children} }
548} 584}
567 603
568 for (@$children) { 604 for (@$children) {
569 delete $_->{parent}; 605 delete $_->{parent};
570 $_->hide; 606 $_->hide;
571 } 607 }
608
609 $self->check_size;
610 $self->update;
572} 611}
573 612
574sub find_widget { 613sub find_widget {
575 my ($self, $x, $y) = @_; 614 my ($self, $x, $y) = @_;
576 615
651} 690}
652 691
653sub update { 692sub update {
654 my ($self) = @_; 693 my ($self) = @_;
655 694
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 696 $self->SUPER::update;
658} 697}
659 698
660sub size_allocate { 699sub size_allocate {
661 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
662 701
663 $self->SUPER::size_allocate ($w, $h); 702 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 703 $self->update;
704}
705
706sub _render {
707 $_[0]{children}[0]->draw;
665} 708}
666 709
667sub render_child { 710sub render_child {
668 my ($self) = @_; 711 my ($self) = @_;
669 712
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 716
717 $self->_render;
674 }; 718 };
675} 719}
676 720
677sub _draw { 721sub _draw {
678 my ($self) = @_; 722 my ($self) = @_;
680 my ($w, $h) = ($self->w, $self->h); 724 my ($w, $h) = ($self->w, $self->h);
681 725
682 my $tex = $self->{texture} 726 my $tex = $self->{texture}
683 or return; 727 or return;
684 728
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
690 732
691 $tex->draw_quad (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
692 734
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
695} 736}
696 737
697############################################################################# 738#############################################################################
698 739
699package CFClient::UI::ViewPort; 740package CFClient::UI::ViewPort;
700 741
701our @ISA = CFClient::UI::Window::; 742our @ISA = CFClient::UI::Window::;
702 743
703sub new { die }
704
705sub size_request { 744sub size_request {
706 my ($self) = @_; 745 my ($self) = @_;
707 746
708 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
710 748
711 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
712} 750}
713 751
714sub _draw { 752sub size_allocate {
715 my ($self) = @_; 753 my ($self, $w, $h) = @_;
716 754
717 $self->{children}[1]->draw; 755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
758 $self->update;
718} 759}
719 760
761sub set_offset {
762 my ($self, $x, $y) = @_;
720 763
721############################################################################# 764 $self->{view_x} = int $x;
765 $self->{view_y} = int $y;
722 766
767 $self->update;
768}
769
770# hmm, this does not work for topleft of $self... but we should not ask for that
771sub coord2local {
772 my ($self, $x, $y) = @_;
773
774 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
775}
776
777sub coord2global {
778 my ($self, $x, $y) = @_;
779
780 $x = List::Util::min $self->{w}, $x - $self->{view_x};
781 $y = List::Util::min $self->{h}, $y - $self->{view_y};
782
783 $self->SUPER::coord2global ($x, $y)
784}
785
786sub find_widget {
787 my ($self, $x, $y) = @_;
788
789 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
790 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
791 ) {
792 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
793 } else {
794 $self->CFClient::UI::Base::find_widget ($x, $y)
795 }
796}
797
798sub _render {
799 my ($self) = @_;
800
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802
803 $self->SUPER::_render;
804}
805
806#############################################################################
807
723package CFClient::UI::Frame; 808package CFClient::UI::ScrolledWindow;
724 809
725our @ISA = CFClient::UI::Bin::; 810our @ISA = CFClient::UI::HBox::;
726
727use CFClient::OpenGL;
728 811
729sub new { 812sub new {
730 my $class = shift; 813 my $class = shift;
731 814
815 my $self;
816
817 my $slider = new CFClient::UI::Slider
818 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
822 },
823 ;
824
732 my $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
733 bg => [1, 1, 1, 1], 826 vp => (new CFClient::UI::ViewPort expand => 1),
734 border_bg => [1, 1, 1, 1], 827 slider => $slider,
735 border => 0.8,
736 @_ 828 @_,
737 ); 829 );
738 830
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider});
834
739 $self 835 $self
740} 836}
741 837
838#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll
840
841#############################################################################
842
843package CFClient::UI::Frame;
844
845our @ISA = CFClient::UI::Bin::;
846
847use CFClient::OpenGL;
848
849sub new {
850 my $class = shift;
851
852 $class->SUPER::new (
853 bg => undef,
854 @_,
855 )
856}
857
742sub _draw { 858sub _draw {
743 my ($self) = @_; 859 my ($self) = @_;
744 860
745 my ($w, $h) = ($self->{w}, $self->{h}); 861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
746 863
747 glEnable GL_BLEND; 864 glEnable GL_BLEND;
748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D; 866 glColor @{ $self->{bg} };
750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
751 867
752# glBegin GL_QUADS; 868 glBegin GL_QUADS;
753# glColor 0, 0, 0, 0;
754# glVertex 0 , 0; 869 glVertex 0 , 0;
755# glVertex 0 , $h; 870 glVertex 0 , $h;
756# glVertex $w, $h; 871 glVertex $w, $h;
757# glVertex $w, 0; 872 glVertex $w, 0;
758# glEnd; 873 glEnd;
759 874
760
761 $self->child->draw;
762 glDisable GL_BLEND; 875 glDisable GL_BLEND;
763 glDisable GL_TEXTURE_2D; 876 }
877
878 $self->SUPER::_draw;
764} 879}
765 880
766############################################################################# 881#############################################################################
767 882
768package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
781 # TODO: user_x, user_y, overwrite moveto? 896 # TODO: user_x, user_y, overwrite moveto?
782 897
783 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
786 border => 0.8, 901 border => 0.6,
902 toplevel => 1,
787 can_events => 1, 903 can_events => 1,
788 @_ 904 @_
789 ); 905 );
790 906
791 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
792 align => 0, 908 align => 0,
793 valign => 1, 909 valign => 1,
794 text => $self->{title}, 910 text => $self->{title},
795 fontsize => 1; 911 fontsize => $self->{border};
796 912
797 $self 913 $self
798} 914}
799 915
800sub border { 916sub border {
816 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
817 933
818 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
819 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
820 936
821 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
822 if $self->{title}; 938 if $self->{title};
823 939
824 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
825} 941}
826 942
827sub button_down { 943sub button_down {
828 my ($self, $ev, $x, $y) = @_; 944 my ($self, $ev, $x, $y) = @_;
829 945
946 my ($w, $h) = @$self{qw(w h)};
830 my $border = $self->border; 947 my $border = $self->border;
831 948
832 if ($x < $self->{w} && $x >= $self->{w} - $border 949 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
833 && $y < $self->{h} && $y >= $self->{h} - $border) { 950 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
834 951
952 if ($lr & $td) {
953 my ($wx, $wy) = ($self->{x}, $self->{y});
835 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 954 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h}); 955 my ($bw, $bh) = ($self->{w}, $self->{h});
837 956
957 my $mx = $x < $border;
958 my $my = $y < $border;
959
838 $self->{motion} = sub { 960 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_; 961 my ($ev, $x, $y) = @_;
840 962
841 ($x, $y) = ($ev->{x}, $ev->{y}); 963 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy;
842 965
843 $self->{user_w} = $bw + $x - $ox; 966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
844 $self->{user_h} = $bh + $y - $oy; 967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
845 $self->check_size; 969 $self->check_size;
846 }; 970 };
847 971
848 } elsif ($x >= 0 && $x < $self->{w} 972 } elsif ($lr ^ $td) {
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 973 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y}); 974 my ($bx, $by) = ($self->{x}, $self->{y});
853 975
854 $self->{motion} = sub { 976 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_; 977 my ($ev, $x, $y) = @_;
878 my ($self) = @_; 1000 my ($self) = @_;
879 1001
880 my ($w, $h ) = ($self->{w}, $self->{h}); 1002 my ($w, $h ) = ($self->{w}, $self->{h});
881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
882 1004
883 glEnable GL_BLEND;
884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
885 glEnable GL_TEXTURE_2D; 1005 glEnable GL_TEXTURE_2D;
886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
887 1007
888 my $border = $self->border; 1008 my $border = $self->border;
889 1009
890 glColor @{ $self->{border_bg} }; 1010 glColor @{ $self->{border_bg} };
891 $tex[1]->draw_quad (0, 0, $w, $border); 1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch); 1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
895 1015
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
896 my $bg = $tex[0]; 1017 my $bg = $tex[0];
897 1018
898 # TODO: repeat texture not scale 1019 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w}; 1020 my $rep_x = $cw / $bg->{w};
900 my $rep_y = $ch / $bg->{h}; 1021 my $rep_y = $ch / $bg->{h};
901 1022
902 glColor @{ $self->{bg} }; 1023 glColor @{ $self->{bg} };
903 1024
904 $bg->{s} = $rep_x; 1025 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y; 1026 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1; 1027 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch); 1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 }
908 1030
909 glDisable GL_TEXTURE_2D; 1031 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND;
911 1032
912 $self->{title}->draw if $self->{title}; 1033 $self->{title}->draw if $self->{title};
1034
913 $self->child->draw; 1035 $self->child->draw;
914} 1036}
915 1037
916############################################################################# 1038#############################################################################
917 1039
1141} 1263}
1142 1264
1143sub size_allocate { 1265sub size_allocate {
1144 my ($self, $w, $h) = @_; 1266 my ($self, $w, $h) = @_;
1145 1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1146 my $children = $self->{children}; 1270 my $children = $self->{children};
1147 1271
1148 my @h = map $_->{req_h}, @$children; 1272 my @h = map $_->{req_h}, @$children;
1149 1273
1150 my $req_h = List::Util::sum @h; 1274 my $req_h = List::Util::sum @h;
1179 1303
1180############################################################################# 1304#############################################################################
1181 1305
1182package CFClient::UI::Label; 1306package CFClient::UI::Label;
1183 1307
1184our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1185 1309
1186use CFClient::OpenGL; 1310use CFClient::OpenGL;
1187 1311
1188sub new { 1312sub new {
1189 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1190 1314
1191 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1193 #font => default_font 1319 #font => default_font
1320 #text => initial text
1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1324 layout => (new CFClient::Layout),
1194 fontsize => 1, 1325 fontsize => 1,
1195 text => "",
1196 align => -1, 1326 align => -1,
1197 valign => -1, 1327 valign => -1,
1198 padding => 2, 1328 padding => 2,
1199 layout => new CFClient::Layout,
1200 can_events => 0, 1329 can_events => 0,
1201 %arg 1330 %arg
1202 ); 1331 );
1203 1332
1204 if (exists $self->{template}) { 1333 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout; 1334 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template}); 1335 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout; 1336 $self->{template} = $layout;
1208 } 1337 }
1209 1338
1210 $self->set_text (delete $self->{text}) if exists $self->{text}; 1339 if (exists $self->{markup}) {
1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1340 $self->set_markup (delete $self->{markup});
1341 } else {
1342 $self->set_text (delete $self->{text});
1343 }
1212 1344
1213 $self 1345 $self
1214} 1346}
1215 1347
1216sub escape { 1348sub escape($) {
1217 local $_ = $_[1]; 1349 local $_ = $_[0];
1218 1350
1219 s/&/&amp;/g; 1351 s/&/&amp;/g;
1220 s/>/&gt;/g; 1352 s/>/&gt;/g;
1221 s/</&lt;/g; 1353 s/</&lt;/g;
1222 1354
1223 $_[1] 1355 $_
1224} 1356}
1225 1357
1226sub update { 1358sub update {
1227 my ($self) = @_; 1359 my ($self) = @_;
1228 1360
1229 delete $self->{texture}; 1361 delete $self->{texture};
1230 $self->SUPER::update; 1362 $self->SUPER::update;
1231} 1363}
1232 1364
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1239sub set_text { 1365sub set_text {
1240 my ($self, $text) = @_; 1366 my ($self, $text) = @_;
1241 1367
1242 return if $self->{text} eq "T$text"; 1368 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text"; 1369 $self->{text} = "T$text";
1244 1370
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1245 $self->{layout}->set_text ($text); 1372 $self->{layout}->set_text ($text);
1246 1373
1247 delete $self->{texture};
1248 $self->update; 1374 $self->update;
1249 $self->check_size; 1375 $self->check_size;
1250} 1376}
1251 1377
1252sub set_markup { 1378sub set_markup {
1253 my ($self, $markup) = @_; 1379 my ($self, $markup) = @_;
1254 1380
1255 return if $self->{text} eq "M$markup"; 1381 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup"; 1382 $self->{text} = "M$markup";
1257 1383
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1258 $self->{layout}->set_markup ($markup); 1387 $self->{layout}->set_markup ($markup);
1259 1388
1260 delete $self->{texture};
1261 $self->update; 1389 $self->update;
1262 $self->check_size; 1390 $self->check_size;
1263} 1391}
1264 1392
1265sub size_request { 1393sub size_request {
1266 my ($self) = @_; 1394 my ($self) = @_;
1267 1395
1268 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $self->{layout}->set_width ($self->{max_w} || -1); 1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1271 1401
1272 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1273 1403
1274 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
1296sub set_fontsize { 1426sub set_fontsize {
1297 my ($self, $fontsize) = @_; 1427 my ($self, $fontsize) = @_;
1298 1428
1299 $self->{fontsize} = $fontsize; 1429 $self->{fontsize} = $fontsize;
1300 delete $self->{texture}; 1430 delete $self->{texture};
1431
1432 $self->update;
1301 $self->check_size; 1433 $self->check_size;
1302 $self->update;
1303} 1434}
1304 1435
1305sub _draw { 1436sub _draw {
1306 my ($self) = @_; 1437 my ($self) = @_;
1307 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1308 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}});
1309 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448
1312 new_from_layout CFClient::Texture $self->{layout} 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1450
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1453 : ($self->{w} - $tex->{w}) * 0.5);
1454
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1313 }; 1460 };
1314 1461
1315 glEnable GL_BLEND;
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319 1464
1465 if ($tex->{format} == GL_ALPHA) {
1320 glColor @{$self->{fg}}; 1466 glColor @{$self->{fg}};
1321
1322 $self->{ox} = int (
1323 $self->{align} < 0 ? $self->{padding}
1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1325 : ($self->{w} - $tex->{w}) * 0.5
1326 );
1327
1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1331 : ($self->{h} - $tex->{h}) * 0.5
1332 );
1333
1334 $tex->draw_quad ($self->{ox}, $self->{oy}); 1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 }
1335 1471
1336 glDisable GL_TEXTURE_2D; 1472 glDisable GL_TEXTURE_2D;
1337 glDisable GL_BLEND;
1338} 1473}
1339 1474
1340############################################################################# 1475#############################################################################
1341 1476
1342package CFClient::UI::EntryBase; 1477package CFClient::UI::EntryBase;
1355 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1356 can_hover => 1, 1491 can_hover => 1,
1357 can_focus => 1, 1492 can_focus => 1,
1358 valign => 0, 1493 valign => 0,
1359 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1360 @_ 1496 @_
1361 ) 1497 )
1362} 1498}
1363 1499
1364sub _set_text { 1500sub _set_text {
1375 1511
1376 $text =~ s/./*/g if $self->{hidden}; 1512 $text =~ s/./*/g if $self->{hidden};
1377 $self->{layout}->set_text ("$text "); 1513 $self->{layout}->set_text ("$text ");
1378 1514
1379 $self->emit (changed => $self->{text}); 1515 $self->emit (changed => $self->{text});
1380}
1381
1382sub get_text {
1383 $_[0]{text}
1384}
1385
1386sub size_request {
1387 my ($self) = @_;
1388
1389 my ($w, $h) = $self->SUPER::size_request;
1390
1391 ($w + 1, $h) # add 1 for cursor
1392}
1393
1394sub size_allocate {
1395 my ($self, $w, $h) = @_;
1396
1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1398} 1516}
1399 1517
1400sub set_text { 1518sub set_text {
1401 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1402 1520
1403 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1404 $self->_set_text ($text); 1522 $self->_set_text ($text);
1405 $self->update; 1523 $self->update;
1524 $self->check_size;
1525}
1526
1527sub get_text {
1528 $_[0]{text}
1529}
1530
1531sub size_request {
1532 my ($self) = @_;
1533
1534 my ($w, $h) = $self->SUPER::size_request;
1535
1536 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1406} 1543}
1407 1544
1408sub key_down { 1545sub key_down {
1409 my ($self, $ev) = @_; 1546 my ($self, $ev) = @_;
1410 1547
1412 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1413 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1414 1551
1415 my $text = $self->get_text; 1552 my $text = $self->get_text;
1416 1553
1417 if ($sym == 8) { 1554 if ($uni == 8) {
1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1419 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1420 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1421 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1422 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1423 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1424 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1425 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1426 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1427 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1428 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1430 $self->emit ('escape'); 1567 $self->emit ('escape');
1431 } elsif ($uni) { 1568 } elsif ($uni) {
1432 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1433 } 1570 }
1434 1571
1435 $self->_set_text ($text); 1572 $self->_set_text ($text);
1436 $self->update; 1573 $self->update;
1574 $self->check_size;
1437} 1575}
1438 1576
1439sub focus_in { 1577sub focus_in {
1440 my ($self) = @_; 1578 my ($self) = @_;
1441 1579
1570 my $class = shift; 1708 my $class = shift;
1571 1709
1572 $class->SUPER::new ( 1710 $class->SUPER::new (
1573 padding => 4, 1711 padding => 4,
1574 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1577 can_hover => 1, 1714 can_hover => 1,
1578 align => 0, 1715 align => 0,
1579 valign => 0, 1716 valign => 0,
1580 can_events => 1, 1717 can_events => 1,
1598 1735
1599 if ($GRAB == $self) { 1736 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg}; 1737 $self->{fg} = $self->{active_fg};
1601 } 1738 }
1602 1739
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1; 1742 glColor 0, 0, 0, 1;
1608 1743
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1744 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1610 1745
1611 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613 1747
1614 $self->SUPER::_draw; 1748 $self->SUPER::_draw;
1615} 1749}
1616 1750
1617############################################################################# 1751#############################################################################
1631 1765
1632 $class->SUPER::new ( 1766 $class->SUPER::new (
1633 padding => 2, 1767 padding => 2,
1634 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1635 active_fg => [1, 1, 0], 1769 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5],
1636 state => 0, 1772 state => 0,
1637 can_hover => 1, 1773 can_hover => 1,
1638 @_ 1774 @_
1639 ) 1775 )
1640} 1776}
1664 1800
1665 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1666 1802
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668 1804
1669 glEnable GL_BLEND; 1805 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806
1670 glEnable GL_TEXTURE_2D; 1807 glEnable GL_TEXTURE_2D;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672
1673 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674
1675 $tex->draw_quad (0, 0, $s, $s); 1808 $tex->draw_quad_alpha (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D; 1809 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679} 1810}
1680 1811
1681############################################################################# 1812#############################################################################
1682 1813
1683package CFClient::UI::Image; 1814package CFClient::UI::Image;
1726 glTranslate 0, -$self->{w}, 0; 1857 glTranslate 0, -$self->{w}, 0;
1727 1858
1728 ($w, $h) = ($h, $w); 1859 ($w, $h) = ($h, $w);
1729 } 1860 }
1730 1861
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D; 1862 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735 1864
1736 $tex->draw_quad (0, 0, $w, $h); 1865 $tex->draw_quad_alpha (0, 0, $w, $h);
1737 1866
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1740} 1868}
1741 1869
1742############################################################################# 1870#############################################################################
1743 1871
1932 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1933 2061
1934sub new { 2062sub new {
1935 my $class = shift; 2063 my $class = shift;
1936 2064
1937 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
1938 2066
1939 # TODO: 0-width page 2067 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off 2069 # TODO: calculations are off
1942 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
1944 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5],
1945 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
1946 req_w => 20, 2076 req_w => $::WIDTH / 80,
1947 req_h => 20, 2077 req_h => $::WIDTH / 80,
1948 vertical => 0, 2078 vertical => 0,
1949 can_hover => 1, 2079 can_hover => 1,
1950 inner_pad => 5, 2080 inner_pad => 0.02,
1951 @_ 2081 @_
1952 ); 2082 );
1953 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
1954 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2098sub set_value {
2099 my ($self, $value) = @_;
2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102
2103 $hi = $lo + 1 if $hi <= $lo;
2104
2105 $page = $hi - $lo if $page > $hi - $lo;
2106
2107 $value = $lo if $value < $lo;
2108 $value = $hi - $page if $value > $hi - $page;
2109
2110 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2111 if $unit;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
1955} 2119}
1956 2120
1957sub size_request { 2121sub size_request {
1958 my ($self) = @_; 2122 my ($self) = @_;
1959 2123
1965 2129
1966sub button_down { 2130sub button_down {
1967 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
1968 2132
1969 $self->SUPER::button_down ($ev, $x, $y); 2133 $self->SUPER::button_down ($ev, $x, $y);
2134
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136
1970 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
1971} 2138}
1972 2139
1973sub mouse_motion { 2140sub mouse_motion {
1974 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
1975 2142
1976 if ($GRAB == $self) { 2143 if ($GRAB == $self) {
2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2145
2146 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2151 }
2152}
2153
2154sub update {
2155 my ($self) = @_;
2156
2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2158 $self->set_value ($self->{range}[0]);
2159
1977 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
1978 2162
1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1980 2164
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2165 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2166 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1983 2167
1984 $x -= $inner_pad_px; # substract the padding 2168 $value = ($value - $lo) / $range;
1985 $x = $x * ($hi - $lo) / $inner_w + $lo; 2169 $value = $value * $self->{scale} + $self->{offset};
1986 $x = $lo if $x < $lo;
1987 $x = $hi - $page if $x > $hi - $page;
1988 $self->{range}[0] = $x;
1989 2170
1990 $self->emit (changed => $x); 2171 $self->{knob_x} = $value - $knob_w * 0.5;
1991 $self->update; 2172 $self->{knob_w} = $knob_w;
1992 } 2173 });
1993}
1994 2174
1995# the inner_* stuff is for generating a padding for the slider handle, 2175 $self->SUPER::update;
1996# so that the handle doesn't leave the texture. This calculation isn't 100%
1997# correct propably, but it does the job for now
1998sub _calc_inner_pad_px {
1999 my ($self, $w) = @_;
2000 ($w / 100) * $self->{inner_pad} # % to pixels
2001} 2176}
2002 2177
2003sub _draw { 2178sub _draw {
2004 my ($self) = @_; 2179 my ($self) = @_;
2005 2180
2006 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
2007 2182
2008 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
2009 2184
2010 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2011 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2012 2187
2188 glTranslate 1, 0, 0;
2013 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2014 glTranslate 0, -$self->{w}, 0;
2015
2016 ($w, $h) = ($h, $w);
2017 } 2190 }
2018 2191
2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2021 2194
2022 my ($value, $lo, $hi, $page) = @{$self->{range}};
2023
2024 $hi = $value + 1 if $lo == $hi;
2025
2026 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2027 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2028
2029 $page = int $page * $inner_w / ($hi - $lo);
2030 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2031
2032 $w -= $page;
2033 $page &= ~1;
2034 glTranslate $page * 0.5, 0, 0;
2035 $page ||= 2;
2036
2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2039
2040 glEnable GL_BLEND;
2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2195 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 2197
2045 # draw background 2198 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2047 2200
2048 # draw handle 2201 # draw handle
2049 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2050 2203
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2053} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2054 2247
2055############################################################################# 2248#############################################################################
2056 2249
2057package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2058 2251
2067 fontsize => 1, 2260 fontsize => 1,
2068 can_events => 0, 2261 can_events => 0,
2069 #font => default_font 2262 #font => default_font
2070 @_, 2263 @_,
2071 2264
2072 layout => (new CFClient::Layout), 2265 layout => (new CFClient::Layout 1),
2073 par => [], 2266 par => [],
2074 height => 0, 2267 height => 0,
2075 children => [ 2268 children => [
2076 (new CFClient::UI::Empty expand => 1), 2269 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1), 2270 (new CFClient::UI::Slider vertical => 1),
2078 ], 2271 ],
2079 ); 2272 );
2080 2273
2081 $self->{children}[1]->connect (changed => sub { 2274 $self->{children}[1]->connect (changed => sub { $self->update });
2082 $self->update;
2083 });
2084 2275
2085 $self 2276 $self
2086} 2277}
2087 2278
2088sub set_fontsize { 2279sub set_fontsize {
2089 my ($self, $fontsize) = @_; 2280 my ($self, $fontsize) = @_;
2090 2281
2091 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2092 $self->reflow; 2283 $self->reflow;
2093}
2094
2095sub text_height {
2096 my ($self, $text) = @_;
2097
2098 my $layout = $self->{layout};
2099
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w});
2102 $layout->set_text ($text);
2103
2104 ($layout->size)[1]
2105}
2106
2107sub reflow {
2108 my ($self) = @_;
2109
2110 $self->{need_reflow}++;
2111 $self->update;
2112} 2284}
2113 2285
2114sub size_allocate { 2286sub size_allocate {
2115 my ($self, $w, $h) = @_; 2287 my ($self, $w, $h) = @_;
2116 2288
2121 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
2122 2294
2123 $self->reflow; 2295 $self->reflow;
2124} 2296}
2125 2297
2298sub text_height {
2299 my ($self, $text, $indent) = @_;
2300
2301 my $layout = $self->{layout};
2302
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text);
2306
2307 ($layout->size)[1]
2308}
2309
2310sub reflow {
2311 my ($self) = @_;
2312
2313 $self->{need_reflow}++;
2314 $self->update;
2315}
2316
2317sub set_offset {
2318 my ($self, $offset) = @_;
2319
2320 # todo: base offset on lines or so, not on pixels
2321 $self->{children}[1]->set_value ($offset);
2322}
2323
2324sub clear {
2325 my ($self) = @_;
2326
2327 $self->{par} = [];
2328 $self->{height} = 0;
2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2330}
2331
2126sub add_paragraph { 2332sub add_paragraph {
2127 my ($self, $color, $text) = @_; 2333 my ($self, $color, $text, $indent) = @_;
2128 2334
2129 #TODO: intelligently "reformat" paragraph 2335 for my $line (split /\n/, $text) {
2130
2131 my $height = $self->text_height ($text); 2336 my $height = $self->text_height ($line);
2132
2133 $self->{height} += $height; 2337 $self->{height} += $height;
2134
2135 push @{$self->{par}}, [$height, $color, $text]; 2338 push @{$self->{par}}, [$height, $color, $indent, $line];
2339 }
2136 2340
2137 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2138 $self->{children}[1]->update;
2139} 2342}
2140 2343
2141sub update { 2344sub update {
2142 my ($self) = @_; 2345 my ($self) = @_;
2143 2346
2145 2348
2146 return unless $self->{h} > 0; 2349 return unless $self->{h} > 0;
2147 2350
2148 delete $self->{texture}; 2351 delete $self->{texture};
2149 2352
2150 $ROOT->on_refresh ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2151 if (delete $self->{need_reflow}) { 2354 if (delete $self->{need_reflow}) {
2152 my $height = 0; 2355 my $height = 0;
2153 2356
2154 $height += $_->[0] = $self->text_height ($_->[2]) 2357 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2155 for @{$self->{par}}; 2358 for @{$self->{par}};
2156 2359
2157 $self->{height} = $height; 2360 $self->{height} = $height;
2158 2361
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2362 $self->{children}[1]->set_range ([$height, 0, $height, $self->{h}, 1]);
2160 2363
2161 delete $self->{texture}; 2364 delete $self->{texture};
2162 } 2365 }
2163 2366
2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2367 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2165 glClearColor 0, 0, 0, 1; 2368 glClearColor 0.5, 0.5, 0.5, 0;
2166 glClear GL_COLOR_BUFFER_BIT; 2369 glClear GL_COLOR_BUFFER_BIT;
2167
2168 glEnable GL_BLEND;
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D;
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172 2370
2173 my $top = int $self->{children}[1]{range}[0]; 2371 my $top = int $self->{children}[1]{range}[0];
2174 2372
2175 my $y0 = $top; 2373 my $y0 = $top;
2176 my $y1 = $top + $self->{h}; 2374 my $y1 = $top + $self->{h};
2179 2377
2180 my $layout = $self->{layout}; 2378 my $layout = $self->{layout};
2181 2379
2182 $layout->set_font ($self->{font}) if $self->{font}; 2380 $layout->set_font ($self->{font}) if $self->{font};
2183 2381
2382 glEnable GL_BLEND;
2383 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2384
2184 for my $par (@{$self->{par}}) { 2385 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0]; 2386 my $h = $par->[0];
2186 2387
2187 if ($y0 < $y + $h && $y < $y1) { 2388 if ($y0 < $y + $h && $y < $y1) {
2389 $layout->set_foreground (@{ $par->[1] });
2390 $layout->set_width ($self->{w} - $par->[2]);
2188 $layout->set_text ($par->[2]); 2391 $layout->set_markup ($par->[3]);
2189 2392
2190 glColor @{ $par->[1] }; 2393 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2191 my ($W, $H) = $layout->size; 2394
2192 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2395 glRasterPos $par->[2], $y - $y0;
2396 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2193 } 2397 }
2194 2398
2195 $y += $h; 2399 $y += $h;
2196 } 2400 }
2197 2401
2198 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND; 2402 glDisable GL_BLEND;
2200 }; 2403 };
2201 }); 2404 });
2202} 2405}
2203 2406
2204sub _draw { 2407sub _draw {
2205 my ($self) = @_; 2408 my ($self) = @_;
2206 2409
2207 if ($self->{texture}) {
2208 glEnable GL_TEXTURE_2D; 2410 glEnable GL_TEXTURE_2D;
2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2411 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1; 2412 glColor 1, 1, 1, 1;
2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2413 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2212 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2213 }
2214 2415
2215 $self->{children}[1]->draw; 2416 $self->{children}[1]->draw;
2216 2417
2217} 2418}
2218 2419
2312 @_, 2513 @_,
2313 can_events => 0, 2514 can_events => 0,
2314 ) 2515 )
2315} 2516}
2316 2517
2317sub set_markup { 2518sub set_tooltip_from {
2318 my ($self, $text) = @_; 2519 my ($self, $widget) = @_;
2319 2520
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2521 $self->add (new CFClient::UI::Label
2321 $self->{label}->set_markup ($text); 2522 markup => $widget->{tooltip},
2322 $self->add ($self->{label}); 2523 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2524 fontsize => 0.8,
2525 fg => [0, 0, 0, 1],
2526 ellipsise => 0,
2527 font => ($widget->{tooltip_font} || $::FONT_PROP),
2528 );
2323} 2529}
2324 2530
2325sub size_request { 2531sub size_request {
2326 my ($self) = @_; 2532 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329 2533
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2534 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331 2535
2332 ($w + 4, $h + 4) 2536 ($w + 4, $h + 4)
2333} 2537}
2339} 2543}
2340 2544
2341sub _draw { 2545sub _draw {
2342 my ($self) = @_; 2546 my ($self) = @_;
2343 2547
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375; 2548 glTranslate 0.375, 0.375;
2346 2549
2347 my ($w, $h) = @$self{qw(w h)}; 2550 my ($w, $h) = @$self{qw(w h)};
2348 2551
2349 glColor 1, 0.8, 0.4; 2552 glColor 1, 0.8, 0.4;
2360 glVertex 0 , $h; 2563 glVertex 0 , $h;
2361 glVertex $w, $h; 2564 glVertex $w, $h;
2362 glVertex $w, 0; 2565 glVertex $w, 0;
2363 glEnd; 2566 glEnd;
2364 2567
2365 glPopMatrix; 2568 glTranslate 2 - 0.375, 2 - 0.375;
2366
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw; 2569 $self->SUPER::_draw;
2369} 2570}
2370 2571
2371############################################################################# 2572#############################################################################
2372 2573
2377use CFClient::OpenGL; 2578use CFClient::OpenGL;
2378 2579
2379sub new { 2580sub new {
2380 my $class = shift; 2581 my $class = shift;
2381 2582
2382 $class->SUPER::new ( 2583 my $self = $class->SUPER::new (
2383 aspect => 1, 2584 aspect => 1,
2384 @_, 2585 @_,
2385 ) 2586 );
2587
2588 if ($self->{anim} && $self->{animspeed}) {
2589 Scalar::Util::weaken (my $widget = $self);
2590
2591 $self->{timer} = Event->timer (
2592 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2593 hard => 1,
2594 interval => $self->{animspeed},
2595 cb => sub {
2596 ++$widget->{frame};
2597 $widget->update;
2598 },
2599 );
2600 }
2601
2602 $self
2386} 2603}
2387 2604
2388sub size_request { 2605sub size_request {
2389 (32, 8) 2606 (32, 8)
2390} 2607}
2391 2608
2609sub update {
2610 my ($self) = @_;
2611
2612 return unless $self->{visible};
2613
2614 $self->SUPER::update;
2615}
2616
2392sub draw { 2617sub _draw {
2393 my ($self) = @_; 2618 my ($self) = @_;
2394 2619
2620 return unless $::CONN;
2621
2622 my $face;
2623
2624 if ($self->{frame}) {
2625 my $anim = $::CONN->{anim}[$self->{anim}];
2626
2627 $face = $anim->[ $self->{frame} % @$anim ]
2628 if $anim && @$anim;
2629 }
2630
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2631 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2396 2632
2397 if ($tex) { 2633 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1; 2636 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2637 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND; 2639 }
2640}
2641
2642sub DESTROY {
2643 my ($self) = @_;
2644
2645 $self->{timer}->cancel
2646 if $self->{timer};
2647
2648 $self->SUPER::DESTROY;
2649}
2650
2651#############################################################################
2652
2653package CFClient::UI::InventoryItem;
2654
2655our @ISA = CFClient::UI::HBox::;
2656
2657sub _item_to_desc {
2658 my ($item) = @_;
2659
2660 my $desc =
2661 $item->{nrof} < 2
2662 ? $item->{name}
2663 : "$item->{nrof} × $item->{name_pl}";
2664
2665 $item->{flags} & Crossfire::Protocol::F_OPEN
2666 and $desc .= " (open)";
2667 $item->{flags} & Crossfire::Protocol::F_APPLIED
2668 and $desc .= " (applied)";
2669 $item->{flags} & Crossfire::Protocol::F_UNPAID
2670 and $desc .= " (unpaid)";
2671 $item->{flags} & Crossfire::Protocol::F_MAGIC
2672 and $desc .= " (magic)";
2673 $item->{flags} & Crossfire::Protocol::F_CURSED
2674 and $desc .= " (cursed)";
2675 $item->{flags} & Crossfire::Protocol::F_DAMNED
2676 and $desc .= " (damned)";
2677 $item->{flags} & Crossfire::Protocol::F_LOCKED
2678 and $desc .= " *";
2679
2680 $desc
2681}
2682
2683sub new {
2684 my $class = shift;
2685
2686 my %args = @_;
2687
2688 my $item = delete $args{item};
2689
2690 my $desc = _item_to_desc ($item);
2691
2692 my $self = $class->SUPER::new (
2693 can_hover => 1,
2694 can_events => 1,
2695 tooltip => ((CFClient::UI::Label::escape $desc)
2696 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2697 connect_button_down => sub {
2698 my ($self, $ev, $x, $y) = @_;
2699
2700 # todo: maybe put examine on 1? but should just be a tooltip :(
2701 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2702 my $targ = $::CONN->{player}{tag};
2703
2704 if ($item->{container} == $::CONN->{player}{tag}) {
2705 $targ = $main::OPENCONT;
2706 }
2707
2708 $::CONN->send ("move $targ $item->{tag} 0");
2709 } elsif ($ev->{button} == 1) {
2710 $::CONN->send ("examine $item->{tag}");
2711 } elsif ($ev->{button} == 2) {
2712 $::CONN->send ("apply $item->{tag}");
2713 } elsif ($ev->{button} == 3) {
2714 my @menu_items = (
2715 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2716 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2717 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2718 (
2719 $item->{flags} & Crossfire::Protocol::F_LOCKED
2720 ? (
2721 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2722 )
2723 : (
2724 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2725 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2726 )
2727 ),
2728 );
2729
2730 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2731 }
2732
2733 1
2734 },
2735 %args
2736 );
2737
2738
2739 $self->add (new CFClient::UI::Face
2740 can_events => 0,
2741 face => $item->{face},
2742 anim => $item->{anim},
2743 animspeed => $item->{animspeed},
2744 );
2745
2746 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2747
2748 $self->{item} = $item;
2749
2750 $self->update_item;
2751
2752 $self
2753}
2754
2755sub update_item {
2756 my ($self) = @_;
2757
2758 my $desc = _item_to_desc ($self->{item});
2759
2760 $self->{name_lbl}->set_text ($desc);
2761}
2762
2763#############################################################################
2764
2765package CFClient::UI::Inventory;
2766
2767our @ISA = CFClient::UI::ScrolledWindow::;
2768
2769sub new {
2770 my $class = shift;
2771
2772 my $self = $class->SUPER::new (
2773 scrolled => (new CFClient::UI::Table),
2774 @_,
2775 );
2776
2777 $self
2778}
2779
2780sub set_items {
2781 my ($self, $items) = @_;
2782
2783 $self->{scrolled}->clear;
2784 return unless $items;
2785
2786 my @items = sort {
2787 ($a->{type} <=> $b->{type})
2788 or ($a->{name} cmp $b->{name})
2789 } @$items;
2790
2791 $self->{real_items} = \@items;
2792
2793 for my $item (@items) {
2794 $item->{item} = $item;
2795 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2796 $item->update_item ();
2797 }
2798
2799 my $i = 0;
2800 for (@items) {
2801 $self->{scrolled}->add (0, $i, $_);
2802 my $nrof = $_->{item}->{nrof} || 1;
2803 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2804 }
2805
2806# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813
2814#############################################################################
2815
2816package CFClient::UI::Menu;
2817
2818our @ISA = CFClient::UI::FancyFrame::;
2819
2820use CFClient::OpenGL;
2821
2822sub new {
2823 my $class = shift;
2824
2825 my $self = $class->SUPER::new (
2826 items => [],
2827 z => 100,
2828 @_,
2829 );
2830
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832
2833 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item;
2835
2836 # handle various types of items, only text for now
2837 if (!ref $widget) {
2838 $widget = new CFClient::UI::Label
2839 can_hover => 1,
2840 can_events => 1,
2841 text => $widget;
2842 }
2843
2844 $self->{item}{$widget} = $item;
2845
2846 $self->{vbox}->add ($widget);
2847 }
2848
2849 $self
2850}
2851
2852# popup given the event (must be a mouse button down event currently)
2853sub popup {
2854 my ($self, $ev) = @_;
2855
2856 $self->emit ("popdown");
2857
2858 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self;
2860 $self->{button} = $ev->{button};
2861
2862 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864}
2865
2866sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_;
2868
2869 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER};
2872}
2873
2874sub button_up {
2875 my ($self, $ev, $x, $y) = @_;
2876
2877 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB;
2879 $self->hide;
2880
2881 $self->emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover};
2883 }
2884}
2885
2886#############################################################################
2887
2888package CFClient::UI::Statusbox;
2889
2890our @ISA = CFClient::UI::VBox::;
2891
2892sub new {
2893 my $class = shift;
2894
2895 $class->SUPER::new (
2896 fontsize => 0.8,
2897 @_,
2406 } 2898 )
2899}
2900
2901sub reorder {
2902 my ($self) = @_;
2903 my $NOW = time;
2904
2905 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 }
2908
2909 my @widgets;
2910
2911 my @items = sort {
2912 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} };
2915
2916 my $count = 10 + 1;
2917 for my $item (@items) {
2918 last unless --$count;
2919
2920 push @widgets, $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text};
2925
2926 for ($short) {
2927 s/^\s+//;
2928 s/\s+/ /g;
2929 }
2930
2931 new CFClient::UI::Label
2932 markup => $short,
2933 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg},
2939 can_events => 1,
2940 can_hover => 1
2941 };
2942 }
2943
2944 $self->clear;
2945 $self->SUPER::add (reverse @widgets);
2946}
2947
2948sub add {
2949 my ($self, $text, %arg) = @_;
2950
2951 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//;
2953
2954 my $timeout = time + ((delete $arg{timeout}) || 60);
2955
2956 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2957
2958 if (my $item = $self->{item}{$group}) {
2959 if ($item->{text} eq $text) {
2960 $item->{count}++;
2961 } else {
2962 $item->{count} = 1;
2963 $item->{text} = $item->{tooltip} = $text;
2964 }
2965 $item->{id} = ++$self->{id};
2966 $item->{timeout} = $timeout;
2967 delete $item->{label};
2968 } else {
2969 $self->{item}{$group} = {
2970 id => ++$self->{id},
2971 text => $text,
2972 timeout => $timeout,
2973 tooltip => $text,
2974 fg => [0.8, 0.8, 0.8, 0.8],
2975 pri => 0,
2976 count => 1,
2977 %arg,
2978 };
2979 }
2980
2981 $self->reorder;
2982}
2983
2984sub reconfigure {
2985 my ($self) = @_;
2986
2987 delete $_->{label}
2988 for values %{ $self->{item} || {} };
2989
2990 $self->reorder;
2991 $self->SUPER::reconfigure;
2407} 2992}
2408 2993
2409############################################################################# 2994#############################################################################
2410 2995
2411package CFClient::UI::Root; 2996package CFClient::UI::Root;
2412 2997
2413our @ISA = CFClient::UI::Container::; 2998our @ISA = CFClient::UI::Container::;
2414 2999
2415use CFClient::OpenGL; 3000use CFClient::OpenGL;
2416 3001
2417sub check_size { 3002sub new {
2418 my ($self) = @_; 3003 my $class = shift;
2419 3004
2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3005 $class->SUPER::new (
2421} 3006 @_,
2422 3007 )
2423sub size_request {
2424 ($::WIDTH, $::HEIGHT)
2425} 3008}
2426 3009
2427sub configure { 3010sub configure {
2428 my ($self, $x, $y, $w, $h) = @_; 3011 my ($self, $x, $y, $w, $h) = @_;
2429 3012
2430 $self->SUPER::configure ($x, $y, $w, $h); 3013 $self->{w} = $w;
3014 $self->{h} = $h;
3015}
2431 3016
3017sub check_size {
3018 my ($self) = @_;
3019
3020 $self->size_allocate ($self->{w}, $self->{h})
3021 if $self->{w};
3022}
3023
3024sub size_request {
3025 my ($self) = @_;
3026
3027 ($self->{w}, $self->{h})
3028}
3029
3030sub size_allocate {
3031 my ($self, $w, $h) = @_;
3032
3033 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3034 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3035
3036 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3037 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3038
2432 for my $child (@{$self->{children}}) { 3039 for my $child ($self->children) {
2433 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3040 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2434 3041
3042 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3043 if exists $child->{req_x};
3044
3045 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3046 if exists $child->{req_y};
3047
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2436 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050
2437 $child->configure ($X, $Y, $W,$H); 3051 $child->configure ($X, $Y, $W, $H);
2438 } 3052 }
2439} 3053}
2440 3054
2441sub _topleft { 3055sub coord2local {
2442 my ($self, $x, $y) = @_; 3056 my ($self, $x, $y) = @_;
2443 3057
2444 ($x, $y) 3058 ($x, $y)
2445} 3059}
2446 3060
3061sub coord2global {
3062 my ($self, $x, $y) = @_;
3063
3064 ($x, $y)
3065}
3066
2447sub update { 3067sub update {
2448 my ($self) = @_; 3068 my ($self) = @_;
2449 3069
2450 $self->check_size; 3070 $self->check_size;
2451 ::refresh (); 3071 $::WANT_REFRESH++;
2452} 3072}
2453 3073
2454sub add { 3074sub add {
2455 my ($self, $child) = @_; 3075 my ($self, @children) = @_;
2456 3076
3077 for my $child (@children) {
3078 $child->{toplevel} = 1;
3079
2457 # integerize window positions 3080 # integerise window positions
2458 $child->{x} = int $child->{x}; 3081 $child->{x} = int $child->{x};
2459 $child->{y} = int $child->{y}; 3082 $child->{y} = int $child->{y};
3083 }
2460 3084
2461 $self->SUPER::add ($child); 3085 $self->SUPER::add (@children);
3086
3087 while (@children) {
3088 my $w = pop @children;
3089 push @children, $w->children;
3090 $w->{visible} = 1;
3091 }
3092}
3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 delete $w->{visible};
3103 }
2462} 3104}
2463 3105
2464sub on_refresh { 3106sub on_refresh {
2465 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2466 3108
2467 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2468} 3110}
2469 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2470sub draw { 3118sub draw {
2471 my ($self) = @_; 3119 my ($self) = @_;
2472 3120
2473 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2474 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
3124 }
3125
3126 if ($self->{check_size}) {
3127 my @queue = ([], []);
3128
3129 for (;;) {
3130 if ($self->{check_size}) {
3131 # heuristic: check containers last
3132 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3133 for values %{delete $self->{check_size}}
3134 }
3135
3136 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3137
3138 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3139 ? @$widget{qw(user_w user_h)}
3140 : $widget->size_request;
3141
3142 if (delete $widget->{force_alloc}
3143 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3144 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3145
3146 $widget->{req_w} = $w;
3147 $widget->{req_h} = $h;
3148
3149 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3150
3151 $widget->{parent}->check_size
3152 if $widget->{parent};
3153 }
3154 }
3155 }
3156
3157 while ($self->{size_alloc}) {
3158 for (values %{delete $self->{size_alloc}}) {
3159 my ($widget, $w, $h) = @$_;
3160
3161 $w = 0 if $w < 0;
3162 $h = 0 if $h < 0;
3163
3164 $widget->{w} = $w;
3165 $widget->{h} = $h;
3166 $widget->size_allocate ($w, $h);
3167 $widget->emit (size_allocate => $w, $h);
3168 }
3169 }
3170
3171 while ($self->{post_alloc_hook}) {
3172 $_->()
3173 for values %{delete $self->{post_alloc_hook}};
2475 } 3174 }
2476 3175
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3176 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3177 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
2480 3179
2481 glMatrixMode GL_PROJECTION; 3180 glMatrixMode GL_PROJECTION;
2482 glLoadIdentity; 3181 glLoadIdentity;
2483 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2484 glMatrixMode GL_MODELVIEW; 3183 glMatrixMode GL_MODELVIEW;
2485 glLoadIdentity; 3184 glLoadIdentity;
2486 3185
2487 $self->_draw; 3186 $self->_draw;
2488} 3187}
2490############################################################################# 3189#############################################################################
2491 3190
2492package CFClient::UI; 3191package CFClient::UI;
2493 3192
2494$ROOT = new CFClient::UI::Root; 3193$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip; 3194$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2496 3195
24971 31961
2498 3197

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines