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

Diff Legend

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