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.224 by elmex, Tue May 23 20:00:55 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)}); 748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
710 749
711 @$self{qw(child_w child_h)} 750 @$self{qw(child_w child_h)}
712} 751}
713 752
714sub _draw { 753sub size_allocate {
715 my ($self) = @_; 754 my ($self, $w, $h) = @_;
716 755
717 $self->{children}[1]->draw; 756 $self->update;
718} 757}
719 758
759sub set_offset {
760 my ($self, $x, $y) = @_;
761
762 $self->{view_x} = int $x;
763 $self->{view_y} = int $y;
764
765 $self->update;
766}
767
768# hmm, this does not work for topleft of $self... but we should not ask for that
769sub coord2local {
770 my ($self, $x, $y) = @_;
771
772 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
773}
774
775sub coord2global {
776 my ($self, $x, $y) = @_;
777
778 $x = List::Util::min $self->{w}, $x - $self->{view_x};
779 $y = List::Util::min $self->{h}, $y - $self->{view_y};
780
781 $self->SUPER::coord2global ($x, $y)
782}
783
784sub find_widget {
785 my ($self, $x, $y) = @_;
786
787 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
788 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
789 ) {
790 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
791 } else {
792 $self->CFClient::UI::Base::find_widget ($x, $y)
793 }
794}
795
796sub _render {
797 my ($self) = @_;
798
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800
801 $self->SUPER::_render;
802}
720 803
721############################################################################# 804#############################################################################
722 805
723package CFClient::UI::Frame; 806package CFClient::UI::ScrolledWindow;
724 807
725our @ISA = CFClient::UI::Bin::; 808our @ISA = CFClient::UI::HBox::;
726
727use CFClient::OpenGL;
728 809
729sub new { 810sub new {
730 my $class = shift; 811 my $class = shift;
731 812
813 my $self;
814
815 my $slider = new CFClient::UI::Slider
816 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
820 },
821 ;
822
732 my $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
733 bg => [1, 1, 1, 1], 824 vp => (new CFClient::UI::ViewPort expand => 1),
734 border_bg => [1, 1, 1, 1], 825 slider => $slider,
735 border => 0.8,
736 @_ 826 @_,
737 ); 827 );
738 828
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider});
832
739 $self 833 $self
740} 834}
741 835
836#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll
838
839#############################################################################
840
841package CFClient::UI::Frame;
842
843our @ISA = CFClient::UI::Bin::;
844
845use CFClient::OpenGL;
846
847sub new {
848 my $class = shift;
849
850 $class->SUPER::new (
851 bg => undef,
852 @_,
853 )
854}
855
742sub _draw { 856sub _draw {
743 my ($self) = @_; 857 my ($self) = @_;
744 858
745 my ($w, $h) = ($self->{w}, $self->{h}); 859 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)};
746 861
747 glEnable GL_BLEND; 862 glEnable GL_BLEND;
748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D; 864 glColor @{ $self->{bg} };
750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
751 865
752# glBegin GL_QUADS; 866 glBegin GL_QUADS;
753# glColor 0, 0, 0, 0;
754# glVertex 0 , 0; 867 glVertex 0 , 0;
755# glVertex 0 , $h; 868 glVertex 0 , $h;
756# glVertex $w, $h; 869 glVertex $w, $h;
757# glVertex $w, 0; 870 glVertex $w, 0;
758# glEnd; 871 glEnd;
759 872
760
761 $self->child->draw;
762 glDisable GL_BLEND; 873 glDisable GL_BLEND;
763 glDisable GL_TEXTURE_2D; 874 }
875
876 $self->SUPER::_draw;
764} 877}
765 878
766############################################################################# 879#############################################################################
767 880
768package CFClient::UI::FancyFrame; 881package CFClient::UI::FancyFrame;
… …
781 # TODO: user_x, user_y, overwrite moveto? 894 # TODO: user_x, user_y, overwrite moveto?
782 895
783 my $self = $class->SUPER::new ( 896 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1], 897 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1], 898 border_bg => [1, 1, 1, 1],
786 border => 0.8, 899 border => 0.6,
900 toplevel => 1,
787 can_events => 1, 901 can_events => 1,
788 @_ 902 @_
789 ); 903 );
790 904
791 $self->{title} &&= new CFClient::UI::Label 905 $self->{title} &&= new CFClient::UI::Label
792 align => 0, 906 align => 0,
793 valign => 1, 907 valign => 1,
794 text => $self->{title}, 908 text => $self->{title},
795 fontsize => 1; 909 fontsize => $self->{border};
796 910
797 $self 911 $self
798} 912}
799 913
800sub border { 914sub border {
… …
816 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
817 931
818 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
819 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
820 934
821 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
822 if $self->{title}; 936 if $self->{title};
823 937
824 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
825} 939}
826 940
827sub button_down { 941sub button_down {
828 my ($self, $ev, $x, $y) = @_; 942 my ($self, $ev, $x, $y) = @_;
829 943
944 my ($w, $h) = @$self{qw(w h)};
830 my $border = $self->border; 945 my $border = $self->border;
831 946
832 if ($x < $self->{w} && $x >= $self->{w} - $border 947 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
833 && $y < $self->{h} && $y >= $self->{h} - $border) { 948 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
834 949
950 if ($lr & $td) {
951 my ($wx, $wy) = ($self->{x}, $self->{y});
835 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 952 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h}); 953 my ($bw, $bh) = ($self->{w}, $self->{h});
837 954
955 my $mx = $x < $border;
956 my $my = $y < $border;
957
838 $self->{motion} = sub { 958 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_; 959 my ($ev, $x, $y) = @_;
840 960
841 ($x, $y) = ($ev->{x}, $ev->{y}); 961 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy;
842 963
843 $self->{user_w} = $bw + $x - $ox; 964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
844 $self->{user_h} = $bh + $y - $oy; 965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
845 $self->check_size; 967 $self->check_size;
846 }; 968 };
847 969
848 } elsif ($x >= 0 && $x < $self->{w} 970 } elsif ($lr ^ $td) {
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 971 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y}); 972 my ($bx, $by) = ($self->{x}, $self->{y});
853 973
854 $self->{motion} = sub { 974 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_; 975 my ($ev, $x, $y) = @_;
… …
878 my ($self) = @_; 998 my ($self) = @_;
879 999
880 my ($w, $h ) = ($self->{w}, $self->{h}); 1000 my ($w, $h ) = ($self->{w}, $self->{h});
881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
882 1002
883 glEnable GL_BLEND;
884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
885 glEnable GL_TEXTURE_2D; 1003 glEnable GL_TEXTURE_2D;
886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
887 1005
888 my $border = $self->border; 1006 my $border = $self->border;
889 1007
890 glColor @{ $self->{border_bg} }; 1008 glColor @{ $self->{border_bg} };
891 $tex[1]->draw_quad (0, 0, $w, $border); 1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch); 1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
895 1013
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
896 my $bg = $tex[0]; 1015 my $bg = $tex[0];
897 1016
898 # TODO: repeat texture not scale 1017 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w}; 1018 my $rep_x = $cw / $bg->{w};
900 my $rep_y = $ch / $bg->{h}; 1019 my $rep_y = $ch / $bg->{h};
901 1020
902 glColor @{ $self->{bg} }; 1021 glColor @{ $self->{bg} };
903 1022
904 $bg->{s} = $rep_x; 1023 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y; 1024 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1; 1025 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch); 1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 }
908 1028
909 glDisable GL_TEXTURE_2D; 1029 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND;
911 1030
912 $self->{title}->draw if $self->{title}; 1031 $self->{title}->draw if $self->{title};
1032
913 $self->child->draw; 1033 $self->child->draw;
914} 1034}
915 1035
916############################################################################# 1036#############################################################################
917 1037
… …
1141} 1261}
1142 1262
1143sub size_allocate { 1263sub size_allocate {
1144 my ($self, $w, $h) = @_; 1264 my ($self, $w, $h) = @_;
1145 1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1146 my $children = $self->{children}; 1268 my $children = $self->{children};
1147 1269
1148 my @h = map $_->{req_h}, @$children; 1270 my @h = map $_->{req_h}, @$children;
1149 1271
1150 my $req_h = List::Util::sum @h; 1272 my $req_h = List::Util::sum @h;
… …
1179 1301
1180############################################################################# 1302#############################################################################
1181 1303
1182package CFClient::UI::Label; 1304package CFClient::UI::Label;
1183 1305
1184our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1185 1307
1186use CFClient::OpenGL; 1308use CFClient::OpenGL;
1187 1309
1188sub new { 1310sub new {
1189 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1190 1312
1191 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1193 #font => default_font 1317 #font => default_font
1318 #text => initial text
1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1322 layout => (new CFClient::Layout),
1194 fontsize => 1, 1323 fontsize => 1,
1195 text => "",
1196 align => -1, 1324 align => -1,
1197 valign => -1, 1325 valign => -1,
1198 padding => 2, 1326 padding => 2,
1199 layout => new CFClient::Layout,
1200 can_events => 0, 1327 can_events => 0,
1201 %arg 1328 %arg
1202 ); 1329 );
1203 1330
1204 if (exists $self->{template}) { 1331 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout; 1332 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template}); 1333 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout; 1334 $self->{template} = $layout;
1208 } 1335 }
1209 1336
1210 $self->set_text (delete $self->{text}) if exists $self->{text}; 1337 if (exists $self->{markup}) {
1211 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1338 $self->set_markup (delete $self->{markup});
1339 } else {
1340 $self->set_text (delete $self->{text});
1341 }
1212 1342
1213 $self 1343 $self
1214} 1344}
1215 1345
1216sub escape { 1346sub escape($) {
1217 local $_ = $_[1]; 1347 local $_ = $_[0];
1218 1348
1219 s/&/&amp;/g; 1349 s/&/&amp;/g;
1220 s/>/&gt;/g; 1350 s/>/&gt;/g;
1221 s/</&lt;/g; 1351 s/</&lt;/g;
1222 1352
1223 $_[1] 1353 $_
1224} 1354}
1225 1355
1226sub update { 1356sub update {
1227 my ($self) = @_; 1357 my ($self) = @_;
1228 1358
1229 delete $self->{texture}; 1359 delete $self->{texture};
1230 $self->SUPER::update; 1360 $self->SUPER::update;
1231} 1361}
1232 1362
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1239sub set_text { 1363sub set_text {
1240 my ($self, $text) = @_; 1364 my ($self, $text) = @_;
1241 1365
1242 return if $self->{text} eq "T$text"; 1366 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text"; 1367 $self->{text} = "T$text";
1244 1368
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1245 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1246 1371
1247 delete $self->{texture};
1248 $self->update; 1372 $self->update;
1249 $self->check_size; 1373 $self->check_size;
1250} 1374}
1251 1375
1252sub set_markup { 1376sub set_markup {
1253 my ($self, $markup) = @_; 1377 my ($self, $markup) = @_;
1254 1378
1255 return if $self->{text} eq "M$markup"; 1379 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup"; 1380 $self->{text} = "M$markup";
1257 1381
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1258 $self->{layout}->set_markup ($markup); 1385 $self->{layout}->set_markup ($markup);
1259 1386
1260 delete $self->{texture};
1261 $self->update; 1387 $self->update;
1262 $self->check_size; 1388 $self->check_size;
1263} 1389}
1264 1390
1265sub size_request { 1391sub size_request {
1266 my ($self) = @_; 1392 my ($self) = @_;
1267 1393
1268 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $self->{layout}->set_width ($self->{max_w} || -1); 1395 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1271 1399
1272 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1273 1401
1274 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1296sub set_fontsize { 1424sub set_fontsize {
1297 my ($self, $fontsize) = @_; 1425 my ($self, $fontsize) = @_;
1298 1426
1299 $self->{fontsize} = $fontsize; 1427 $self->{fontsize} = $fontsize;
1300 delete $self->{texture}; 1428 delete $self->{texture};
1429
1430 $self->update;
1301 $self->check_size; 1431 $self->check_size;
1302 $self->update;
1303} 1432}
1304 1433
1305sub _draw { 1434sub _draw {
1306 my ($self) = @_; 1435 my ($self) = @_;
1307 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1308 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1440 $self->{layout}->set_foreground (@{$self->{fg}});
1309 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $self->{layout}->set_width ($self->{w}); 1442 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446
1312 new_from_layout CFClient::Texture $self->{layout} 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1448
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5);
1452
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1455 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1313 }; 1458 };
1314 1459
1315 glEnable GL_BLEND;
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319 1462
1463 if ($tex->{format} == GL_ALPHA) {
1320 glColor @{$self->{fg}}; 1464 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}); 1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1466 } else {
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1468 }
1335 1469
1336 glDisable GL_TEXTURE_2D; 1470 glDisable GL_TEXTURE_2D;
1337 glDisable GL_BLEND;
1338} 1471}
1339 1472
1340############################################################################# 1473#############################################################################
1341 1474
1342package CFClient::UI::EntryBase; 1475package CFClient::UI::EntryBase;
… …
1377 $self->{layout}->set_text ("$text "); 1510 $self->{layout}->set_text ("$text ");
1378 1511
1379 $self->emit (changed => $self->{text}); 1512 $self->emit (changed => $self->{text});
1380} 1513}
1381 1514
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}
1399
1400sub set_text { 1515sub set_text {
1401 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1402 1517
1403 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1404 $self->_set_text ($text); 1519 $self->_set_text ($text);
1405 $self->update; 1520 $self->update;
1521 $self->check_size;
1522}
1523
1524sub get_text {
1525 $_[0]{text}
1526}
1527
1528sub size_request {
1529 my ($self) = @_;
1530
1531 my ($w, $h) = $self->SUPER::size_request;
1532
1533 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1406} 1540}
1407 1541
1408sub key_down { 1542sub key_down {
1409 my ($self, $ev) = @_; 1543 my ($self, $ev) = @_;
1410 1544
… …
1412 my $sym = $ev->{sym}; 1546 my $sym = $ev->{sym};
1413 my $uni = $ev->{unicode}; 1547 my $uni = $ev->{unicode};
1414 1548
1415 my $text = $self->get_text; 1549 my $text = $self->get_text;
1416 1550
1417 if ($sym == 8) { 1551 if ($uni == 8) {
1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1552 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1419 } elsif ($sym == 127) { 1553 } elsif ($uni == 127) {
1420 substr $text, $self->{cursor}, 1, ""; 1554 substr $text, $self->{cursor}, 1, "";
1421 } elsif ($sym == CFClient::SDLK_LEFT) { 1555 } elsif ($sym == CFClient::SDLK_LEFT) {
1422 --$self->{cursor} if $self->{cursor}; 1556 --$self->{cursor} if $self->{cursor};
1423 } elsif ($sym == CFClient::SDLK_RIGHT) { 1557 } elsif ($sym == CFClient::SDLK_RIGHT) {
1424 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1558 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1425 } elsif ($sym == CFClient::SDLK_HOME) { 1559 } elsif ($sym == CFClient::SDLK_HOME) {
1426 $self->{cursor} = 0; 1560 $self->{cursor} = 0;
1427 } elsif ($sym == CFClient::SDLK_END) { 1561 } elsif ($sym == CFClient::SDLK_END) {
1428 $self->{cursor} = length $text; 1562 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) { 1563 } elsif ($uni == 27) {
1430 $self->emit ('escape'); 1564 $self->emit ('escape');
1431 } elsif ($uni) { 1565 } elsif ($uni) {
1432 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1433 } 1567 }
1434 1568
1435 $self->_set_text ($text); 1569 $self->_set_text ($text);
1436 $self->update; 1570 $self->update;
1571 $self->check_size;
1437} 1572}
1438 1573
1439sub focus_in { 1574sub focus_in {
1440 my ($self) = @_; 1575 my ($self) = @_;
1441 1576
… …
1570 my $class = shift; 1705 my $class = shift;
1571 1706
1572 $class->SUPER::new ( 1707 $class->SUPER::new (
1573 padding => 4, 1708 padding => 4,
1574 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1577 can_hover => 1, 1711 can_hover => 1,
1578 align => 0, 1712 align => 0,
1579 valign => 0, 1713 valign => 0,
1580 can_events => 1, 1714 can_events => 1,
… …
1598 1732
1599 if ($GRAB == $self) { 1733 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg}; 1734 $self->{fg} = $self->{active_fg};
1601 } 1735 }
1602 1736
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D; 1737 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1; 1739 glColor 0, 0, 0, 1;
1608 1740
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1741 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1610 1742
1611 glDisable GL_TEXTURE_2D; 1743 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613 1744
1614 $self->SUPER::_draw; 1745 $self->SUPER::_draw;
1615} 1746}
1616 1747
1617############################################################################# 1748#############################################################################
… …
1631 1762
1632 $class->SUPER::new ( 1763 $class->SUPER::new (
1633 padding => 2, 1764 padding => 2,
1634 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1635 active_fg => [1, 1, 0], 1766 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5],
1636 state => 0, 1769 state => 0,
1637 can_hover => 1, 1770 can_hover => 1,
1638 @_ 1771 @_
1639 ) 1772 )
1640} 1773}
… …
1664 1797
1665 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1666 1799
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668 1801
1669 glEnable GL_BLEND; 1802 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803
1670 glEnable GL_TEXTURE_2D; 1804 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); 1805 $tex->draw_quad_alpha (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D; 1806 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679} 1807}
1680 1808
1681############################################################################# 1809#############################################################################
1682 1810
1683package CFClient::UI::Image; 1811package CFClient::UI::Image;
… …
1726 glTranslate 0, -$self->{w}, 0; 1854 glTranslate 0, -$self->{w}, 0;
1727 1855
1728 ($w, $h) = ($h, $w); 1856 ($w, $h) = ($h, $w);
1729 } 1857 }
1730 1858
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D; 1859 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735 1861
1736 $tex->draw_quad (0, 0, $w, $h); 1862 $tex->draw_quad_alpha (0, 0, $w, $h);
1737 1863
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D; 1864 glDisable GL_TEXTURE_2D;
1740} 1865}
1741 1866
1742############################################################################# 1867#############################################################################
1743 1868
… …
1932 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
1933 2058
1934sub new { 2059sub new {
1935 my $class = shift; 2060 my $class = shift;
1936 2061
1937 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
1938 2063
1939 # TODO: 0-width page 2064 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off 2066 # TODO: calculations are off
1942 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
1944 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5],
1945 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
1946 req_w => 20, 2073 req_w => $::WIDTH / 80,
1947 req_h => 20, 2074 req_h => $::WIDTH / 80,
1948 vertical => 0, 2075 vertical => 0,
1949 can_hover => 1, 2076 can_hover => 1,
1950 inner_pad => 5, 2077 inner_pad => 0.02,
1951 @_ 2078 @_
1952 ); 2079 );
1953 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
1954 $self 2084 $self
2085}
2086
2087sub set_value {
2088 my ($self, $value) = @_;
2089
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091
2092 $hi = $lo + 1 if $hi <= $lo;
2093
2094 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi;
2096
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103
2104 if ($value != $old_value) {
2105 $self->emit (changed => $value);
2106 $self->update;
2107 }
1955} 2108}
1956 2109
1957sub size_request { 2110sub size_request {
1958 my ($self) = @_; 2111 my ($self) = @_;
1959 2112
… …
1972 2125
1973sub mouse_motion { 2126sub mouse_motion {
1974 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
1975 2128
1976 if ($GRAB == $self) { 2129 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131
2132 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2135
2136 $self->set_value ($x * ($hi - $lo) + $lo);
2137 }
2138}
2139
2140sub update {
2141 my ($self) = @_;
2142
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]);
2145
1977 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
1978 2147
1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
1980 2149
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1983 2151
1984 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1985 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
1986 $x = $lo if $x < $lo;
1987 $x = $hi - $page if $x > $hi - $page;
1988 $self->{range}[0] = $x;
1989 2154
1990 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
1991 $self->update; 2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value;
2161 $self->{knob_w} = $page;
1992 } 2162 });
1993}
1994 2163
1995# the inner_* stuff is for generating a padding for the slider handle, 2164 $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} 2165}
2002 2166
2003sub _draw { 2167sub _draw {
2004 my ($self) = @_; 2168 my ($self) = @_;
2005 2169
2006 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
2007 2171
2008 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
2009 2173
2010 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
2011 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
2012 2176
2177 glTranslate 1, 0, 0;
2013 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
2014 glTranslate 0, -$self->{w}, 0;
2015
2016 ($w, $h) = ($h, $w);
2017 } 2179 }
2018 2180
2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2021 2183
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; 2184 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 2186
2045 # draw background 2187 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2047 2189
2048 # draw handle 2190 # draw handle
2049 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2050 2192
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
2053} 2194}
2054 2195
2055############################################################################# 2196#############################################################################
2056 2197
… …
2067 fontsize => 1, 2208 fontsize => 1,
2068 can_events => 0, 2209 can_events => 0,
2069 #font => default_font 2210 #font => default_font
2070 @_, 2211 @_,
2071 2212
2072 layout => (new CFClient::Layout), 2213 layout => (new CFClient::Layout 1),
2073 par => [], 2214 par => [],
2074 height => 0, 2215 height => 0,
2075 children => [ 2216 children => [
2076 (new CFClient::UI::Empty expand => 1), 2217 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1), 2218 (new CFClient::UI::Slider vertical => 1),
2078 ], 2219 ],
2079 ); 2220 );
2080 2221
2081 $self->{children}[1]->connect (changed => sub { 2222 $self->{children}[1]->connect (changed => sub { $self->update });
2082 $self->update;
2083 });
2084 2223
2085 $self 2224 $self
2086} 2225}
2087 2226
2088sub set_fontsize { 2227sub set_fontsize {
2089 my ($self, $fontsize) = @_; 2228 my ($self, $fontsize) = @_;
2090 2229
2091 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
2092 $self->reflow; 2231 $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} 2232}
2113 2233
2114sub size_allocate { 2234sub size_allocate {
2115 my ($self, $w, $h) = @_; 2235 my ($self, $w, $h) = @_;
2116 2236
… …
2121 $self->{layout}->set_width ($self->{children}[0]{w}); 2241 $self->{layout}->set_width ($self->{children}[0]{w});
2122 2242
2123 $self->reflow; 2243 $self->reflow;
2124} 2244}
2125 2245
2246sub text_height {
2247 my ($self, $text, $indent) = @_;
2248
2249 my $layout = $self->{layout};
2250
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text);
2254
2255 ($layout->size)[1]
2256}
2257
2258sub reflow {
2259 my ($self) = @_;
2260
2261 $self->{need_reflow}++;
2262 $self->update;
2263}
2264
2126sub add_paragraph { 2265sub add_paragraph {
2127 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2128 2267
2129 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2130 2269
2270 for my $line (split /\n/, $text) {
2131 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2132
2133 $self->{height} += $height; 2272 $self->{height} += $height;
2134
2135 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2136 2275
2137 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2138 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2139} 2278}
2140 2279
… …
2145 2284
2146 return unless $self->{h} > 0; 2285 return unless $self->{h} > 0;
2147 2286
2148 delete $self->{texture}; 2287 delete $self->{texture};
2149 2288
2150 $ROOT->on_refresh ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2151 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2152 my $height = 0; 2291 my $height = 0;
2153 2292
2154 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2155 for @{$self->{par}}; 2294 for @{$self->{par}};
2156 2295
2157 $self->{height} = $height; 2296 $self->{height} = $height;
2158 2297
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2299 $self->{children}[1]->update;
2160 2300
2161 delete $self->{texture}; 2301 delete $self->{texture};
2162 } 2302 }
2163 2303
2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2165 glClearColor 0, 0, 0, 1; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2166 glClear GL_COLOR_BUFFER_BIT; 2306 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 2307
2173 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2174 2309
2175 my $y0 = $top; 2310 my $y0 = $top;
2176 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2179 2314
2180 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2181 2316
2182 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2183 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2184 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0]; 2323 my $h = $par->[0];
2186 2324
2187 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2188 $layout->set_text ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2189 2329
2190 glColor @{ $par->[1] }; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2191 my ($W, $H) = $layout->size; 2331
2192 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2332 glRasterPos $par->[2], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2193 } 2334 }
2194 2335
2195 $y += $h; 2336 $y += $h;
2196 } 2337 }
2197 2338
2198 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND; 2339 glDisable GL_BLEND;
2200 }; 2340 };
2201 }); 2341 });
2202} 2342}
2203 2343
2204sub _draw { 2344sub _draw {
2205 my ($self) = @_; 2345 my ($self) = @_;
2206 2346
2207 if ($self->{texture}) {
2208 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1; 2349 glColor 1, 1, 1, 1;
2211 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2212 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2213 }
2214 2352
2215 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2216 2354
2217} 2355}
2218 2356
… …
2312 @_, 2450 @_,
2313 can_events => 0, 2451 can_events => 0,
2314 ) 2452 )
2315} 2453}
2316 2454
2317sub set_markup { 2455sub set_tooltip_from {
2318 my ($self, $text) = @_; 2456 my ($self, $widget) = @_;
2319 2457
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2458 $self->add (new CFClient::UI::Label
2321 $self->{label}->set_markup ($text); 2459 markup => $widget->{tooltip},
2322 $self->add ($self->{label}); 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8,
2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2465 );
2323} 2466}
2324 2467
2325sub size_request { 2468sub size_request {
2326 my ($self) = @_; 2469 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329 2470
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2471 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331 2472
2332 ($w + 4, $h + 4) 2473 ($w + 4, $h + 4)
2333} 2474}
… …
2339} 2480}
2340 2481
2341sub _draw { 2482sub _draw {
2342 my ($self) = @_; 2483 my ($self) = @_;
2343 2484
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375; 2485 glTranslate 0.375, 0.375;
2346 2486
2347 my ($w, $h) = @$self{qw(w h)}; 2487 my ($w, $h) = @$self{qw(w h)};
2348 2488
2349 glColor 1, 0.8, 0.4; 2489 glColor 1, 0.8, 0.4;
… …
2360 glVertex 0 , $h; 2500 glVertex 0 , $h;
2361 glVertex $w, $h; 2501 glVertex $w, $h;
2362 glVertex $w, 0; 2502 glVertex $w, 0;
2363 glEnd; 2503 glEnd;
2364 2504
2365 glPopMatrix; 2505 glTranslate 2 - 0.375, 2 - 0.375;
2366
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw; 2506 $self->SUPER::_draw;
2369} 2507}
2370 2508
2371############################################################################# 2509#############################################################################
2372 2510
… …
2377use CFClient::OpenGL; 2515use CFClient::OpenGL;
2378 2516
2379sub new { 2517sub new {
2380 my $class = shift; 2518 my $class = shift;
2381 2519
2382 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2383 aspect => 1, 2521 aspect => 1,
2384 @_, 2522 @_,
2385 ) 2523 );
2524
2525 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self);
2527
2528 $self->{timer} = Event->timer (
2529 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2530 hard => 1,
2531 interval => $self->{animspeed},
2532 cb => sub {
2533 ++$widget->{frame};
2534 $widget->update;
2535 },
2536 );
2537 }
2538
2539 $self
2386} 2540}
2387 2541
2388sub size_request { 2542sub size_request {
2389 (32, 8) 2543 (32, 8)
2390} 2544}
2391 2545
2546sub update {
2547 my ($self) = @_;
2548
2549 return unless $self->{visible};
2550
2551 $self->SUPER::update;
2552}
2553
2392sub draw { 2554sub _draw {
2393 my ($self) = @_; 2555 my ($self) = @_;
2394 2556
2557 return unless $::CONN;#d# manage and cache textures differently
2558
2559 my $face;
2560
2561 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}];
2563
2564 $face = $anim->[ $self->{frame} % @$anim ]
2565 if $anim && @$anim;
2566 }
2567
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2396 2569
2397 if ($tex) { 2570 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D; 2571 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1; 2573 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D; 2575 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 } 2576 }
2577}
2578
2579sub DESTROY {
2580 my ($self) = @_;
2581
2582 $self->{timer}->cancel
2583 if $self->{timer};
2584
2585 $self->SUPER::DESTROY;
2407} 2586}
2408 2587
2409############################################################################# 2588#############################################################################
2410 2589
2590package CFClient::UI::InventoryItem;
2591
2592our @ISA = CFClient::UI::HBox::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749}
2750
2751#############################################################################
2752
2753package CFClient::UI::Menu;
2754
2755our @ISA = CFClient::UI::FancyFrame::;
2756
2757use CFClient::OpenGL;
2758
2759sub new {
2760 my $class = shift;
2761
2762 my $self = $class->SUPER::new (
2763 items => [],
2764 z => 100,
2765 @_,
2766 );
2767
2768 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2769
2770 for my $item (@{ $self->{items} }) {
2771 my ($widget, $cb) = @$item;
2772
2773 # handle various types of items, only text for now
2774 if (!ref $widget) {
2775 $widget = new CFClient::UI::Label
2776 can_hover => 1,
2777 can_events => 1,
2778 text => $widget;
2779 }
2780
2781 $self->{item}{$widget} = $item;
2782
2783 $self->{vbox}->add ($widget);
2784 }
2785
2786 $self
2787}
2788
2789# popup given the event (must be a mouse button down event currently)
2790sub popup {
2791 my ($self, $ev) = @_;
2792
2793 $self->emit ("popdown");
2794
2795 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self;
2797 $self->{button} = $ev->{button};
2798
2799 $self->show;
2800 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2801}
2802
2803sub mouse_motion {
2804 my ($self, $ev, $x, $y) = @_;
2805
2806 # TODO: should use vbox->find_widget or so
2807 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808 $self->{hover} = $self->{item}{$HOVER};
2809}
2810
2811sub button_up {
2812 my ($self, $ev, $x, $y) = @_;
2813
2814 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB;
2816 $self->hide;
2817
2818 $self->emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover};
2820 }
2821}
2822
2823#############################################################################
2824
2825package CFClient::UI::Statusbox;
2826
2827our @ISA = CFClient::UI::VBox::;
2828
2829sub new {
2830 my $class = shift;
2831
2832 $class->SUPER::new (
2833 fontsize => 0.8,
2834 @_,
2835 )
2836}
2837
2838sub reorder {
2839 my ($self) = @_;
2840 my $NOW = time;
2841
2842 while (my ($k, $v) = each %{ $self->{item} }) {
2843 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2844 }
2845
2846 my @widgets;
2847
2848 my @items = sort {
2849 $a->{pri} <=> $b->{pri}
2850 or $b->{id} <=> $a->{id}
2851 } values %{ $self->{item} };
2852
2853 my $count = 10 + 1;
2854 for my $item (@items) {
2855 last unless --$count;
2856
2857 push @widgets, $item->{label} ||= do {
2858 # TODO: doesn't handle markup well (read as: at all)
2859 my $short = $item->{count} > 1
2860 ? "<b>$item->{count} ×</b> $item->{text}"
2861 : $item->{text};
2862
2863 for ($short) {
2864 s/^\s+//;
2865 s/\s+/ /g;
2866 }
2867
2868 new CFClient::UI::Label
2869 markup => $short,
2870 tooltip => $item->{tooltip},
2871 tooltip_font => $::FONT_PROP,
2872 tooltip_width => 0.67,
2873 fontsize => $item->{fontsize} || $self->{fontsize},
2874 max_w => $::WIDTH * 0.44,
2875 fg => $item->{fg},
2876 can_events => 1,
2877 can_hover => 1
2878 };
2879 }
2880
2881 $self->clear;
2882 $self->SUPER::add (reverse @widgets);
2883}
2884
2885sub add {
2886 my ($self, $text, %arg) = @_;
2887
2888 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//;
2890
2891 my $timeout = time + ((delete $arg{timeout}) || 60);
2892
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894
2895 if (my $item = $self->{item}{$group}) {
2896 if ($item->{text} eq $text) {
2897 $item->{count}++;
2898 } else {
2899 $item->{count} = 1;
2900 $item->{text} = $item->{tooltip} = $text;
2901 }
2902 $item->{id} = ++$self->{id};
2903 $item->{timeout} = $timeout;
2904 delete $item->{label};
2905 } else {
2906 $self->{item}{$group} = {
2907 id => ++$self->{id},
2908 text => $text,
2909 timeout => $timeout,
2910 tooltip => $text,
2911 fg => [0.8, 0.8, 0.8, 0.8],
2912 pri => 0,
2913 count => 1,
2914 %arg,
2915 };
2916 }
2917
2918 $self->reorder;
2919}
2920
2921sub reconfigure {
2922 my ($self) = @_;
2923
2924 delete $_->{label}
2925 for values %{ $self->{item} || {} };
2926
2927 $self->reorder;
2928 $self->SUPER::reconfigure;
2929}
2930
2931#############################################################################
2932
2411package CFClient::UI::Root; 2933package CFClient::UI::Root;
2412 2934
2413our @ISA = CFClient::UI::Container::; 2935our @ISA = CFClient::UI::Container::;
2414 2936
2415use CFClient::OpenGL; 2937use CFClient::OpenGL;
2416 2938
2417sub check_size { 2939sub new {
2418 my ($self) = @_; 2940 my $class = shift;
2419 2941
2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2942 $class->SUPER::new (
2421} 2943 @_,
2422 2944 )
2423sub size_request {
2424 ($::WIDTH, $::HEIGHT)
2425} 2945}
2426 2946
2427sub configure { 2947sub configure {
2428 my ($self, $x, $y, $w, $h) = @_; 2948 my ($self, $x, $y, $w, $h) = @_;
2429 2949
2430 $self->SUPER::configure ($x, $y, $w, $h); 2950 $self->{w} = $w;
2951 $self->{h} = $h;
2952}
2431 2953
2954sub check_size {
2955 my ($self) = @_;
2956
2957 $self->size_allocate ($self->{w}, $self->{h})
2958 if $self->{w};
2959}
2960
2961sub size_request {
2962 my ($self) = @_;
2963
2964 ($self->{w}, $self->{h})
2965}
2966
2967sub size_allocate {
2968 my ($self, $w, $h) = @_;
2969
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2432 for my $child (@{$self->{children}}) { 2976 for my $child ($self->children) {
2433 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2434 2978
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2980 if exists $child->{req_x};
2981
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2983 if exists $child->{req_y};
2984
2435 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2985 $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; 2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987
2437 $child->configure ($X, $Y, $W,$H); 2988 $child->configure ($X, $Y, $W, $H);
2438 } 2989 }
2439} 2990}
2440 2991
2441sub _topleft { 2992sub coord2local {
2442 my ($self, $x, $y) = @_; 2993 my ($self, $x, $y) = @_;
2443 2994
2444 ($x, $y) 2995 ($x, $y)
2445} 2996}
2446 2997
2998sub coord2global {
2999 my ($self, $x, $y) = @_;
3000
3001 ($x, $y)
3002}
3003
2447sub update { 3004sub update {
2448 my ($self) = @_; 3005 my ($self) = @_;
2449 3006
2450 $self->check_size; 3007 $self->check_size;
2451 ::refresh (); 3008 $::WANT_REFRESH++;
2452} 3009}
2453 3010
2454sub add { 3011sub add {
2455 my ($self, $child) = @_; 3012 my ($self, @children) = @_;
2456 3013
3014 for my $child (@children) {
3015 $child->{toplevel} = 1;
3016
2457 # integerize window positions 3017 # integerise window positions
2458 $child->{x} = int $child->{x}; 3018 $child->{x} = int $child->{x};
2459 $child->{y} = int $child->{y}; 3019 $child->{y} = int $child->{y};
3020 }
2460 3021
2461 $self->SUPER::add ($child); 3022 $self->SUPER::add (@children);
3023
3024 while (@children) {
3025 my $w = pop @children;
3026 push @children, $w->children;
3027 $w->{visible} = 1;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 }
2462} 3041}
2463 3042
2464sub on_refresh { 3043sub on_refresh {
2465 my ($self, $id, $cb) = @_; 3044 my ($self, $id, $cb) = @_;
2466 3045
2467 $self->{refresh_hook}{$id} = $cb; 3046 $self->{refresh_hook}{$id} = $cb;
2468} 3047}
2469 3048
3049sub on_post_alloc {
3050 my ($self, $id, $cb) = @_;
3051
3052 $self->{post_alloc_hook}{$id} = $cb;
3053}
3054
2470sub draw { 3055sub draw {
2471 my ($self) = @_; 3056 my ($self) = @_;
2472 3057
2473 while (my $rcb = delete $self->{refresh_hook}) { 3058 while ($self->{refresh_hook}) {
2474 $_->() for values %$rcb; 3059 $_->()
3060 for values %{delete $self->{refresh_hook}};
3061 }
3062
3063 if ($self->{check_size}) {
3064 my @queue = ([], []);
3065
3066 for (;;) {
3067 if ($self->{check_size}) {
3068 # heuristic: check containers last
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3070 for values %{delete $self->{check_size}}
3071 }
3072
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3074
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3076 ? @$widget{qw(user_w user_h)}
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082
3083 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h;
3085
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3087
3088 $widget->{parent}->check_size
3089 if $widget->{parent};
3090 }
3091 }
3092 }
3093
3094 while ($self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) {
3096 my ($widget, $w, $h) = @$_;
3097
3098 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0;
3100
3101 $widget->{w} = $w;
3102 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h);
3104 $widget->emit (size_allocate => $w, $h);
3105 }
3106 }
3107
3108 while ($self->{post_alloc_hook}) {
3109 $_->()
3110 for values %{delete $self->{post_alloc_hook}};
2475 } 3111 }
2476 3112
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3113 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT; 3115 glClear GL_COLOR_BUFFER_BIT;
2480 3116
2481 glMatrixMode GL_PROJECTION; 3117 glMatrixMode GL_PROJECTION;
2482 glLoadIdentity; 3118 glLoadIdentity;
2483 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2484 glMatrixMode GL_MODELVIEW; 3120 glMatrixMode GL_MODELVIEW;
2485 glLoadIdentity; 3121 glLoadIdentity;
2486 3122
2487 $self->_draw; 3123 $self->_draw;
2488} 3124}
… …
2490############################################################################# 3126#############################################################################
2491 3127
2492package CFClient::UI; 3128package CFClient::UI;
2493 3129
2494$ROOT = new CFClient::UI::Root; 3130$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip; 3131$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2496 3132
24971 31331
2498 3134

Diff Legend

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