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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.185 by root, Mon May 8 17:23:08 2006 UTC

… …
14our $BUTTON_STATE; 14our $BUTTON_STATE;
15 15
16sub check_tooltip { 16sub check_tooltip {
17 if (!$GRAB) { 17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 19 if (length $widget->{tooltip}) {
20 20
21 if ($TOOLTIP->{owner} != $widget) { 21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 22 $TOOLTIP->{owner} = $widget;
23 23
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
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) {
… …
142 } 161 }
143 162
144 $self 163 $self
145} 164}
146 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
147sub show { 173sub show {
148 my ($self) = @_; 174 my ($self) = @_;
149 175
150 return if $self->{parent}; 176 return if $self->{parent};
151 177
… …
153} 179}
154 180
155sub hide { 181sub hide {
156 my ($self) = @_; 182 my ($self) = @_;
157 183
158 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
159 186
160 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
161} 189}
162 190
163sub move { 191sub move {
164 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
165 193
… …
168 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
169 197
170 $self->update; 198 $self->update;
171} 199}
172 200
173sub needs_redraw { 201sub set_size {
174 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
175} 208}
176 209
177sub size_request { 210sub size_request {
178 require Carp; 211 require Carp;
179 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
204 $self->{w} = $w; 237 $self->{w} = $w;
205 $self->{h} = $h; 238 $self->{h} = $h;
206 239
207 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
208 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
209 } 243 }
210} 244}
211 245
212sub size_allocate { 246sub size_allocate {
213 # nothing to be done 247 # nothing to be done
248}
249
250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
214} 261}
215 262
216sub set_max_size { 263sub set_max_size {
217 my ($self, $w, $h) = @_; 264 my ($self, $w, $h) = @_;
218 265
… …
221} 268}
222 269
223# return top left coordinates 270# return top left coordinates
224sub _topleft { 271sub _topleft {
225 my ($self, $x, $y) = @_; 272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
226 276
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228} 278}
229 279
230# translate global coordinates to local coordinate system 280# translate global coordinates to local coordinate system
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 358 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 359 glVertex $x , $y + $self->{h};
310 glEnd; 360 glEnd;
311 glDisable GL_BLEND; 361 glDisable GL_BLEND;
312 } 362 }
363
364 if ($ENV{PCLIENT_DEBUG}) {
365 glPushMatrix;
366 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0;
370 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h};
373 glEnd;
374 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 }
313} 377}
314 378
315sub _draw { 379sub _draw {
316 my ($self) = @_; 380 my ($self) = @_;
317 381
… …
337} 401}
338 402
339sub check_size { 403sub check_size {
340 my ($self) = @_; 404 my ($self) = @_;
341 405
342 return unless $self->{parent}; 406 $self->{parent}
407 or return 1;
343 408
344 my ($w, $h) = $self->size_request; 409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
345 412
346 if ($w != $self->{req_w} || $h != $self->{req_h}) { 413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w; 414 $self->{req_w} = $w;
348 $self->{req_h} = $h; 415 $self->{req_h} = $h;
349 416
350 $self->{parent}->check_size; 417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
351 } 426 }
352} 427}
353 428
354sub update { 429sub update {
355 my ($self) = @_; 430 my ($self) = @_;
… …
365} 440}
366 441
367sub emit { 442sub emit {
368 my ($self, $signal, @args) = @_; 443 my ($self, $signal, @args) = @_;
369 444
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 446}
374 447
375sub DESTROY { 448sub DESTROY {
376 my ($self) = @_; 449 my ($self) = @_;
377 450
… …
444sub new { 517sub new {
445 my ($class, %arg) = @_; 518 my ($class, %arg) = @_;
446 519
447 my $children = delete $arg{children} || []; 520 my $children = delete $arg{children} || [];
448 521
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 522 my $self = $class->SUPER::new (
523 children => [],
524 can_events => 0,
525 %arg,
526 );
450 $self->add ($_) for @$children; 527 $self->add ($_) for @$children;
451 528
452 $self 529 $self
453} 530}
454 531
… …
463 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 541 @{$self->{children}}, $child
465 ]; 542 ];
466 543
467 $child->check_size; 544 $child->check_size;
545 $self->update;
546}
547
548sub children {
549 @{ $_[0]{children} }
468} 550}
469 551
470sub remove { 552sub remove {
471 my ($self, $child) = @_; 553 my ($self, $child) = @_;
472 554
473 delete $child->{parent}; 555 delete $child->{parent};
556 $child->hide;
474 557
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559
560 $self->check_size;
561 $self->update;
562}
563
564sub clear {
565 my ($self) = @_;
566
567 my $children = delete $self->{children};
568 $self->{children} = [];
569
570 for (@$children) {
571 delete $_->{parent};
572 $_->hide;
573 }
476 574
477 $self->check_size; 575 $self->check_size;
478 $self->update; 576 $self->update;
479} 577}
480 578
… …
558} 656}
559 657
560sub update { 658sub update {
561 my ($self) = @_; 659 my ($self) = @_;
562 660
563 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 662 $self->SUPER::update;
566}
567
568sub render_chld {
569 my ($self) = @_;
570
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1;
573 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw;
575 };
576} 663}
577 664
578sub size_allocate { 665sub size_allocate {
579 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
580 667
581 $self->child->configure (0, 0, $w, $h); 668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
582 671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
676sub render_child {
677 my ($self) = @_;
678
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT;
682
583 $self->render_chld; 683 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 };
584} 692}
585 693
586sub _draw { 694sub _draw {
587 my ($self) = @_; 695 my ($self) = @_;
588 696
… …
590 698
591 my $tex = $self->{texture} 699 my $tex = $self->{texture}
592 or return; 700 or return;
593 701
594 glEnable GL_BLEND; 702 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1;
598 707
599 $tex->draw_quad (0, 0, $w, $h); 708 $tex->draw_quad (0, 0, $w, $h);
600 709
601 glDisable GL_BLEND; 710 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 711 glDisable GL_TEXTURE_2D;
… …
606 715
607package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
608 717
609our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
610 719
611sub new { die }
612
613sub size_request { 720sub size_request {
614 my ($self) = @_; 721 my ($self) = @_;
615 722
616 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
618 725
619 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
620} 727}
621 728
622sub _draw { 729sub size_allocate {
623 my ($self) = @_; 730 my ($self, $w, $h) = @_;
624 731
625 $self->{children}[1]->draw; 732 $self->update;
626} 733}
627 734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744# hmm, this does not work for topleft of $self... but we should not aks for that
745sub _topleft {
746 my ($self, $x, $y) = @_;
747
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
749}
750
751sub find_widget {
752 my ($self, $x, $y) = @_;
753
754 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
756 ) {
757 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758 } else {
759 $self->CFClient::UI::Base::find_widget ($x, $y)
760 }
761}
762
763sub _render {
764 my ($self) = @_;
765
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767
768 $self->SUPER::_render;
769}
770
771#############################################################################
772
773package CFClient::UI::ScrolledWindow;
774
775our @ISA = CFClient::UI::HBox::;
776
777sub new {
778 my $class = shift;
779
780 my $self;
781
782 my $slider = new CFClient::UI::Slider
783 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 },
788 ;
789
790 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort),
792 slider => $slider,
793 @_,
794 );
795
796 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp});
798 $self->add ($self->{slider});
799
800 $self
801}
802
803#TODO# update range on size_allocate depeneing on child
804# update viewport offset on scroll
628 805
629############################################################################# 806#############################################################################
630 807
631package CFClient::UI::Frame; 808package CFClient::UI::Frame;
632 809
… …
643 border => 0.8, 820 border => 0.8,
644 @_ 821 @_
645 ); 822 );
646 823
647 $self 824 $self
648}
649
650sub set_size {
651 my ($self, $w, $h) = @_;
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655}
656
657sub size_request {
658 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h})
660}
661
662sub size_allocate {
663 my ($self, $w, $h) = @_;
664 $self->{w} = $w;
665 $self->{h} = $h;
666 $self->child->configure (0, 0, $w, $h);
667} 825}
668 826
669sub _draw { 827sub _draw {
670 my ($self) = @_; 828 my ($self) = @_;
671 829
… …
706 my $class = shift; 864 my $class = shift;
707 865
708 # TODO: user_x, user_y, overwrite moveto? 866 # TODO: user_x, user_y, overwrite moveto?
709 867
710 my $self = $class->SUPER::new ( 868 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 869 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 870 border_bg => [1, 1, 1, 1],
713 border => 0.8, 871 border => 0.6,
714 can_events => 1, 872 can_events => 1,
715 @_ 873 @_
716 ); 874 );
717 875
718 $self->{title} &&= new CFClient::UI::Label 876 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 877 align => 0,
720 valign => 1, 878 valign => 1,
721 text => $self->{title}, 879 text => $self->{title},
722 fontsize => 1; 880 fontsize => $self->{border};
723 881
724 $self 882 $self
725} 883}
726 884
727sub border { 885sub border {
728 int $_[0]{border} * $::FONTSIZE 886 int $_[0]{border} * $::FONTSIZE
729} 887}
730 888
731sub size_request { 889sub size_request {
732 my ($self) = @_; 890 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 891
736 my ($w, $h) = $self->SUPER::size_request; 892 my ($w, $h) = $self->SUPER::size_request;
737 893
738 ( 894 (
739 $w + $self->border * 2, 895 $w + $self->border * 2,
… …
754} 910}
755 911
756sub button_down { 912sub button_down {
757 my ($self, $ev, $x, $y) = @_; 913 my ($self, $ev, $x, $y) = @_;
758 914
915 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 916 my $border = $self->border;
760 917
761 if ($x < $self->{w} && $x >= $self->{w} - $border 918 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 919 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 920
921 if ($lr & $td) {
922 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 924 my ($bw, $bh) = ($self->{w}, $self->{h});
766 925
926 my $mx = $x < $border;
927 my $my = $y < $border;
928
767 $self->{motion} = sub { 929 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 930 my ($ev, $x, $y) = @_;
769 931
770 ($x, $y) = ($ev->{x}, $ev->{y}); 932 my $dx = $ev->{x} - $ox;
933 my $dy = $ev->{y} - $oy;
771 934
772 $self->{user_w} = $bw + $x - $ox; 935 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 936 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
937 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
774 $self->check_size; 938 $self->check_size;
775 }; 939 };
776 940
777 } elsif ($x >= 0 && $x < $self->{w} 941 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 942 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 943 my ($bx, $by) = ($self->{x}, $self->{y});
782 944
783 $self->{motion} = sub { 945 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 946 my ($ev, $x, $y) = @_;
… …
820 $tex[1]->draw_quad (0, 0, $w, $border); 982 $tex[1]->draw_quad (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 983 $tex[3]->draw_quad (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 985 $tex[4]->draw_quad (0, $h - $border, $w, $border);
824 986
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 988 my $bg = $tex[0];
826 989
827 # TODO: repeat texture not scale 990 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 991 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 992 my $rep_y = $ch / $bg->{h};
830 993
831 glColor @{ $self->{bg} }; 994 glColor @{ $self->{bg} };
832 995
833 $bg->{s} = $rep_x; 996 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 997 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 998 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 999 $bg->draw_quad ($border, $border, $cw, $ch);
837 1000
838 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1003 }
840 1004
841 $self->{title}->draw if $self->{title}; 1005 $self->{title}->draw if $self->{title};
1006
842 $self->child->draw; 1007 $self->child->draw;
843} 1008}
844 1009
845############################################################################# 1010#############################################################################
846 1011
… …
868 $self->{children}[$y][$x] = $child; 1033 $self->{children}[$y][$x] = $child;
869 1034
870 $child->check_size; 1035 $child->check_size;
871} 1036}
872 1037
1038sub children {
1039 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040}
1041
873# TODO: move to container class maybe? send childs a signal on removal? 1042# TODO: move to container class maybe? send childs a signal on removal?
874sub clear { 1043sub clear {
875 my ($self) = @_; 1044 my ($self) = @_;
876 1045
1046 my @children = $self->children;
877 delete $self->{children}; 1047 delete $self->{children};
1048
1049 for (@children) {
1050 delete $_->{parent};
1051 $_->hide;
1052 }
1053
878 $self->update; 1054 $self->update;
879} 1055}
880 1056
881sub get_wh { 1057sub get_wh {
882 my ($self) = @_; 1058 my ($self) = @_;
… …
1105 1281
1106sub new { 1282sub new {
1107 my ($class, %arg) = @_; 1283 my ($class, %arg) = @_;
1108 1284
1109 my $self = $class->SUPER::new ( 1285 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1286 fg => [1, 1, 1],
1111 #font => default_font 1287 #font => default_font
1112 fontsize => 1, 1288 fontsize => 1,
1113 text => "", 1289 text => "",
1114 align => -1, 1290 align => -1,
1115 valign => -1, 1291 valign => -1,
1116 padding => 2, 1292 padding => 2,
1117 layout => new CFClient::Layout, 1293 layout => new CFClient::Layout,
1118 can_events => 0, 1294 can_events => 0,
1119 %arg 1295 %arg
1120 ); 1296 );
1121 1297
1122 if (exists $self->{template}) { 1298 if (exists $self->{template}) {
… …
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1305 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130 1306
1131 $self 1307 $self
1132} 1308}
1133 1309
1134sub escape_text { 1310sub escape {
1135 local $_ = $_[1]; 1311 local $_ = $_[1];
1136 1312
1137 s/&/&amp;/g; 1313 s/&/&amp;/g;
1138 s/>/&gt;/g; 1314 s/>/&gt;/g;
1139 s/</&lt;/g; 1315 s/</&lt;/g;
1140 1316
1141 $_[1] 1317 $_[1]
1142} 1318}
1143 1319
1320sub update {
1321 my ($self) = @_;
1322
1323 delete $self->{texture};
1324 $self->SUPER::update;
1325}
1326
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1144sub set_text { 1333sub set_text {
1145 my ($self, $text) = @_; 1334 my ($self, $text) = @_;
1146 1335
1336 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text";
1338
1147 $self->{layout}->set_text ($text); 1339 $self->{layout}->set_text ($text);
1148 1340
1149 delete $self->{texture}; 1341 delete $self->{texture};
1342 $self->update;
1150 $self->check_size; 1343 $self->check_size;
1151 $self->update;
1152} 1344}
1153 1345
1154sub set_markup { 1346sub set_markup {
1155 my ($self, $markup) = @_; 1347 my ($self, $markup) = @_;
1156 1348
1349 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup";
1351
1157 $self->{layout}->set_markup ($markup); 1352 $self->{layout}->set_markup ($markup);
1158 1353
1159 delete $self->{texture}; 1354 delete $self->{texture};
1355 $self->update;
1160 $self->check_size; 1356 $self->check_size;
1161 $self->update;
1162} 1357}
1163 1358
1164sub size_request { 1359sub size_request {
1165 my ($self) = @_; 1360 my ($self) = @_;
1166 1361
… …
1246 1441
1247sub new { 1442sub new {
1248 my $class = shift; 1443 my $class = shift;
1249 1444
1250 $class->SUPER::new ( 1445 $class->SUPER::new (
1251 fg => [1, 1, 1], 1446 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1447 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1448 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1449 active_fg => [0, 0, 0],
1255 can_hover => 1, 1450 can_hover => 1,
1256 can_focus => 1, 1451 can_focus => 1,
1257 valign => 0, 1452 valign => 0,
1258 can_events => 1, 1453 can_events => 1,
1259 @_ 1454 @_
1260 ) 1455 )
1261} 1456}
1262 1457
… …
1416 my ($self, $ev) = @_; 1611 my ($self, $ev) = @_;
1417 1612
1418 my $sym = $ev->{sym}; 1613 my $sym = $ev->{sym};
1419 1614
1420 if ($sym == 13) { 1615 if ($sym == 13) {
1616 unshift @{$self->{history}},
1617 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1620 $self->emit (activate => $txt);
1422 $self->update; 1621 $self->update;
1622
1623 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text;
1626 }
1627 if (@{$self->{history} || []} > 0) {
1628 $self->{history_pointer}++;
1629 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1630 $self->{history_pointer} = @{$self->{history} || []} - 1;
1631 }
1632 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1633 }
1634
1635 } elsif ($sym == CFClient::SDLK_DOWN) {
1636 $self->{history_pointer}--;
1637 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1638
1639 if ($self->{history_pointer} >= 0) {
1640 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1641 } else {
1642 $self->set_text ($self->{history_saveback});
1643 }
1423 1644
1424 } else { 1645 } else {
1425 $self->SUPER::key_down ($ev); 1646 $self->SUPER::key_down ($ev);
1426 } 1647 }
1427 1648
… …
1441 1662
1442sub new { 1663sub new {
1443 my $class = shift; 1664 my $class = shift;
1444 1665
1445 $class->SUPER::new ( 1666 $class->SUPER::new (
1446 padding => 4, 1667 padding => 4,
1447 fg => [1, 1, 1], 1668 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1669 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1670 active_fg => [0, 0, 1],
1450 can_hover => 1, 1671 can_hover => 1,
1451 align => 0, 1672 align => 0,
1452 valign => 0, 1673 valign => 0,
1453 can_events => 1, 1674 can_events => 1,
1454 @_ 1675 @_
1455 ) 1676 )
1456} 1677}
1457 1678
… …
1616 1837
1617package CFClient::UI::VGauge; 1838package CFClient::UI::VGauge;
1618 1839
1619our @ISA = CFClient::UI::Base::; 1840our @ISA = CFClient::UI::Base::;
1620 1841
1842use List::Util qw(min max);
1843
1621use CFClient::OpenGL; 1844use CFClient::OpenGL;
1622 1845
1623my %tex = ( 1846my %tex = (
1624 food => [ 1847 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1848 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1849 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1850 ],
1628 grace => [ 1851 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1852 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1853 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1854 ],
1632 hp => [ 1855 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1856 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1857 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1858 ],
1636 mana => [ 1859 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1860 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1861 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1862 ],
1640); 1863);
1641 1864
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1865# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1866sub new {
… …
1662} 1885}
1663 1886
1664sub set_max { 1887sub set_max {
1665 my ($self, $max) = @_; 1888 my ($self, $max) = @_;
1666 1889
1890 return if $self->{max_val} == $max;
1891
1667 $self->{max_val} = $max; 1892 $self->{max_val} = $max;
1893 $self->update;
1668} 1894}
1669 1895
1670sub set_value { 1896sub set_value {
1671 my ($self, $val, $max) = @_; 1897 my ($self, $val, $max) = @_;
1672 1898
1673 $self->set_max ($max) 1899 $self->set_max ($max)
1674 if defined $max; 1900 if defined $max;
1675 1901
1676 $max = $self->{max_val}; 1902 return if $self->{val} == $val;
1903
1677 $self->{val} = $val; 1904 $self->{val} = $val;
1678
1679 $self->update; 1905 $self->update;
1680} 1906}
1681 1907
1682sub _draw { 1908sub _draw {
1683 my ($self) = @_; 1909 my ($self) = @_;
1684 1910
1685 my $tex = $tex{$self->{type}}; 1911 my $tex = $tex{$self->{type}};
1912 my ($t1, $t2, $t3) = @$tex;
1686 1913
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1914 my ($w, $h) = ($self->{w}, $self->{h});
1688 1915
1689 if ($self->{vertical}) { 1916 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1917 glRotate 90, 0, 0, 1;
… …
1692 1919
1693 ($w, $h) = ($h, $w); 1920 ($w, $h) = ($h, $w);
1694 } 1921 }
1695 1922
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1923 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1924
1699 my $t1 = $tex->[0]; 1925 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 1926 my $ycut2 = max 0, min 1, $ycut - 1;
1927
1928 my $h1 = $self->{h} * (1 - $ycut1);
1929 my $h2 = $self->{h} * (1 - $ycut2);
1701 1930
1702 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1933 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1935
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1936 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1937 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1938 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1939 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1940 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1941 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1942 glEnd;
1717 1943
1944 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1945 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1946 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1947 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1948 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1949 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1950 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 1951 glEnd;
1952
1953 if ($t3) {
1954 glBindTexture GL_TEXTURE_2D, $t3->{name};
1955 glBegin GL_QUADS;
1956 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1957 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1958 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1959 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1960 glEnd;
1961 }
1725 1962
1726 glDisable GL_BLEND; 1963 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1964 glDisable GL_TEXTURE_2D;
1728} 1965}
1729 1966
… …
1735 1972
1736sub new { 1973sub new {
1737 my ($class, %arg) = @_; 1974 my ($class, %arg) = @_;
1738 1975
1739 my $self = $class->SUPER::new ( 1976 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1977 tooltip => $arg{type},
1978 can_hover => 1,
1979 can_events => 1,
1741 %arg, 1980 %arg,
1742 ); 1981 );
1743 1982
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1983 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1984 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1985 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1986
1748 $self 1987 $self
1749} 1988}
1750 1989
1751sub set_fontsize { 1990sub set_fontsize {
… …
1753 1992
1754 $self->{value}->set_fontsize ($fsize); 1993 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 1994 $self->{max} ->set_fontsize ($fsize);
1756} 1995}
1757 1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
2002}
2003
1758sub set_value { 2004sub set_value {
1759 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1760 2006
1761 $self->set_max ($max) 2007 $self->set_max ($max)
1762 if defined $max; 2008 if defined $max;
1763 2009
1764 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 2011 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773} 2012}
1774 2013
1775############################################################################# 2014#############################################################################
1776 2015
1777package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1796 # TODO: calculations are off 2035 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1800 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1801 req_w => 20, 2040 req_w => $::WIDTH / 80,
1802 req_h => 20, 2041 req_h => $::WIDTH / 80,
1803 vertical => 0, 2042 vertical => 0,
1804 can_hover => 1, 2043 can_hover => 1,
1805 inner_pad => 5, 2044 inner_pad => 5,
1806 @_ 2045 @_
1807 ); 2046 );
… …
1917 2156
1918sub new { 2157sub new {
1919 my $class = shift; 2158 my $class = shift;
1920 2159
1921 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1922 fontsize => 1, 2161 fontsize => 1,
2162 can_events => 0,
1923 #font => default_font 2163 #font => default_font
1924 @_, 2164 @_,
1925 2165
1926 layout => (new CFClient::Layout), 2166 layout => (new CFClient::Layout),
1927 par => [], 2167 par => [],
1928 height => 0, 2168 height => 0,
1929 children => [ 2169 children => [
1930 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
1932 ], 2172 ],
1933 ); 2173 );
1934 2174
1935 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2176
1939 $self 2177 $self
1940} 2178}
1941 2179
1942sub set_fontsize { 2180sub set_fontsize {
… …
1950 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
1951 2189
1952 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
1953 2191
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
1956 $layout->set_text ($text); 2194 $layout->set_text ($text);
1957 2195
1958 ($layout->size)[1] 2196 ($layout->size)[1]
1959} 2197}
1960 2198
… …
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014 2252
2015 delete $self->{texture}; 2253 delete $self->{texture};
2016 } 2254 }
2017 2255
2018 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2256 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2019 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
2021 2259
2022 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2056} 2294}
2057 2295
2058sub _draw { 2296sub _draw {
2059 my ($self) = @_; 2297 my ($self) = @_;
2060 2298
2061 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2062 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2304 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2066 } 2306 glDisable GL_BLEND;
2067 2307
2068 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2069 2309
2070} 2310}
2071 2311
… …
2119 2359
2120sub new { 2360sub new {
2121 my $class = shift; 2361 my $class = shift;
2122 2362
2123 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
2124 state => 0, 2364 state => 0,
2125 connect_activate => \&toggle_flopper, 2365 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2366 @_
2128 ); 2367 );
2129 2368
2130 if ($self->{state}) { 2369 if ($self->{state}) {
2131 $self->{state} = 0; 2370 $self->{state} = 0;
… …
2166 @_, 2405 @_,
2167 can_events => 0, 2406 can_events => 0,
2168 ) 2407 )
2169} 2408}
2170 2409
2171sub set_text { 2410sub set_markup {
2172 my ($self, $text) = @_; 2411 my ($self, $text) = @_;
2173 2412
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2175 $self->{label}->set_text ($text); 2414 $self->{label}->set_markup ($text);
2176 $self->add ($self->{label}); 2415 $self->add ($self->{label});
2177} 2416}
2178 2417
2179sub size_request { 2418sub size_request {
2180 my ($self) = @_; 2419 my ($self) = @_;
2181 2420
2182 $self->child->set_max_size ($::WIDTH * 0.2); 2421 $self->child->set_max_size ($::WIDTH * 0.3);
2183 2422
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2424
2186 ($w + 4, $h + 4) 2425 ($w + 4, $h + 4)
2426}
2427
2428sub size_allocate {
2429 my ($self, $w, $h) = @_;
2430
2431 $self->SUPER::size_allocate ($w - 4, $h - 4);
2187} 2432}
2188 2433
2189sub _draw { 2434sub _draw {
2190 my ($self) = @_; 2435 my ($self) = @_;
2191 2436
… …
2216 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2217} 2462}
2218 2463
2219############################################################################# 2464#############################################################################
2220 2465
2466package CFClient::UI::Face;
2467
2468our @ISA = CFClient::UI::Base::;
2469
2470use CFClient::OpenGL;
2471
2472sub new {
2473 my $class = shift;
2474
2475 $class->SUPER::new (
2476 aspect => 1,
2477 @_,
2478 )
2479}
2480
2481sub size_request {
2482 (32, 8)
2483}
2484
2485sub _draw {
2486 my ($self) = @_;
2487
2488 return unless $::CONN;#d# manage and cache textures differently
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2490
2491 # TODO animation
2492 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 }
2502}
2503
2504#############################################################################
2505
2506package CFClient::UI::Menu;
2507
2508our @ISA = CFClient::UI::FancyFrame::;
2509
2510use CFClient::OpenGL;
2511
2512sub new {
2513 my $class = shift;
2514
2515 my $self = $class->SUPER::new (
2516 items => [],
2517 z => 100,
2518 @_,
2519 );
2520
2521 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2522
2523 for my $item (@{ $self->{items} }) {
2524 my ($widget, $cb) = @$item;
2525
2526 # handle various types of items, only text for now
2527 if (!ref $widget) {
2528 $widget = new CFClient::UI::Label
2529 can_hover => 1,
2530 can_events => 1,
2531 text => $widget;
2532 }
2533
2534 $self->{item}{$widget} = $item;
2535
2536 $self->{vbox}->add ($widget);
2537 }
2538
2539 $self
2540}
2541
2542# popup given the event (must be a mouse button down event currently)
2543sub popup {
2544 my ($self, $ev) = @_;
2545
2546 $self->emit ("popdown");
2547
2548 # maybe save $GRAB? must be careful about events...
2549 $GRAB = $self;
2550 $self->{button} = $ev->{button};
2551
2552 $self->show;
2553 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2554}
2555
2556sub mouse_motion {
2557 my ($self, $ev, $x, $y) = @_;
2558
2559 # TODO: should use vbox->find_widget or so
2560 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2561 $self->{hover} = $self->{item}{$HOVER};
2562}
2563
2564sub button_up {
2565 my ($self, $ev, $x, $y) = @_;
2566
2567 if ($ev->{button} == $self->{button}) {
2568 undef $GRAB;
2569 $self->hide;
2570
2571 $self->emit ("popdown");
2572 $self->{hover}[1]->() if $self->{hover};
2573 }
2574}
2575
2576#############################################################################
2577
2221package CFClient::UI::Root; 2578package CFClient::UI::Root;
2222 2579
2223our @ISA = CFClient::UI::Container::; 2580our @ISA = CFClient::UI::Container::;
2224 2581
2225use CFClient::OpenGL; 2582use CFClient::OpenGL;
… …
2297 $self->_draw; 2654 $self->_draw;
2298} 2655}
2299 2656
2300############################################################################# 2657#############################################################################
2301 2658
2659package CFClient::UI::InventoryItem;
2660
2661our @ISA = CFClient::UI::HBox::;
2662
2663sub new {
2664 my $class = shift;
2665
2666 my %args = @_;
2667
2668 my $item = $args{item};
2669
2670 my $desc = $item->{nrof} < 2
2671 ? $item->{name}
2672 : "$item->{nrof} $item->{name_pl}";
2673
2674
2675 my $self = $class->SUPER::new (
2676 can_hover => 1,
2677 can_events => 1,
2678 tooltip => (CFClient::UI::Label->escape ($desc)
2679 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2680 connect_button_down => sub {
2681 my ($self, $ev, $x, $y) = @_;
2682
2683 # todo: maybe put examine on 1? but should just be a tooltip :(
2684 if ($ev->{button} == 1) {
2685 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2686 } elsif ($ev->{button} == 2) {
2687 $::CONN->send ("apply $item->{tag}");
2688 } elsif ($ev->{button} == 3) {
2689 CFClient::UI::Menu->new (
2690 items => [
2691 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2692 [
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2694 sub { $::CONN->send ("lock $item->{tag}") },
2695 ],
2696 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2697 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2698 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2699 ],
2700 )->popup ($ev);
2701 }
2702
2703 1
2704 },
2705 %args
2706 );
2707 $self->add(new CFClient::UI::Face
2708 can_events => 0,
2709 face => $item->{face},
2710 anim => $item->{anim},
2711 animspeed => $item->{animspeed});
2712 $self->add(new CFClient::UI::Label
2713 can_events => 0,
2714 text => $desc);
2715
2716 $self
2717}
2718
2719#############################################################################
2720
2721package CFClient::UI::Inventory;
2722
2723our @ISA = CFClient::UI::ScrolledWindow::;
2724
2725sub new {
2726 my $class = shift;
2727
2728 my $self = $class->SUPER::new (
2729 scrolled => (new CFClient::UI::VBox),
2730 @_,
2731 );
2732
2733 $self
2734}
2735
2736sub set_items {
2737 my ($self, $items) = @_;
2738
2739 $self->{scrolled}->clear;
2740 return unless $items;
2741
2742 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 for my $item (@items) {
2747 my $desc = $item->{nrof} < 2
2748 ? $item->{name}
2749 : "$item->{nrof} $item->{name_pl}";
2750
2751 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2752 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755}
2756
2757sub size_request {
2758 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h});
2760}
2761
2762#############################################################################
2763
2302package CFClient::UI; 2764package CFClient::UI;
2303 2765
2304$ROOT = new CFClient::UI::Root; 2766$ROOT = new CFClient::UI::Root;
2305$TOOLTIP = new CFClient::UI::Tooltip; 2767$TOOLTIP = new CFClient::UI::Tooltip;
2306 2768

Diff Legend

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