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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.195 by root, Thu May 11 23:54:31 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
… …
23 24
24 my $tip = $widget->{tooltip}; 25 my $tip = $widget->{tooltip};
25 26
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 27 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 28
28 $TOOLTIP->set_text ($widget->{tooltip}); 29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 30
30 $TOOLTIP->show; 31 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
31 } 40 }
32 41
33 return; 42 return;
34 } 43 }
35 } 44 }
… …
39 delete $TOOLTIP->{owner}; 48 delete $TOOLTIP->{owner};
40} 49}
41 50
42# class methods for events 51# class methods for events
43sub feed_sdl_key_down_event { 52sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
54 if $FOCUS;
45} 55}
46 56
47sub feed_sdl_key_up_event { 57sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
59 if $FOCUS;
49} 60}
50 61
51sub feed_sdl_button_down_event { 62sub feed_sdl_button_down_event {
52 my ($ev) = @_; 63 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 64 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 72 check_tooltip;
62 } 73 }
63 74
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 75 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 76
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 77 if ($GRAB) {
78 ($x, $y) = $GRAB->coord2local ($x, $y);
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
67} 81}
68 82
69sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
70 my ($ev) = @_; 84 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
72 86
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 88
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 90
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 91 if ($GRAB) {
92 ($x, $y) = $GRAB->coord2local ($x, $y);
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
78 95
79 if (!$BUTTON_STATE) { 96 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 97 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 98 $grab->update if $grab;
82 $GRAB->update if $GRAB; 99 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 115 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 116
100 check_tooltip; 117 check_tooltip;
101 } 118 }
102 119
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
123 }
104} 124}
105 125
106# convert position array to integers 126# convert position array to integers
107sub harmonize { 127sub harmonize {
108 my ($vals) = @_; 128 my ($vals) = @_;
… …
126 146
127sub new { 147sub new {
128 my $class = shift; 148 my $class = shift;
129 149
130 my $self = bless { 150 my $self = bless {
131 x => 0, 151 x => 0,
132 y => 0, 152 y => 0,
133 z => 0, 153 z => 0,
134 can_events => 1, 154 can_events => 1,
135 @_ 155 @_
136 }, $class; 156 }, $class;
137 157
138 for (keys %$self) { 158 for (keys %$self) {
… …
160} 180}
161 181
162sub hide { 182sub hide {
163 my ($self) = @_; 183 my ($self) = @_;
164 184
165 return unless $self->{parent}; 185 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self;
166 187
167 $self->{parent}->remove ($self); 188 $self->{parent}->remove ($self)
189 if $self->{parent};
168} 190}
169 191
170sub move { 192sub move {
171 my ($self, $x, $y, $z) = @_; 193 my ($self, $x, $y, $z) = @_;
172 194
… …
211 $self->{y} = $y; 233 $self->{y} = $y;
212 $self->update; 234 $self->update;
213 } 235 }
214 236
215 if ($self->{w} != $w || $self->{h} != $h) { 237 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 239 }
222} 240}
223 241
224sub size_allocate { 242sub size_allocate {
225 # nothing to be done 243 # nothing to be done
226} 244}
227 245
246sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259}
260
228sub set_max_size { 261sub set_max_size {
229 my ($self, $w, $h) = @_; 262 my ($self, $w, $h) = @_;
230 263
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 265 delete $self->{max_h}; $self->{max_h} = $h if $h;
233}
234
235# return top left coordinates
236sub _topleft {
237 my ($self, $x, $y) = @_;
238
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 266}
241 267
242# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
243sub coord2local { 269sub coord2local {
244 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
245 271
246 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 273}
249 274
250# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
251sub coord2global { 276sub coord2global {
252 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
253 278
254 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 280}
257 281
258sub focus_in { 282sub focus_in {
259 my ($self) = @_; 283 my ($self) = @_;
260 284
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
322 glEnd; 346 glEnd;
323 glDisable GL_BLEND; 347 glDisable GL_BLEND;
324 } 348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
325} 363}
326 364
327sub _draw { 365sub _draw {
328 my ($self) = @_; 366 my ($self) = @_;
329 367
… …
344 382
345sub set_parent { 383sub set_parent {
346 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
347 385
348 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
349} 390}
350 391
351sub check_size { 392sub check_size {
352 my ($self) = @_; 393 my ($self) = @_;
353 394
354 $self->{parent} 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
355 or return 1;
356
357 my ($w, $h) = $self->{user_w} && $self->{user_h}
358 ? @$self{qw(user_w user_h)}
359 : $self->size_request;
360
361 if ($w != $self->{req_w} || $h != $self->{req_h}) {
362 $self->{req_w} = $w;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else {
373 0
374 }
375} 396}
376 397
377sub update { 398sub update {
378 my ($self) = @_; 399 my ($self) = @_;
379 400
… …
388} 409}
389 410
390sub emit { 411sub emit {
391 my ($self, $signal, @args) = @_; 412 my ($self, $signal, @args) = @_;
392 413
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 415}
397 416
398sub DESTROY { 417sub DESTROY {
399 my ($self) = @_; 418 my ($self) = @_;
400 419
… …
467sub new { 486sub new {
468 my ($class, %arg) = @_; 487 my ($class, %arg) = @_;
469 488
470 my $children = delete $arg{children} || []; 489 my $children = delete $arg{children} || [];
471 490
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 491 my $self = $class->SUPER::new (
492 children => [],
493 can_events => 0,
494 %arg,
495 );
473 $self->add ($_) for @$children; 496 $self->add ($_) for @$children;
474 497
475 $self 498 $self
476} 499}
477 500
478sub add { 501sub add {
479 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
480 503
481 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
482 506
483 use sort 'stable'; 507 use sort 'stable';
484 508
485 $self->{children} = [ 509 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
488 ]; 512 ];
489 513
490 $child->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub children {
519 @{ $_[0]{children} }
491} 520}
492 521
493sub remove { 522sub remove {
494 my ($self, $child) = @_; 523 my ($self, $child) = @_;
495 524
496 delete $child->{parent}; 525 delete $child->{parent};
526 $child->hide;
497 527
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529
530 $self->check_size;
531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
499 544
500 $self->check_size; 545 $self->check_size;
501 $self->update; 546 $self->update;
502} 547}
503 548
… …
581} 626}
582 627
583sub update { 628sub update {
584 my ($self) = @_; 629 my ($self) = @_;
585 630
586 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 632 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 633}
600 634
601sub size_allocate { 635sub size_allocate {
602 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
603 637
604 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
605 641
642sub _render {
643 $_[0]{children}[0]->draw;
644}
645
646sub render_child {
647 my ($self) = @_;
648
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT;
652
606 $self->render_chld; 653 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 };
607} 662}
608 663
609sub _draw { 664sub _draw {
610 my ($self) = @_; 665 my ($self) = @_;
611 666
612 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
613 668
614 my $tex = $self->{texture} 669 my $tex = $self->{texture}
615 or return; 670 or return;
616 671
617 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 672 glEnable GL_TEXTURE_2D;
620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1;
621 675
622 $tex->draw_quad (0, 0, $w, $h); 676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623 677
624 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 678 glDisable GL_TEXTURE_2D;
626} 679}
627 680
628############################################################################# 681#############################################################################
629 682
630package CFClient::UI::ViewPort; 683package CFClient::UI::ViewPort;
631 684
632our @ISA = CFClient::UI::Window::; 685our @ISA = CFClient::UI::Window::;
633 686
634sub new { die }
635
636sub size_request { 687sub size_request {
637 my ($self) = @_; 688 my ($self) = @_;
638 689
639 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
641 692
642 @$self{qw(child_w child_h)} 693 @$self{qw(child_w child_h)}
643} 694}
644 695
645sub _draw { 696sub size_allocate {
646 my ($self) = @_; 697 my ($self, $w, $h) = @_;
647 698
648 $self->{children}[1]->draw; 699 $self->update;
649} 700}
650 701
702sub set_offset {
703 my ($self, $x, $y) = @_;
704
705 $self->{view_x} = int $x;
706 $self->{view_y} = int $y;
707
708 $self->update;
709}
710
711# hmm, this does not work for topleft of $self... but we should not ask for that
712sub coord2local {
713 my ($self, $x, $y) = @_;
714
715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
725}
726
727sub find_widget {
728 my ($self, $x, $y) = @_;
729
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y)
736 }
737}
738
739sub _render {
740 my ($self) = @_;
741
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743
744 $self->SUPER::_render;
745}
746
747#############################################################################
748
749package CFClient::UI::ScrolledWindow;
750
751our @ISA = CFClient::UI::HBox::;
752
753sub new {
754 my $class = shift;
755
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort),
768 slider => $slider,
769 @_,
770 );
771
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
651 781
652############################################################################# 782#############################################################################
653 783
654package CFClient::UI::Frame; 784package CFClient::UI::Frame;
655 785
… …
710 my $class = shift; 840 my $class = shift;
711 841
712 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
713 843
714 my $self = $class->SUPER::new ( 844 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
717 border => 0.8, 847 border => 0.6,
718 can_events => 1, 848 can_events => 1,
719 @_ 849 @_
720 ); 850 );
721 851
722 $self->{title} &&= new CFClient::UI::Label 852 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 853 align => 0,
724 valign => 1, 854 valign => 1,
725 text => $self->{title}, 855 text => $self->{title},
726 fontsize => 1; 856 fontsize => $self->{border};
727 857
728 $self 858 $self
729} 859}
730 860
731sub border { 861sub border {
… …
756} 886}
757 887
758sub button_down { 888sub button_down {
759 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
760 890
891 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 892 my $border = $self->border;
762 893
763 if ($x < $self->{w} && $x >= $self->{w} - $border 894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
768 901
902 my $mx = $x < $border;
903 my $my = $y < $border;
904
769 $self->{motion} = sub { 905 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
771 907
772 ($x, $y) = ($ev->{x}, $ev->{y}); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
773 910
774 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 914 $self->check_size;
777 }; 915 };
778 916
779 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
784 920
785 $self->{motion} = sub { 921 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
… …
822 $tex[1]->draw_quad (0, 0, $w, $border); 958 $tex[1]->draw_quad (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
826 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 964 my $bg = $tex[0];
828 965
829 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
832 969
833 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
834 971
835 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
839 976
840 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
842 980
843 $self->{title}->draw if $self->{title}; 981 $self->{title}->draw if $self->{title};
982
844 $self->child->draw; 983 $self->child->draw;
845} 984}
846 985
847############################################################################# 986#############################################################################
848 987
… …
870 $self->{children}[$y][$x] = $child; 1009 $self->{children}[$y][$x] = $child;
871 1010
872 $child->check_size; 1011 $child->check_size;
873} 1012}
874 1013
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
875# TODO: move to container class maybe? send childs a signal on removal? 1018# TODO: move to container class maybe? send childs a signal on removal?
876sub clear { 1019sub clear {
877 my ($self) = @_; 1020 my ($self) = @_;
878 1021
1022 my @children = $self->children;
879 delete $self->{children}; 1023 delete $self->{children};
1024
1025 for (@children) {
1026 delete $_->{parent};
1027 $_->hide;
1028 }
1029
880 $self->update; 1030 $self->update;
881} 1031}
882 1032
883sub get_wh { 1033sub get_wh {
884 my ($self) = @_; 1034 my ($self) = @_;
… …
1061} 1211}
1062 1212
1063sub size_allocate { 1213sub size_allocate {
1064 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1065 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1066 my $children = $self->{children}; 1218 my $children = $self->{children};
1067 1219
1068 my @h = map $_->{req_h}, @$children; 1220 my @h = map $_->{req_h}, @$children;
1069 1221
1070 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
… …
1107 1259
1108sub new { 1260sub new {
1109 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1110 1262
1111 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
1113 #font => default_font 1265 #font => default_font
1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1114 fontsize => 1, 1269 fontsize => 1,
1115 text => "",
1116 align => -1, 1270 align => -1,
1117 valign => -1, 1271 valign => -1,
1118 padding => 2, 1272 padding => 2,
1119 layout => new CFClient::Layout,
1120 can_events => 0, 1273 can_events => 0,
1121 %arg 1274 %arg
1122 ); 1275 );
1123 1276
1124 if (exists $self->{template}) { 1277 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1278 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1279 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1280 $self->{template} = $layout;
1128 } 1281 }
1129 1282
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1132 1288
1133 $self 1289 $self
1134} 1290}
1135 1291
1136sub escape_text { 1292sub escape {
1137 local $_ = $_[1]; 1293 local $_ = $_[1];
1138 1294
1139 s/&/&amp;/g; 1295 s/&/&amp;/g;
1140 s/>/&gt;/g; 1296 s/>/&gt;/g;
1141 s/</&lt;/g; 1297 s/</&lt;/g;
1142 1298
1143 $_[1] 1299 $_[1]
1144} 1300}
1145 1301
1302sub update {
1303 my ($self) = @_;
1304
1305 delete $self->{texture};
1306 $self->SUPER::update;
1307}
1308
1146sub set_text { 1309sub set_text {
1147 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1148 1311
1312 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text";
1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1149 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1150 1317
1151 delete $self->{texture}; 1318 $self->update;
1152 $self->check_size; 1319 $self->check_size;
1153 $self->update;
1154} 1320}
1155 1321
1156sub set_markup { 1322sub set_markup {
1157 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1158 1324
1325 return if $self->{text} eq "M$markup";
1326 $self->{text} = "M$markup";
1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1159 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1160 1332
1161 delete $self->{texture}; 1333 $self->update;
1162 $self->check_size; 1334 $self->check_size;
1163 $self->update;
1164} 1335}
1165 1336
1166sub size_request { 1337sub size_request {
1167 my ($self) = @_; 1338 my ($self) = @_;
1168 1339
… …
1197sub set_fontsize { 1368sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1369 my ($self, $fontsize) = @_;
1199 1370
1200 $self->{fontsize} = $fontsize; 1371 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1372 delete $self->{texture};
1373
1374 $self->update;
1202 $self->check_size; 1375 $self->check_size;
1203 $self->update;
1204} 1376}
1205 1377
1206sub _draw { 1378sub _draw {
1207 my ($self) = @_; 1379 my ($self) = @_;
1208 1380
1209 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1212 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1213 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1214 }; 1398 };
1215 1399
1216 glEnable GL_BLEND;
1217 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220 1402
1403 if ($tex->{format} == GL_ALPHA) {
1221 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1222
1223 $self->{ox} = int (
1224 $self->{align} < 0 ? $self->{padding}
1225 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226 : ($self->{w} - $tex->{w}) * 0.5
1227 );
1228
1229 $self->{oy} = int (
1230 $self->{valign} < 0 ? $self->{padding}
1231 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232 : ($self->{h} - $tex->{h}) * 0.5
1233 );
1234
1235 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1236 1409
1237 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1411}
1240 1412
1241############################################################################# 1413#############################################################################
1242 1414
1243package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
… …
1248 1420
1249sub new { 1421sub new {
1250 my $class = shift; 1422 my $class = shift;
1251 1423
1252 $class->SUPER::new ( 1424 $class->SUPER::new (
1253 fg => [1, 1, 1], 1425 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1426 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1427 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1428 active_fg => [0, 0, 0],
1257 can_hover => 1, 1429 can_hover => 1,
1258 can_focus => 1, 1430 can_focus => 1,
1259 valign => 0, 1431 valign => 0,
1260 can_events => 1, 1432 can_events => 1,
1261 @_ 1433 @_
1262 ) 1434 )
1263} 1435}
1264 1436
… …
1278 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1279 1451
1280 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1281} 1453}
1282 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1283sub get_text { 1464sub get_text {
1284 $_[0]{text} 1465 $_[0]{text}
1285} 1466}
1286 1467
1287sub size_request { 1468sub size_request {
… …
1294 1475
1295sub size_allocate { 1476sub size_allocate {
1296 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1297 1478
1298 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1299}
1300
1301sub set_text {
1302 my ($self, $text) = @_;
1303
1304 $self->{cursor} = length $text;
1305 $self->_set_text ($text);
1306 $self->update;
1307} 1480}
1308 1481
1309sub key_down { 1482sub key_down {
1310 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1311 1484
… …
1418 my ($self, $ev) = @_; 1591 my ($self, $ev) = @_;
1419 1592
1420 my $sym = $ev->{sym}; 1593 my $sym = $ev->{sym};
1421 1594
1422 if ($sym == 13) { 1595 if ($sym == 13) {
1596 unshift @{$self->{history}},
1597 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1600 $self->emit (activate => $txt);
1424 $self->update; 1601 $self->update;
1602
1603 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text;
1606 }
1607 if (@{$self->{history} || []} > 0) {
1608 $self->{history_pointer}++;
1609 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1610 $self->{history_pointer} = @{$self->{history} || []} - 1;
1611 }
1612 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1613 }
1614
1615 } elsif ($sym == CFClient::SDLK_DOWN) {
1616 $self->{history_pointer}--;
1617 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1618
1619 if ($self->{history_pointer} >= 0) {
1620 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1621 } else {
1622 $self->set_text ($self->{history_saveback});
1623 }
1425 1624
1426 } else { 1625 } else {
1427 $self->SUPER::key_down ($ev); 1626 $self->SUPER::key_down ($ev);
1428 } 1627 }
1429 1628
… …
1443 1642
1444sub new { 1643sub new {
1445 my $class = shift; 1644 my $class = shift;
1446 1645
1447 $class->SUPER::new ( 1646 $class->SUPER::new (
1448 padding => 4, 1647 padding => 4,
1449 fg => [1, 1, 1], 1648 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2], 1649 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1650 active_fg => [0, 0, 1],
1452 can_hover => 1, 1651 can_hover => 1,
1453 align => 0, 1652 align => 0,
1454 valign => 0, 1653 valign => 0,
1455 can_events => 1, 1654 can_events => 1,
1456 @_ 1655 @_
1457 ) 1656 )
1458} 1657}
1459 1658
… …
1473 1672
1474 if ($GRAB == $self) { 1673 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg}; 1674 $self->{fg} = $self->{active_fg};
1476 } 1675 }
1477 1676
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1677 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1679 glColor 0, 0, 0, 1;
1483 1680
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1681 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1682
1486 glDisable GL_TEXTURE_2D; 1683 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1684
1489 $self->SUPER::_draw; 1685 $self->SUPER::_draw;
1490} 1686}
1491 1687
1492############################################################################# 1688#############################################################################
… …
1539 1735
1540 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1541 1737
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 1739
1544 glEnable GL_BLEND;
1545 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547 1741
1548 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1549 1743
1550 $tex->draw_quad (0, 0, $s, $s); 1744 $tex->draw_quad_alpha (0, 0, $s, $s);
1551 1745
1552 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 1747}
1555 1748
1556############################################################################# 1749#############################################################################
1557 1750
1558package CFClient::UI::Image; 1751package CFClient::UI::Image;
… …
1601 glTranslate 0, -$self->{w}, 0; 1794 glTranslate 0, -$self->{w}, 0;
1602 1795
1603 ($w, $h) = ($h, $w); 1796 ($w, $h) = ($h, $w);
1604 } 1797 }
1605 1798
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 1799 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 1801
1611 $tex->draw_quad (0, 0, $w, $h); 1802 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 1803
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1615} 1805}
1616 1806
1617############################################################################# 1807#############################################################################
1618 1808
… …
1666} 1856}
1667 1857
1668sub set_max { 1858sub set_max {
1669 my ($self, $max) = @_; 1859 my ($self, $max) = @_;
1670 1860
1861 return if $self->{max_val} == $max;
1862
1671 $self->{max_val} = $max; 1863 $self->{max_val} = $max;
1864 $self->update;
1672} 1865}
1673 1866
1674sub set_value { 1867sub set_value {
1675 my ($self, $val, $max) = @_; 1868 my ($self, $val, $max) = @_;
1676 1869
1677 $self->set_max ($max) 1870 $self->set_max ($max)
1678 if defined $max; 1871 if defined $max;
1679 1872
1680 $max = $self->{max_val}; 1873 return if $self->{val} == $val;
1874
1681 $self->{val} = $val; 1875 $self->{val} = $val;
1682
1683 $self->update; 1876 $self->update;
1684} 1877}
1685 1878
1686sub _draw { 1879sub _draw {
1687 my ($self) = @_; 1880 my ($self) = @_;
… …
1750 1943
1751sub new { 1944sub new {
1752 my ($class, %arg) = @_; 1945 my ($class, %arg) = @_;
1753 1946
1754 my $self = $class->SUPER::new ( 1947 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 1948 tooltip => $arg{type},
1949 can_hover => 1,
1756 can_events => 1, 1950 can_events => 1,
1757 can_hover => 1,
1758 %arg, 1951 %arg,
1759 ); 1952 );
1760 1953
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1954 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1762 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 1955 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1770 1963
1771 $self->{value}->set_fontsize ($fsize); 1964 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 1965 $self->{max} ->set_fontsize ($fsize);
1773} 1966}
1774 1967
1968sub set_max {
1969 my ($self, $max) = @_;
1970
1971 $self->{gauge}->set_max ($max);
1972 $self->{max}->set_text ($max);
1973}
1974
1775sub set_value { 1975sub set_value {
1776 my ($self, $val, $max) = @_; 1976 my ($self, $val, $max) = @_;
1777 1977
1778 $self->set_max ($max) 1978 $self->set_max ($max)
1779 if defined $max; 1979 if defined $max;
1780 1980
1781 $self->{gauge}->set_value ($val, $max); 1981 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 1982 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 1983}
1791 1984
1792############################################################################# 1985#############################################################################
1793 1986
1794package CFClient::UI::Slider; 1987package CFClient::UI::Slider;
… …
1813 # TODO: calculations are off 2006 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2008 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 2009 active_fg => [0, 0, 0],
1817 range => [0, 0, 100, 10], 2010 range => [0, 0, 100, 10],
1818 req_w => 20, 2011 req_w => $::WIDTH / 80,
1819 req_h => 20, 2012 req_h => $::WIDTH / 80,
1820 vertical => 0, 2013 vertical => 0,
1821 can_hover => 1, 2014 can_hover => 1,
1822 inner_pad => 5, 2015 inner_pad => 5,
1823 @_ 2016 @_
1824 ); 2017 );
… …
1907 $page ||= 2; 2100 $page ||= 2;
1908 2101
1909 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1910 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1911 2104
1912 glEnable GL_BLEND;
1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1914 glEnable GL_TEXTURE_2D; 2105 glEnable GL_TEXTURE_2D;
1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916 2107
1917 # draw background 2108 # draw background
1918 $tex[1]->draw_quad (0, 0, $w, $h); 2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1919 2110
1920 # draw handle 2111 # draw handle
1921 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1922 2113
1923 glDisable GL_BLEND;
1924 glDisable GL_TEXTURE_2D; 2114 glDisable GL_TEXTURE_2D;
1925} 2115}
1926 2116
1927############################################################################# 2117#############################################################################
1928 2118
… …
1934 2124
1935sub new { 2125sub new {
1936 my $class = shift; 2126 my $class = shift;
1937 2127
1938 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
1939 fontsize => 1, 2129 fontsize => 1,
2130 can_events => 0,
1940 #font => default_font 2131 #font => default_font
1941 @_, 2132 @_,
1942 2133
1943 layout => (new CFClient::Layout), 2134 layout => (new CFClient::Layout 1),
1944 par => [], 2135 par => [],
1945 height => 0, 2136 height => 0,
1946 children => [ 2137 children => [
1947 (new CFClient::UI::Empty expand => 1), 2138 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2139 (new CFClient::UI::Slider vertical => 1),
1949 ], 2140 ],
1950 ); 2141 );
1951 2142
1952 $self->{children}[1]->connect (changed => sub { 2143 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2144
1956 $self 2145 $self
1957} 2146}
1958 2147
1959sub set_fontsize { 2148sub set_fontsize {
… …
1967 my ($self, $text) = @_; 2156 my ($self, $text) = @_;
1968 2157
1969 my $layout = $self->{layout}; 2158 my $layout = $self->{layout};
1970 2159
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w}); 2161 $layout->set_width ($self->{children}[0]{w});
1973 $layout->set_text ($text); 2162 $layout->set_markup ($text);
1974 2163
1975 ($layout->size)[1] 2164 ($layout->size)[1]
1976} 2165}
1977 2166
1978sub reflow { 2167sub reflow {
… …
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2031 2220
2032 delete $self->{texture}; 2221 delete $self->{texture};
2033 } 2222 }
2034 2223
2035 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2036 glClearColor 0, 0, 0, 1; 2225 glClearColor 0, 0, 0, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2226 glClear GL_COLOR_BUFFER_BIT;
2038 2227
2039 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D; 2228 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2230
2044 my $top = int $self->{children}[1]{range}[0]; 2231 my $top = int $self->{children}[1]{range}[0];
2045 2232
… …
2054 2241
2055 for my $par (@{$self->{par}}) { 2242 for my $par (@{$self->{par}}) {
2056 my $h = $par->[0]; 2243 my $h = $par->[0];
2057 2244
2058 if ($y0 < $y + $h && $y < $y1) { 2245 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] });
2059 $layout->set_text ($par->[2]); 2247 $layout->set_markup ($par->[2]);
2060 2248
2061 glColor @{ $par->[1] };
2062 my ($W, $H) = $layout->size; 2249 my ($W, $H) = $layout->size;
2063 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2064 } 2251 }
2065 2252
2066 $y += $h; 2253 $y += $h;
2067 } 2254 }
2068 2255
2069 glDisable GL_TEXTURE_2D; 2256 glDisable GL_TEXTURE_2D;
2070 glDisable GL_BLEND;
2071 }; 2257 };
2072 }); 2258 });
2073} 2259}
2074 2260
2075sub _draw { 2261sub _draw {
2076 my ($self) = @_; 2262 my ($self) = @_;
2077 2263
2078 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2081 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2266 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2082 glDisable GL_TEXTURE_2D; 2268 glDisable GL_TEXTURE_2D;
2083 }
2084 2269
2085 $self->{children}[1]->draw; 2270 $self->{children}[1]->draw;
2086 2271
2087} 2272}
2088 2273
… …
2136 2321
2137sub new { 2322sub new {
2138 my $class = shift; 2323 my $class = shift;
2139 2324
2140 my $self = $class->SUPER::new ( 2325 my $self = $class->SUPER::new (
2141 state => 0, 2326 state => 0,
2142 connect_activate => \&toggle_flopper, 2327 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2328 @_
2145 ); 2329 );
2146 2330
2147 if ($self->{state}) { 2331 if ($self->{state}) {
2148 $self->{state} = 0; 2332 $self->{state} = 0;
… …
2183 @_, 2367 @_,
2184 can_events => 0, 2368 can_events => 0,
2185 ) 2369 )
2186} 2370}
2187 2371
2188sub set_text { 2372sub set_markup {
2189 my ($self, $text) = @_; 2373 my ($self, $text, $font) = @_;
2190 2374
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2375 $self->{label} = new CFClient::UI::Label
2376 fontsize => 0.8,
2377 fg => [0, 0, 0],
2378 font => ($font || $::FONT_PROP);
2379
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2192 $self->{label}->set_text ($text); 2381 $self->{label}->set_markup ($text);
2193 $self->add ($self->{label}); 2382 $self->add ($self->{label});
2194} 2383}
2195 2384
2196sub size_request { 2385sub size_request {
2197 my ($self) = @_; 2386 my ($self) = @_;
2198 2387
2199 $self->child->set_max_size ($::WIDTH * 0.3);
2200
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2388 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2389
2203 ($w + 4, $h + 4) 2390 ($w + 4, $h + 4)
2391}
2392
2393sub size_allocate {
2394 my ($self, $w, $h) = @_;
2395
2396 $self->SUPER::size_allocate ($w - 4, $h - 4);
2204} 2397}
2205 2398
2206sub _draw { 2399sub _draw {
2207 my ($self) = @_; 2400 my ($self) = @_;
2208 2401
… …
2233 $self->SUPER::_draw; 2426 $self->SUPER::_draw;
2234} 2427}
2235 2428
2236############################################################################# 2429#############################################################################
2237 2430
2431package CFClient::UI::Face;
2432
2433our @ISA = CFClient::UI::Base::;
2434
2435use CFClient::OpenGL;
2436
2437sub new {
2438 my $class = shift;
2439
2440 $class->SUPER::new (
2441 aspect => 1,
2442 @_,
2443 )
2444}
2445
2446sub size_request {
2447 (32, 8)
2448}
2449
2450sub _draw {
2451 my ($self) = @_;
2452
2453 return unless $::CONN;#d# manage and cache textures differently
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2455
2456 # TODO animation
2457 if ($tex) {
2458 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D;
2463 }
2464}
2465
2466#############################################################################
2467
2468package CFClient::UI::InventoryItem;
2469
2470our @ISA = CFClient::UI::HBox::;
2471
2472sub new {
2473 my $class = shift;
2474
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new (
2485 can_hover => 1,
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_,
2544 );
2545
2546 $self
2547}
2548
2549sub set_items {
2550 my ($self, $items) = @_;
2551
2552 $self->{scrolled}->clear;
2553 return unless $items;
2554
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2556
2557 $self->{real_items} = \@items;
2558
2559 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2565 }
2566
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::Menu;
2578
2579our @ISA = CFClient::UI::FancyFrame::;
2580
2581use CFClient::OpenGL;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 items => [],
2588 z => 100,
2589 @_,
2590 );
2591
2592 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2593
2594 for my $item (@{ $self->{items} }) {
2595 my ($widget, $cb) = @$item;
2596
2597 # handle various types of items, only text for now
2598 if (!ref $widget) {
2599 $widget = new CFClient::UI::Label
2600 can_hover => 1,
2601 can_events => 1,
2602 text => $widget;
2603 }
2604
2605 $self->{item}{$widget} = $item;
2606
2607 $self->{vbox}->add ($widget);
2608 }
2609
2610 $self
2611}
2612
2613# popup given the event (must be a mouse button down event currently)
2614sub popup {
2615 my ($self, $ev) = @_;
2616
2617 $self->emit ("popdown");
2618
2619 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self;
2621 $self->{button} = $ev->{button};
2622
2623 $self->show;
2624 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2625}
2626
2627sub mouse_motion {
2628 my ($self, $ev, $x, $y) = @_;
2629
2630 # TODO: should use vbox->find_widget or so
2631 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2632 $self->{hover} = $self->{item}{$HOVER};
2633}
2634
2635sub button_up {
2636 my ($self, $ev, $x, $y) = @_;
2637
2638 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB;
2640 $self->hide;
2641
2642 $self->emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover};
2644 }
2645}
2646
2647#############################################################################
2648
2649package CFClient::UI::Statusbox;
2650
2651our @ISA = CFClient::UI::VBox::;
2652
2653sub reorder {
2654 my ($self) = @_;
2655 my $NOW = time;
2656
2657 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 }
2660
2661 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2663 my $count = 10 + 1;
2664 for my $item (@items) {
2665 last unless --$count;
2666
2667 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text};
2670 for ($short) {
2671 s/^\s+//;
2672 s/\012.*//s;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 }
2676
2677 new CFClient::UI::Label
2678 markup => $short,
2679 tooltip => delete $item->{tooltip},
2680 fontsize => delete $item->{fontsize},
2681 color => delete $item->{color},
2682 can_events => 1,
2683 can_hover => 1,
2684 };
2685 }
2686
2687 $self->clear;
2688 $self->SUPER::add (@widgets);
2689}
2690
2691sub add {
2692 my ($self, $text, %arg) = @_;
2693
2694 my $item = {
2695 time => time,
2696 text => $text,
2697 timeout => 60,
2698 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8],
2701 %arg,
2702 };
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708
2709 $self->reorder;
2710}
2711
2712#############################################################################
2713
2238package CFClient::UI::Root; 2714package CFClient::UI::Root;
2239 2715
2240our @ISA = CFClient::UI::Container::; 2716our @ISA = CFClient::UI::Container::;
2241 2717
2242use CFClient::OpenGL; 2718use CFClient::OpenGL;
2243 2719
2244sub check_size { 2720sub new {
2245 my ($self) = @_; 2721 my $class = shift;
2246 2722
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2723 $class->SUPER::new (
2248} 2724 @_,
2249 2725 )
2250sub size_request {
2251 ($::WIDTH, $::HEIGHT)
2252} 2726}
2253 2727
2254sub configure { 2728sub configure {
2255 my ($self, $x, $y, $w, $h) = @_; 2729 my ($self, $x, $y, $w, $h) = @_;
2256 2730
2257 $self->SUPER::configure ($x, $y, $w, $h); 2731 $self->{w} = $w;
2732 $self->{h} = $h;
2733}
2258 2734
2735sub check_size {
2736 my ($self) = @_;
2737
2738 $self->size_allocate ($self->{w}, $self->{h})
2739 if $self->{w};
2740}
2741
2742sub size_request {
2743 my ($self) = @_;
2744
2745 ($self->{w}, $self->{h})
2746}
2747
2748sub size_allocate {
2749 my ($self, $w, $h) = @_;
2750
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2259 for my $child (@{$self->{children}}) { 2767 for my $child ($self->children) {
2260 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2261 2769
2262 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2770 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2263 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2264 $child->configure ($X, $Y, $W,$H); 2772 $child->configure ($X, $Y, $W, $H);
2265 } 2773 }
2266}
2267 2774
2268sub _topleft { 2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777}
2778
2779sub coord2local {
2269 my ($self, $x, $y) = @_; 2780 my ($self, $x, $y) = @_;
2270 2781
2271 ($x, $y) 2782 ($x, $y)
2272} 2783}
2273 2784
2785sub coord2global {
2786 my ($self, $x, $y) = @_;
2787
2788 ($x, $y)
2789}
2790
2274sub update { 2791sub update {
2275 my ($self) = @_; 2792 my ($self) = @_;
2276 2793
2277 $self->check_size; 2794 $self->check_size;
2278 ::refresh (); 2795 $::WANT_REFRESH++;
2279} 2796}
2280 2797
2281sub add { 2798sub add {
2282 my ($self, $child) = @_; 2799 my ($self, $child) = @_;
2283 2800
2284 # integerize window positions 2801 # integerise window positions
2285 $child->{x} = int $child->{x}; 2802 $child->{x} = int $child->{x};
2286 $child->{y} = int $child->{y}; 2803 $child->{y} = int $child->{y};
2287 2804
2288 $self->SUPER::add ($child); 2805 $self->SUPER::add ($child);
2289} 2806}
… …
2292 my ($self, $id, $cb) = @_; 2809 my ($self, $id, $cb) = @_;
2293 2810
2294 $self->{refresh_hook}{$id} = $cb; 2811 $self->{refresh_hook}{$id} = $cb;
2295} 2812}
2296 2813
2297sub draw { 2814sub draw {
2298 my ($self) = @_; 2815 my ($self) = @_;
2299 2816
2817 if ($self->{check_size}) {
2818 my @queue = ([], []);
2819
2820 for (;;) {
2821 if ($self->{check_size}) {
2822 # heuristic: check containers last
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2824 for values %{delete $self->{check_size}}
2825 }
2826
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2828
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request;
2832
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835
2836 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h;
2838
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2840
2841 $widget->{parent}->check_size
2842 if $widget->{parent};
2843 }
2844 }
2845 }
2846
2847 while ($self->{size_alloc}) {
2848 for (values %{delete $self->{size_alloc}}) {
2849 my ($widget, $w, $h) = @$_;
2850
2851 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0;
2853
2854 $widget->{w} = $w;
2855 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h);
2858 }
2859 }
2860
2300 while (my $rcb = delete $self->{refresh_hook}) { 2861 while ($self->{refresh_hook}) {
2301 $_->() for values %$rcb; 2862 $_->()
2863 for values %{delete $self->{refresh_hook}};
2302 } 2864 }
2303 2865
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2866 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 2868 glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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