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

Diff Legend

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