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.226 by root, Tue May 23 23:14:46 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);
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 );
171} 227}
172 228
173sub hide { 229sub hide {
174 my ($self) = @_; 230 my ($self) = @_;
175 231
224 $self->{y} = $y; 280 $self->{y} = $y;
225 $self->update; 281 $self->update;
226 } 282 }
227 283
228 if ($self->{w} != $w || $self->{h} != $h) { 284 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 286 }
235} 287}
236 288
237sub size_allocate { 289sub size_allocate {
238 # nothing to be done 290 # nothing to be done
239} 291}
240 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
241sub children { 300sub children {
242} 301}
243 302
244sub set_max_size { 303sub set_max_size {
245 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
246 305
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 308}
250 309
251# return top left coordinates 310sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 311 my ($self, $tooltip) = @_;
254 312
255 $self->{parent} 313 $self->{tooltip} = $tooltip;
256 or Carp::confess "no parent widget in _topleft\n";#d#
257 314
258 $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 }
259} 319}
260 320
261# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
262sub coord2local { 322sub coord2local {
263 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
264 324
265 my ($X, $Y) = $self->_topleft; 325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 326}
268 327
269# translate local coordinates to global coordinate system 328# translate local coordinates to global coordinate system
270sub coord2global { 329sub coord2global {
271 my ($self, $x, $y) = @_; 330 my ($self, $x, $y) = @_;
272 331
273 my ($X, $Y) = $self->_topleft; 332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 333}
276 334
277sub focus_in { 335sub focus_in {
278 my ($self) = @_; 336 my ($self) = @_;
279 337
351 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
354 glEnd; 412 glEnd;
355 glPopMatrix; 413 glPopMatrix;
356 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;
357 } 415 }
358} 416}
359 417
360sub _draw { 418sub _draw {
361 my ($self) = @_; 419 my ($self) = @_;
377 435
378sub set_parent { 436sub set_parent {
379 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
380 438
381 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;
382} 446}
383 447
384sub check_size { 448sub check_size {
385 my ($self) = @_; 449 my ($self, $forced) = @_;
386 450
387 $self->{parent} 451 $self->{force_alloc} = 1 if $forced;
388 or return 1; 452 $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} 453}
409 454
410sub update { 455sub update {
411 my ($self) = @_; 456 my ($self) = @_;
412 457
427} 472}
428 473
429sub DESTROY { 474sub DESTROY {
430 my ($self) = @_; 475 my ($self) = @_;
431 476
477 delete $WIDGET{$self+0};
432 #$self->deactivate; 478 #$self->deactivate;
433} 479}
434 480
435############################################################################# 481#############################################################################
436 482
445 my $class = shift; 491 my $class = shift;
446 492
447 # range [value, low, high, page] 493 # range [value, low, high, page]
448 494
449 $class->SUPER::new ( 495 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
452 @_ 498 @_
453 ) 499 )
454} 500}
455 501
456sub _draw { 502sub _draw {
457 my ($self) = @_; 503 my ($self) = @_;
458 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
460 511
461 glEnable GL_BLEND; 512 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
464 515
465 glBegin GL_QUADS; 516 glBegin GL_QUADS;
466 glVertex 0 , 0; 517 glVertex 0 , 0;
467 glVertex 0 , $h; 518 glVertex 0 , $h;
468 glVertex $w, $h; 519 glVertex $w, $h;
469 glVertex $w, 0; 520 glVertex $w, 0;
470 glEnd; 521 glEnd;
471 522
472 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
473} 525}
474 526
475############################################################################# 527#############################################################################
476 528
477package CFClient::UI::Empty; 529package CFClient::UI::Empty;
509 561
510 $self 562 $self
511} 563}
512 564
513sub add { 565sub add {
514 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
515 567
516 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
517 570
518 use sort 'stable'; 571 use sort 'stable';
519 572
520 $self->{children} = [ 573 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
523 ]; 576 ];
524 577
525 $child->check_size; 578 $self->check_size (1);
579 $self->update;
526} 580}
527 581
528sub children { 582sub children {
529 @{ $_[0]{children} } 583 @{ $_[0]{children} }
530} 584}
549 603
550 for (@$children) { 604 for (@$children) {
551 delete $_->{parent}; 605 delete $_->{parent};
552 $_->hide; 606 $_->hide;
553 } 607 }
608
609 $self->check_size;
610 $self->update;
554} 611}
555 612
556sub find_widget { 613sub find_widget {
557 my ($self, $x, $y) = @_; 614 my ($self, $x, $y) = @_;
558 615
633} 690}
634 691
635sub update { 692sub update {
636 my ($self) = @_; 693 my ($self) = @_;
637 694
638 # we want to do this delayed... 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 696 $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} 697}
652 698
653sub size_allocate { 699sub size_allocate {
654 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
655 701
656 $self->child->configure (0, 0, $w, $h); 702 $self->SUPER::size_allocate ($w, $h);
703 $self->update;
704}
657 705
706sub _render {
707 $_[0]{children}[0]->draw;
708}
709
710sub render_child {
711 my ($self) = @_;
712
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT;
716
658 $self->render_chld; 717 $self->_render;
718 };
659} 719}
660 720
661sub _draw { 721sub _draw {
662 my ($self) = @_; 722 my ($self) = @_;
663 723
664 my ($w, $h) = ($self->w, $self->h); 724 my ($w, $h) = ($self->w, $self->h);
665 725
666 my $tex = $self->{texture} 726 my $tex = $self->{texture}
667 or return; 727 or return;
668 728
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1;
673 732
674 $tex->draw_quad (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 734
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
678} 736}
679 737
680############################################################################# 738#############################################################################
681 739
682package CFClient::UI::ViewPort; 740package CFClient::UI::ViewPort;
683 741
684our @ISA = CFClient::UI::Window::; 742our @ISA = CFClient::UI::Window::;
685 743
686sub new { die }
687
688sub size_request { 744sub size_request {
689 my ($self) = @_; 745 my ($self) = @_;
690 746
691 @$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)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693 748
694 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
695} 750}
696 751
697sub _draw { 752sub size_allocate {
698 my ($self) = @_; 753 my ($self, $w, $h) = @_;
699 754
700 $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;
701} 759}
702 760
761sub set_offset {
762 my ($self, $x, $y) = @_;
703 763
704############################################################################# 764 $self->{view_x} = int $x;
765 $self->{view_y} = int $y;
705 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
706package CFClient::UI::Frame; 808package CFClient::UI::ScrolledWindow;
707 809
708our @ISA = CFClient::UI::Bin::; 810our @ISA = CFClient::UI::HBox::;
709
710use CFClient::OpenGL;
711 811
712sub new { 812sub new {
713 my $class = shift; 813 my $class = shift;
714 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
715 my $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
716 bg => [1, 1, 1, 1], 826 vp => (new CFClient::UI::ViewPort expand => 1),
717 border_bg => [1, 1, 1, 1], 827 slider => $slider,
718 border => 0.8,
719 @_ 828 @_,
720 ); 829 );
721 830
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider});
834
722 $self 835 $self
723} 836}
724 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
725sub _draw { 858sub _draw {
726 my ($self) = @_; 859 my ($self) = @_;
727 860
728 my ($w, $h) = ($self->{w}, $self->{h}); 861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
729 863
730 glEnable GL_BLEND; 864 glEnable GL_BLEND;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732 glEnable GL_TEXTURE_2D; 866 glColor @{ $self->{bg} };
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 867
735# glBegin GL_QUADS; 868 glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0; 869 glVertex 0 , 0;
738# glVertex 0 , $h; 870 glVertex 0 , $h;
739# glVertex $w, $h; 871 glVertex $w, $h;
740# glVertex $w, 0; 872 glVertex $w, 0;
741# glEnd; 873 glEnd;
742 874
743
744 $self->child->draw;
745 glDisable GL_BLEND; 875 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D; 876 }
877
878 $self->SUPER::_draw;
747} 879}
748 880
749############################################################################# 881#############################################################################
750 882
751package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
764 # TODO: user_x, user_y, overwrite moveto? 896 # TODO: user_x, user_y, overwrite moveto?
765 897
766 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
769 border => 0.8, 901 border => 0.6,
902 toplevel => 1,
770 can_events => 1, 903 can_events => 1,
771 @_ 904 @_
772 ); 905 );
773 906
774 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 908 align => 0,
776 valign => 1, 909 valign => 1,
777 text => $self->{title}, 910 text => $self->{title},
778 fontsize => 1; 911 fontsize => $self->{border};
779 912
780 $self 913 $self
781} 914}
782 915
783sub border { 916sub border {
799 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
800 933
801 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
803 936
804 $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)
805 if $self->{title}; 938 if $self->{title};
806 939
807 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
808} 941}
809 942
810sub button_down { 943sub button_down {
811 my ($self, $ev, $x, $y) = @_; 944 my ($self, $ev, $x, $y) = @_;
812 945
946 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 947 my $border = $self->border;
814 948
815 if ($x < $self->{w} && $x >= $self->{w} - $border 949 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 950 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 951
952 if ($lr & $td) {
953 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 954 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 955 my ($bw, $bh) = ($self->{w}, $self->{h});
820 956
957 my $mx = $x < $border;
958 my $my = $y < $border;
959
821 $self->{motion} = sub { 960 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 961 my ($ev, $x, $y) = @_;
823 962
824 ($x, $y) = ($ev->{x}, $ev->{y}); 963 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy;
825 965
826 $self->{user_w} = $bw + $x - $ox; 966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
828 $self->check_size; 969 $self->check_size;
829 }; 970 };
830 971
831 } elsif ($x >= 0 && $x < $self->{w} 972 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 973 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 974 my ($bx, $by) = ($self->{x}, $self->{y});
836 975
837 $self->{motion} = sub { 976 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 977 my ($ev, $x, $y) = @_;
861 my ($self) = @_; 1000 my ($self) = @_;
862 1001
863 my ($w, $h ) = ($self->{w}, $self->{h}); 1002 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 1004
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 1005 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 1007
871 my $border = $self->border; 1008 my $border = $self->border;
872 1009
873 glColor @{ $self->{border_bg} }; 1010 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
878 1015
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
879 my $bg = $tex[0]; 1017 my $bg = $tex[0];
880 1018
881 # TODO: repeat texture not scale 1019 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1020 my $rep_x = $cw / $bg->{w};
883 my $rep_y = $ch / $bg->{h}; 1021 my $rep_y = $ch / $bg->{h};
884 1022
885 glColor @{ $self->{bg} }; 1023 glColor @{ $self->{bg} };
886 1024
887 $bg->{s} = $rep_x; 1025 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y; 1026 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1; 1027 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 }
891 1030
892 glDisable GL_TEXTURE_2D; 1031 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1032
895 $self->{title}->draw if $self->{title}; 1033 $self->{title}->draw if $self->{title};
1034
896 $self->child->draw; 1035 $self->child->draw;
897} 1036}
898 1037
899############################################################################# 1038#############################################################################
900 1039
1124} 1263}
1125 1264
1126sub size_allocate { 1265sub size_allocate {
1127 my ($self, $w, $h) = @_; 1266 my ($self, $w, $h) = @_;
1128 1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1129 my $children = $self->{children}; 1270 my $children = $self->{children};
1130 1271
1131 my @h = map $_->{req_h}, @$children; 1272 my @h = map $_->{req_h}, @$children;
1132 1273
1133 my $req_h = List::Util::sum @h; 1274 my $req_h = List::Util::sum @h;
1162 1303
1163############################################################################# 1304#############################################################################
1164 1305
1165package CFClient::UI::Label; 1306package CFClient::UI::Label;
1166 1307
1167our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1168 1309
1169use CFClient::OpenGL; 1310use CFClient::OpenGL;
1170 1311
1171sub new { 1312sub new {
1172 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1173 1314
1174 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1176 #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),
1177 fontsize => 1, 1325 fontsize => 1,
1178 text => "",
1179 align => -1, 1326 align => -1,
1180 valign => -1, 1327 valign => -1,
1181 padding => 2, 1328 padding => 2,
1182 layout => new CFClient::Layout,
1183 can_events => 0, 1329 can_events => 0,
1184 %arg 1330 %arg
1185 ); 1331 );
1186 1332
1187 if (exists $self->{template}) { 1333 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1334 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1335 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1336 $self->{template} = $layout;
1191 } 1337 }
1192 1338
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1339 if (exists $self->{markup}) {
1194 $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 }
1195 1344
1196 $self 1345 $self
1197} 1346}
1198 1347
1199sub escape { 1348sub escape($) {
1200 local $_ = $_[1]; 1349 local $_ = $_[0];
1201 1350
1202 s/&/&amp;/g; 1351 s/&/&amp;/g;
1203 s/>/&gt;/g; 1352 s/>/&gt;/g;
1204 s/</&lt;/g; 1353 s/</&lt;/g;
1205 1354
1206 $_[1] 1355 $_
1356}
1357
1358sub update {
1359 my ($self) = @_;
1360
1361 delete $self->{texture};
1362 $self->SUPER::update;
1207} 1363}
1208 1364
1209sub set_text { 1365sub set_text {
1210 my ($self, $text) = @_; 1366 my ($self, $text) = @_;
1211 1367
1368 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text";
1370
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212 $self->{layout}->set_text ($text); 1372 $self->{layout}->set_text ($text);
1213 1373
1214 delete $self->{texture}; 1374 $self->update;
1215 $self->check_size; 1375 $self->check_size;
1216 $self->update;
1217} 1376}
1218 1377
1219sub set_markup { 1378sub set_markup {
1220 my ($self, $markup) = @_; 1379 my ($self, $markup) = @_;
1221 1380
1381 return if $self->{text} eq "M$markup";
1382 $self->{text} = "M$markup";
1383
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222 $self->{layout}->set_markup ($markup); 1387 $self->{layout}->set_markup ($markup);
1223 1388
1224 delete $self->{texture}; 1389 $self->update;
1225 $self->check_size; 1390 $self->check_size;
1226 $self->update;
1227} 1391}
1228 1392
1229sub size_request { 1393sub size_request {
1230 my ($self) = @_; 1394 my ($self) = @_;
1231 1395
1232 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $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});
1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235 1401
1236 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1237 1403
1238 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
1260sub set_fontsize { 1426sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1427 my ($self, $fontsize) = @_;
1262 1428
1263 $self->{fontsize} = $fontsize; 1429 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1430 delete $self->{texture};
1431
1432 $self->update;
1265 $self->check_size; 1433 $self->check_size;
1266 $self->update;
1267} 1434}
1268 1435
1269sub _draw { 1436sub _draw {
1270 my ($self) = @_; 1437 my ($self) = @_;
1271 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1272 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $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});
1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448
1276 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
1277 }; 1460 };
1278 1461
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1464
1465 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1466 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}); 1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 }
1299 1471
1300 glDisable GL_TEXTURE_2D; 1472 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1473}
1303 1474
1304############################################################################# 1475#############################################################################
1305 1476
1306package CFClient::UI::EntryBase; 1477package CFClient::UI::EntryBase;
1319 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1320 can_hover => 1, 1491 can_hover => 1,
1321 can_focus => 1, 1492 can_focus => 1,
1322 valign => 0, 1493 valign => 0,
1323 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1324 @_ 1496 @_
1325 ) 1497 )
1326} 1498}
1327 1499
1328sub _set_text { 1500sub _set_text {
1339 1511
1340 $text =~ s/./*/g if $self->{hidden}; 1512 $text =~ s/./*/g if $self->{hidden};
1341 $self->{layout}->set_text ("$text "); 1513 $self->{layout}->set_text ("$text ");
1342 1514
1343 $self->emit (changed => $self->{text}); 1515 $self->emit (changed => $self->{text});
1344}
1345
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} 1516}
1363 1517
1364sub set_text { 1518sub set_text {
1365 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1366 1520
1367 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1368 $self->_set_text ($text); 1522 $self->_set_text ($text);
1369 $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
1370} 1543}
1371 1544
1372sub key_down { 1545sub key_down {
1373 my ($self, $ev) = @_; 1546 my ($self, $ev) = @_;
1374 1547
1376 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1378 1551
1379 my $text = $self->get_text; 1552 my $text = $self->get_text;
1380 1553
1381 if ($sym == 8) { 1554 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1567 $self->emit ('escape');
1395 } elsif ($uni) { 1568 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1570 }
1398 1571
1399 $self->_set_text ($text); 1572 $self->_set_text ($text);
1400 $self->update; 1573 $self->update;
1574 $self->check_size;
1401} 1575}
1402 1576
1403sub focus_in { 1577sub focus_in {
1404 my ($self) = @_; 1578 my ($self) = @_;
1405 1579
1534 my $class = shift; 1708 my $class = shift;
1535 1709
1536 $class->SUPER::new ( 1710 $class->SUPER::new (
1537 padding => 4, 1711 padding => 4,
1538 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1541 can_hover => 1, 1714 can_hover => 1,
1542 align => 0, 1715 align => 0,
1543 valign => 0, 1716 valign => 0,
1544 can_events => 1, 1717 can_events => 1,
1562 1735
1563 if ($GRAB == $self) { 1736 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1737 $self->{fg} = $self->{active_fg};
1565 } 1738 }
1566 1739
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1742 glColor 0, 0, 0, 1;
1572 1743
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1744 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1745
1575 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1747
1578 $self->SUPER::_draw; 1748 $self->SUPER::_draw;
1579} 1749}
1580 1750
1581############################################################################# 1751#############################################################################
1595 1765
1596 $class->SUPER::new ( 1766 $class->SUPER::new (
1597 padding => 2, 1767 padding => 2,
1598 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1599 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],
1600 state => 0, 1772 state => 0,
1601 can_hover => 1, 1773 can_hover => 1,
1602 @_ 1774 @_
1603 ) 1775 )
1604} 1776}
1628 1800
1629 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;
1630 1802
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1804
1633 glEnable GL_BLEND; 1805 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806
1634 glEnable GL_TEXTURE_2D; 1807 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); 1808 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1809 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1810}
1644 1811
1645############################################################################# 1812#############################################################################
1646 1813
1647package CFClient::UI::Image; 1814package CFClient::UI::Image;
1690 glTranslate 0, -$self->{w}, 0; 1857 glTranslate 0, -$self->{w}, 0;
1691 1858
1692 ($w, $h) = ($h, $w); 1859 ($w, $h) = ($h, $w);
1693 } 1860 }
1694 1861
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1862 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1864
1700 $tex->draw_quad (0, 0, $w, $h); 1865 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1866
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1704} 1868}
1705 1869
1706############################################################################# 1870#############################################################################
1707 1871
1755} 1919}
1756 1920
1757sub set_max { 1921sub set_max {
1758 my ($self, $max) = @_; 1922 my ($self, $max) = @_;
1759 1923
1924 return if $self->{max_val} == $max;
1925
1760 $self->{max_val} = $max; 1926 $self->{max_val} = $max;
1927 $self->update;
1761} 1928}
1762 1929
1763sub set_value { 1930sub set_value {
1764 my ($self, $val, $max) = @_; 1931 my ($self, $val, $max) = @_;
1765 1932
1766 $self->set_max ($max) 1933 $self->set_max ($max)
1767 if defined $max; 1934 if defined $max;
1768 1935
1769 $max = $self->{max_val}; 1936 return if $self->{val} == $val;
1937
1770 $self->{val} = $val; 1938 $self->{val} = $val;
1771
1772 $self->update; 1939 $self->update;
1773} 1940}
1774 1941
1775sub _draw { 1942sub _draw {
1776 my ($self) = @_; 1943 my ($self) = @_;
1859 2026
1860 $self->{value}->set_fontsize ($fsize); 2027 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2028 $self->{max} ->set_fontsize ($fsize);
1862} 2029}
1863 2030
2031sub set_max {
2032 my ($self, $max) = @_;
2033
2034 $self->{gauge}->set_max ($max);
2035 $self->{max}->set_text ($max);
2036}
2037
1864sub set_value { 2038sub set_value {
1865 my ($self, $val, $max) = @_; 2039 my ($self, $val, $max) = @_;
1866 2040
1867 $self->set_max ($max) 2041 $self->set_max ($max)
1868 if defined $max; 2042 if defined $max;
1869 2043
1870 $self->{gauge}->set_value ($val, $max); 2044 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2045 $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} 2046}
1880 2047
1881############################################################################# 2048#############################################################################
1882 2049
1883package CFClient::UI::Slider; 2050package CFClient::UI::Slider;
1893 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1894 2061
1895sub new { 2062sub new {
1896 my $class = shift; 2063 my $class = shift;
1897 2064
1898 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
1899 2066
1900 # TODO: 0-width page 2067 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2069 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
1905 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],
1906 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
1907 req_w => 20, 2076 req_w => $::WIDTH / 80,
1908 req_h => 20, 2077 req_h => $::WIDTH / 80,
1909 vertical => 0, 2078 vertical => 0,
1910 can_hover => 1, 2079 can_hover => 1,
1911 inner_pad => 5, 2080 inner_pad => 0.02,
1912 @_ 2081 @_
1913 ); 2082 );
1914 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
1915 $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 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi;
2107
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
1916} 2119}
1917 2120
1918sub size_request { 2121sub size_request {
1919 my ($self) = @_; 2122 my ($self) = @_;
1920 2123
1933 2136
1934sub mouse_motion { 2137sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
1936 2139
1937 if ($GRAB == $self) { 2140 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142
2143 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2146
2147 $self->set_value ($x * ($hi - $lo) + $lo);
2148 }
2149}
2150
2151sub update {
2152 my ($self) = @_;
2153
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]);
2156
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2157 my ($value, $lo, $hi, $page) = @{$self->{range}};
1939 2158
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2159 my $inner_w = 1 - 2 * $self->{inner_pad};
1941 2160
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1944 2162
1945 $x -= $inner_pad_px; # substract the padding 2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2164 $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 2165
1951 $self->emit (changed => $x); 2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
1952 $self->update; 2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value;
2172 $self->{knob_w} = $page;
1953 } 2173 });
1954}
1955 2174
1956# the inner_* stuff is for generating a padding for the slider handle, 2175 $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} 2176}
1963 2177
1964sub _draw { 2178sub _draw {
1965 my ($self) = @_; 2179 my ($self) = @_;
1966 2180
1967 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
1968 2182
1969 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
1970 2184
1971 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
1973 2187
2188 glTranslate 1, 0, 0;
1974 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2190 }
1979 2191
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2194
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; 2195 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2197
2006 # draw background 2198 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2200
2009 # draw handle 2201 # draw handle
2010 $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);
2011 2203
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2014} 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 (@_) }
2015 2247
2016############################################################################# 2248#############################################################################
2017 2249
2018package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2019 2251
2028 fontsize => 1, 2260 fontsize => 1,
2029 can_events => 0, 2261 can_events => 0,
2030 #font => default_font 2262 #font => default_font
2031 @_, 2263 @_,
2032 2264
2033 layout => (new CFClient::Layout), 2265 layout => (new CFClient::Layout 1),
2034 par => [], 2266 par => [],
2035 height => 0, 2267 height => 0,
2036 children => [ 2268 children => [
2037 (new CFClient::UI::Empty expand => 1), 2269 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2270 (new CFClient::UI::Slider vertical => 1),
2039 ], 2271 ],
2040 ); 2272 );
2041 2273
2042 $self->{children}[1]->connect (changed => sub { 2274 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2275
2046 $self 2276 $self
2047} 2277}
2048 2278
2049sub set_fontsize { 2279sub set_fontsize {
2050 my ($self, $fontsize) = @_; 2280 my ($self, $fontsize) = @_;
2051 2281
2052 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2053 $self->reflow; 2283 $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} 2284}
2074 2285
2075sub size_allocate { 2286sub size_allocate {
2076 my ($self, $w, $h) = @_; 2287 my ($self, $w, $h) = @_;
2077 2288
2082 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
2083 2294
2084 $self->reflow; 2295 $self->reflow;
2085} 2296}
2086 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 clear {
2318 my ($self) = @_;
2319
2320 $self->{par} = [];
2321 $self->{height} = 0;
2322
2323 $self->reflow;
2324}
2325
2087sub add_paragraph { 2326sub add_paragraph {
2088 my ($self, $color, $text) = @_; 2327 my ($self, $color, $text, $indent) = @_;
2089 2328
2090 #TODO: intelligently "reformat" paragraph 2329 for my $line (split /\n/, $text) {
2091
2092 my $height = $self->text_height ($text); 2330 my $height = $self->text_height ($line);
2093
2094 $self->{height} += $height; 2331 $self->{height} += $height;
2095
2096 push @{$self->{par}}, [$height, $color, $text]; 2332 push @{$self->{par}}, [$height, $color, $indent, $line];
2333 }
2097 2334
2098 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2099 $self->{children}[1]->update; 2336 $self->{children}[1]->update;
2100} 2337}
2101 2338
2106 2343
2107 return unless $self->{h} > 0; 2344 return unless $self->{h} > 0;
2108 2345
2109 delete $self->{texture}; 2346 delete $self->{texture};
2110 2347
2111 $ROOT->on_refresh ($self, sub { 2348 $ROOT->on_post_alloc ($self, sub {
2112 if (delete $self->{need_reflow}) { 2349 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2350 my $height = 0;
2114 2351
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2116 for @{$self->{par}}; 2353 for @{$self->{par}};
2117 2354
2118 $self->{height} = $height; 2355 $self->{height} = $height;
2119 2356
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2358 $self->{children}[1]->update;
2121 2359
2122 delete $self->{texture}; 2360 delete $self->{texture};
2123 } 2361 }
2124 2362
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2126 glClearColor 0, 0, 0, 1; 2364 glClearColor 0.5, 0.5, 0.5, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2365 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 2366
2134 my $top = int $self->{children}[1]{range}[0]; 2367 my $top = int $self->{children}[1]{range}[0];
2135 2368
2136 my $y0 = $top; 2369 my $y0 = $top;
2137 my $y1 = $top + $self->{h}; 2370 my $y1 = $top + $self->{h};
2140 2373
2141 my $layout = $self->{layout}; 2374 my $layout = $self->{layout};
2142 2375
2143 $layout->set_font ($self->{font}) if $self->{font}; 2376 $layout->set_font ($self->{font}) if $self->{font};
2144 2377
2378 glEnable GL_BLEND;
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380
2145 for my $par (@{$self->{par}}) { 2381 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2382 my $h = $par->[0];
2147 2383
2148 if ($y0 < $y + $h && $y < $y1) { 2384 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] });
2386 $layout->set_width ($self->{w} - $par->[2]);
2149 $layout->set_text ($par->[2]); 2387 $layout->set_markup ($par->[3]);
2150 2388
2151 glColor @{ $par->[1] }; 2389 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2152 my ($W, $H) = $layout->size; 2390
2153 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2391 glRasterPos $par->[2], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2154 } 2393 }
2155 2394
2156 $y += $h; 2395 $y += $h;
2157 } 2396 }
2158 2397
2159 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND; 2398 glDisable GL_BLEND;
2161 }; 2399 };
2162 }); 2400 });
2163} 2401}
2164 2402
2165sub _draw { 2403sub _draw {
2166 my ($self) = @_; 2404 my ($self) = @_;
2167 2405
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2408 glColor 1, 1, 1, 1;
2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2409 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173 glDisable GL_TEXTURE_2D; 2410 glDisable GL_TEXTURE_2D;
2174 }
2175 2411
2176 $self->{children}[1]->draw; 2412 $self->{children}[1]->draw;
2177 2413
2178} 2414}
2179 2415
2273 @_, 2509 @_,
2274 can_events => 0, 2510 can_events => 0,
2275 ) 2511 )
2276} 2512}
2277 2513
2278sub set_markup { 2514sub set_tooltip_from {
2279 my ($self, $text) = @_; 2515 my ($self, $widget) = @_;
2280 2516
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2517 $self->add (new CFClient::UI::Label
2282 $self->{label}->set_markup ($text); 2518 markup => $widget->{tooltip},
2283 $self->add ($self->{label}); 2519 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2520 fontsize => 0.8,
2521 fg => [0, 0, 0, 1],
2522 ellipsise => 0,
2523 font => ($widget->{tooltip_font} || $::FONT_PROP),
2524 );
2284} 2525}
2285 2526
2286sub size_request { 2527sub size_request {
2287 my ($self) = @_; 2528 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2529
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2530 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2531
2293 ($w + 4, $h + 4) 2532 ($w + 4, $h + 4)
2294} 2533}
2300} 2539}
2301 2540
2302sub _draw { 2541sub _draw {
2303 my ($self) = @_; 2542 my ($self) = @_;
2304 2543
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2544 glTranslate 0.375, 0.375;
2307 2545
2308 my ($w, $h) = @$self{qw(w h)}; 2546 my ($w, $h) = @$self{qw(w h)};
2309 2547
2310 glColor 1, 0.8, 0.4; 2548 glColor 1, 0.8, 0.4;
2321 glVertex 0 , $h; 2559 glVertex 0 , $h;
2322 glVertex $w, $h; 2560 glVertex $w, $h;
2323 glVertex $w, 0; 2561 glVertex $w, 0;
2324 glEnd; 2562 glEnd;
2325 2563
2326 glPopMatrix; 2564 glTranslate 2 - 0.375, 2 - 0.375;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2565 $self->SUPER::_draw;
2330} 2566}
2331 2567
2332############################################################################# 2568#############################################################################
2333 2569
2338use CFClient::OpenGL; 2574use CFClient::OpenGL;
2339 2575
2340sub new { 2576sub new {
2341 my $class = shift; 2577 my $class = shift;
2342 2578
2343 $class->SUPER::new ( 2579 my $self = $class->SUPER::new (
2344 aspect => 1, 2580 aspect => 1,
2345 @_, 2581 @_,
2346 ) 2582 );
2583
2584 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self);
2586
2587 $self->{timer} = Event->timer (
2588 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2589 hard => 1,
2590 interval => $self->{animspeed},
2591 cb => sub {
2592 ++$widget->{frame};
2593 $widget->update;
2594 },
2595 );
2596 }
2597
2598 $self
2347} 2599}
2348 2600
2349sub size_request { 2601sub size_request {
2350 (32, 8) 2602 (32, 8)
2351} 2603}
2352 2604
2605sub update {
2606 my ($self) = @_;
2607
2608 return unless $self->{visible};
2609
2610 $self->SUPER::update;
2611}
2612
2353sub draw { 2613sub _draw {
2354 my ($self) = @_; 2614 my ($self) = @_;
2355 2615
2616 return unless $::CONN;#d# manage and cache textures differently
2617
2618 my $face;
2619
2620 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}];
2622
2623 $face = $anim->[ $self->{frame} % @$anim ]
2624 if $anim && @$anim;
2625 }
2626
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2627 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2357 2628
2358 if ($tex) { 2629 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2632 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2633 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND; 2635 }
2636}
2637
2638sub DESTROY {
2639 my ($self) = @_;
2640
2641 $self->{timer}->cancel
2642 if $self->{timer};
2643
2644 $self->SUPER::DESTROY;
2645}
2646
2647#############################################################################
2648
2649package CFClient::UI::InventoryItem;
2650
2651our @ISA = CFClient::UI::HBox::;
2652
2653sub _item_to_desc {
2654 my ($item) = @_;
2655
2656 my $desc =
2657 $item->{nrof} < 2
2658 ? $item->{name}
2659 : "$item->{nrof} × $item->{name_pl}";
2660
2661 $item->{flags} & Crossfire::Protocol::F_OPEN
2662 and $desc .= " (open)";
2663 $item->{flags} & Crossfire::Protocol::F_APPLIED
2664 and $desc .= " (applied)";
2665 $item->{flags} & Crossfire::Protocol::F_UNPAID
2666 and $desc .= " (unpaid)";
2667 $item->{flags} & Crossfire::Protocol::F_MAGIC
2668 and $desc .= " (magic)";
2669 $item->{flags} & Crossfire::Protocol::F_CURSED
2670 and $desc .= " (cursed)";
2671 $item->{flags} & Crossfire::Protocol::F_DAMNED
2672 and $desc .= " (damned)";
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED
2674 and $desc .= " *";
2675
2676 $desc
2677}
2678
2679sub new {
2680 my $class = shift;
2681
2682 my %args = @_;
2683
2684 my $item = delete $args{item};
2685
2686 my $desc = _item_to_desc ($item);
2687
2688 my $self = $class->SUPER::new (
2689 can_hover => 1,
2690 can_events => 1,
2691 tooltip => ((CFClient::UI::Label::escape $desc)
2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2693 connect_button_down => sub {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2698 my $targ = $::CONN->{player}{tag};
2699
2700 if ($item->{container} == $::CONN->{player}{tag}) {
2701 $targ = $main::OPENCONT;
2702 }
2703
2704 $::CONN->send ("move $targ $item->{tag} 0");
2705 } elsif ($ev->{button} == 1) {
2706 $::CONN->send ("examine $item->{tag}");
2707 } elsif ($ev->{button} == 2) {
2708 $::CONN->send ("apply $item->{tag}");
2709 } elsif ($ev->{button} == 3) {
2710 my @menu_items = (
2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2712 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2713 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714 (
2715 $item->{flags} & Crossfire::Protocol::F_LOCKED
2716 ? (
2717 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718 )
2719 : (
2720 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2721 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2722 )
2723 ),
2724 );
2725
2726 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2727 }
2728
2729 1
2730 },
2731 %args
2732 );
2733
2734
2735 $self->add (new CFClient::UI::Face
2736 can_events => 0,
2737 face => $item->{face},
2738 anim => $item->{anim},
2739 animspeed => $item->{animspeed},
2740 );
2741
2742 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2743
2744 $self->{item} = $item;
2745
2746 $self->update_item;
2747
2748 $self
2749}
2750
2751sub update_item {
2752 my ($self) = @_;
2753
2754 my $desc = _item_to_desc ($self->{item});
2755
2756 $self->{name_lbl}->set_text ($desc);
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 for my $item (@items) {
2790 $item->{item} = $item;
2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792 $item->update_item ();
2793 }
2794
2795 my $i = 0;
2796 for (@items) {
2797 $self->{scrolled}->add (0, $i, $_);
2798 my $nrof = $_->{item}->{nrof} || 1;
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800 }
2801
2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2803}
2804
2805sub size_request {
2806 my ($self) = @_;
2807 ($self->{req_w}, $self->{req_h});
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Menu;
2813
2814our @ISA = CFClient::UI::FancyFrame::;
2815
2816use CFClient::OpenGL;
2817
2818sub new {
2819 my $class = shift;
2820
2821 my $self = $class->SUPER::new (
2822 items => [],
2823 z => 100,
2824 @_,
2825 );
2826
2827 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2828
2829 for my $item (@{ $self->{items} }) {
2830 my ($widget, $cb) = @$item;
2831
2832 # handle various types of items, only text for now
2833 if (!ref $widget) {
2834 $widget = new CFClient::UI::Label
2835 can_hover => 1,
2836 can_events => 1,
2837 text => $widget;
2838 }
2839
2840 $self->{item}{$widget} = $item;
2841
2842 $self->{vbox}->add ($widget);
2843 }
2844
2845 $self
2846}
2847
2848# popup given the event (must be a mouse button down event currently)
2849sub popup {
2850 my ($self, $ev) = @_;
2851
2852 $self->emit ("popdown");
2853
2854 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self;
2856 $self->{button} = $ev->{button};
2857
2858 $self->show;
2859 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860}
2861
2862sub mouse_motion {
2863 my ($self, $ev, $x, $y) = @_;
2864
2865 # TODO: should use vbox->find_widget or so
2866 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867 $self->{hover} = $self->{item}{$HOVER};
2868}
2869
2870sub button_up {
2871 my ($self, $ev, $x, $y) = @_;
2872
2873 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB;
2875 $self->hide;
2876
2877 $self->emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover};
2879 }
2880}
2881
2882#############################################################################
2883
2884package CFClient::UI::Statusbox;
2885
2886our @ISA = CFClient::UI::VBox::;
2887
2888sub new {
2889 my $class = shift;
2890
2891 $class->SUPER::new (
2892 fontsize => 0.8,
2893 @_,
2367 } 2894 )
2895}
2896
2897sub reorder {
2898 my ($self) = @_;
2899 my $NOW = time;
2900
2901 while (my ($k, $v) = each %{ $self->{item} }) {
2902 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2903 }
2904
2905 my @widgets;
2906
2907 my @items = sort {
2908 $a->{pri} <=> $b->{pri}
2909 or $b->{id} <=> $a->{id}
2910 } values %{ $self->{item} };
2911
2912 my $count = 10 + 1;
2913 for my $item (@items) {
2914 last unless --$count;
2915
2916 push @widgets, $item->{label} ||= do {
2917 # TODO: doesn't handle markup well (read as: at all)
2918 my $short = $item->{count} > 1
2919 ? "<b>$item->{count} ×</b> $item->{text}"
2920 : $item->{text};
2921
2922 for ($short) {
2923 s/^\s+//;
2924 s/\s+/ /g;
2925 }
2926
2927 new CFClient::UI::Label
2928 markup => $short,
2929 tooltip => $item->{tooltip},
2930 tooltip_font => $::FONT_PROP,
2931 tooltip_width => 0.67,
2932 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44,
2934 fg => $item->{fg},
2935 can_events => 1,
2936 can_hover => 1
2937 };
2938 }
2939
2940 $self->clear;
2941 $self->SUPER::add (reverse @widgets);
2942}
2943
2944sub add {
2945 my ($self, $text, %arg) = @_;
2946
2947 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//;
2949
2950 my $timeout = time + ((delete $arg{timeout}) || 60);
2951
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953
2954 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) {
2956 $item->{count}++;
2957 } else {
2958 $item->{count} = 1;
2959 $item->{text} = $item->{tooltip} = $text;
2960 }
2961 $item->{id} = ++$self->{id};
2962 $item->{timeout} = $timeout;
2963 delete $item->{label};
2964 } else {
2965 $self->{item}{$group} = {
2966 id => ++$self->{id},
2967 text => $text,
2968 timeout => $timeout,
2969 tooltip => $text,
2970 fg => [0.8, 0.8, 0.8, 0.8],
2971 pri => 0,
2972 count => 1,
2973 %arg,
2974 };
2975 }
2976
2977 $self->reorder;
2978}
2979
2980sub reconfigure {
2981 my ($self) = @_;
2982
2983 delete $_->{label}
2984 for values %{ $self->{item} || {} };
2985
2986 $self->reorder;
2987 $self->SUPER::reconfigure;
2368} 2988}
2369 2989
2370############################################################################# 2990#############################################################################
2371 2991
2372package CFClient::UI::Root; 2992package CFClient::UI::Root;
2373 2993
2374our @ISA = CFClient::UI::Container::; 2994our @ISA = CFClient::UI::Container::;
2375 2995
2376use CFClient::OpenGL; 2996use CFClient::OpenGL;
2377 2997
2378sub check_size { 2998sub new {
2379 my ($self) = @_; 2999 my $class = shift;
2380 3000
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3001 $class->SUPER::new (
2382} 3002 @_,
2383 3003 )
2384sub size_request {
2385 ($::WIDTH, $::HEIGHT)
2386} 3004}
2387 3005
2388sub configure { 3006sub configure {
2389 my ($self, $x, $y, $w, $h) = @_; 3007 my ($self, $x, $y, $w, $h) = @_;
2390 3008
2391 $self->SUPER::configure ($x, $y, $w, $h); 3009 $self->{w} = $w;
3010 $self->{h} = $h;
3011}
2392 3012
3013sub check_size {
3014 my ($self) = @_;
3015
3016 $self->size_allocate ($self->{w}, $self->{h})
3017 if $self->{w};
3018}
3019
3020sub size_request {
3021 my ($self) = @_;
3022
3023 ($self->{w}, $self->{h})
3024}
3025
3026sub size_allocate {
3027 my ($self, $w, $h) = @_;
3028
3029 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3030 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3031
3032 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3033 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3034
2393 for my $child (@{$self->{children}}) { 3035 for my $child ($self->children) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3036 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395 3037
3038 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3039 if exists $child->{req_x};
3040
3041 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3042 if exists $child->{req_y};
3043
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3044 $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; 3045 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3046
2398 $child->configure ($X, $Y, $W,$H); 3047 $child->configure ($X, $Y, $W, $H);
2399 } 3048 }
2400} 3049}
2401 3050
2402sub _topleft { 3051sub coord2local {
2403 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2404 3053
2405 ($x, $y) 3054 ($x, $y)
2406} 3055}
2407 3056
3057sub coord2global {
3058 my ($self, $x, $y) = @_;
3059
3060 ($x, $y)
3061}
3062
2408sub update { 3063sub update {
2409 my ($self) = @_; 3064 my ($self) = @_;
2410 3065
2411 $self->check_size; 3066 $self->check_size;
2412 ::refresh (); 3067 $::WANT_REFRESH++;
2413} 3068}
2414 3069
2415sub add { 3070sub add {
2416 my ($self, $child) = @_; 3071 my ($self, @children) = @_;
2417 3072
3073 for my $child (@children) {
3074 $child->{toplevel} = 1;
3075
2418 # integerize window positions 3076 # integerise window positions
2419 $child->{x} = int $child->{x}; 3077 $child->{x} = int $child->{x};
2420 $child->{y} = int $child->{y}; 3078 $child->{y} = int $child->{y};
3079 }
2421 3080
2422 $self->SUPER::add ($child); 3081 $self->SUPER::add (@children);
3082
3083 while (@children) {
3084 my $w = pop @children;
3085 push @children, $w->children;
3086 $w->{visible} = 1;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 }
2423} 3100}
2424 3101
2425sub on_refresh { 3102sub on_refresh {
2426 my ($self, $id, $cb) = @_; 3103 my ($self, $id, $cb) = @_;
2427 3104
2428 $self->{refresh_hook}{$id} = $cb; 3105 $self->{refresh_hook}{$id} = $cb;
2429} 3106}
2430 3107
3108sub on_post_alloc {
3109 my ($self, $id, $cb) = @_;
3110
3111 $self->{post_alloc_hook}{$id} = $cb;
3112}
3113
2431sub draw { 3114sub draw {
2432 my ($self) = @_; 3115 my ($self) = @_;
2433 3116
2434 while (my $rcb = delete $self->{refresh_hook}) { 3117 while ($self->{refresh_hook}) {
2435 $_->() for values %$rcb; 3118 $_->()
3119 for values %{delete $self->{refresh_hook}};
3120 }
3121
3122 if ($self->{check_size}) {
3123 my @queue = ([], []);
3124
3125 for (;;) {
3126 if ($self->{check_size}) {
3127 # heuristic: check containers last
3128 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3129 for values %{delete $self->{check_size}}
3130 }
3131
3132 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3133
3134 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3135 ? @$widget{qw(user_w user_h)}
3136 : $widget->size_request;
3137
3138 if (delete $widget->{force_alloc}
3139 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3140 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3141
3142 $widget->{req_w} = $w;
3143 $widget->{req_h} = $h;
3144
3145 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3146
3147 $widget->{parent}->check_size
3148 if $widget->{parent};
3149 }
3150 }
3151 }
3152
3153 while ($self->{size_alloc}) {
3154 for (values %{delete $self->{size_alloc}}) {
3155 my ($widget, $w, $h) = @$_;
3156
3157 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0;
3159
3160 $widget->{w} = $w;
3161 $widget->{h} = $h;
3162 $widget->size_allocate ($w, $h);
3163 $widget->emit (size_allocate => $w, $h);
3164 }
3165 }
3166
3167 while ($self->{post_alloc_hook}) {
3168 $_->()
3169 for values %{delete $self->{post_alloc_hook}};
2436 } 3170 }
2437 3171
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3172 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3173 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2441 3175
2442 glMatrixMode GL_PROJECTION; 3176 glMatrixMode GL_PROJECTION;
2443 glLoadIdentity; 3177 glLoadIdentity;
2444 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3178 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2445 glMatrixMode GL_MODELVIEW; 3179 glMatrixMode GL_MODELVIEW;
2446 glLoadIdentity; 3180 glLoadIdentity;
2447 3181
2448 $self->_draw; 3182 $self->_draw;
2449} 3183}
2451############################################################################# 3185#############################################################################
2452 3186
2453package CFClient::UI; 3187package CFClient::UI;
2454 3188
2455$ROOT = new CFClient::UI::Root; 3189$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip; 3190$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457 3191
24581 31921
2459 3193

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines