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.154 by root, Sun Apr 23 02:20:57 2006 UTC vs.
Revision 1.184 by root, Wed May 3 19:56:05 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
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
23 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
25 $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);
26 } 39 }
27 40
28 return; 41 return;
29 } 42 }
30 } 43 }
… …
34 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
35} 48}
36 49
37# class methods for events 50# class methods for events
38sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
40} 54}
41 55
42sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
44} 59}
45 60
46sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
47 my ($ev) = @_; 62 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 71 check_tooltip;
57 } 72 }
58 73
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 75
61 $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 }
62} 80}
63 81
64sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
65 my ($ev) = @_; 83 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
67 85
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 87
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 89
72 $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 }
73 94
74 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 97 $grab->update if $grab;
77 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 115
95 check_tooltip; 116 check_tooltip;
96 } 117 }
97 118
98 $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 }
99} 123}
100 124
101# convert position array to integers 125# convert position array to integers
102sub harmonize { 126sub harmonize {
103 my ($vals) = @_; 127 my ($vals) = @_;
… …
121 145
122sub new { 146sub new {
123 my $class = shift; 147 my $class = shift;
124 148
125 my $self = bless { 149 my $self = bless {
126 x => 0, 150 x => 0,
127 y => 0, 151 y => 0,
128 z => 0, 152 z => 0,
129 can_events => 1, 153 can_events => 1,
130 @_ 154 @_
131 }, $class; 155 }, $class;
132 156
133 for (keys %$self) { 157 for (keys %$self) {
… …
137 } 161 }
138 162
139 $self 163 $self
140} 164}
141 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
142sub show { 173sub show {
143 my ($self) = @_; 174 my ($self) = @_;
144 175
145 return if $self->{parent}; 176 return if $self->{parent};
146 177
… …
148} 179}
149 180
150sub hide { 181sub hide {
151 my ($self) = @_; 182 my ($self) = @_;
152 183
153 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
154 186
155 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
156} 189}
157 190
158sub move { 191sub move {
159 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
160 193
… …
163 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
164 197
165 $self->update; 198 $self->update;
166} 199}
167 200
168sub needs_redraw { 201sub set_size {
169 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
170} 208}
171 209
172sub size_request { 210sub size_request {
173 require Carp; 211 require Carp;
174 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
199 $self->{w} = $w; 237 $self->{w} = $w;
200 $self->{h} = $h; 238 $self->{h} = $h;
201 239
202 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
203 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
204 } 243 }
205} 244}
206 245
207sub size_allocate { 246sub size_allocate {
208 # 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;
261}
262
263sub set_max_size {
264 my ($self, $w, $h) = @_;
265
266 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h;
209} 268}
210 269
211# return top left coordinates 270# return top left coordinates
212sub _topleft { 271sub _topleft {
213 my ($self, $x, $y) = @_; 272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
214 276
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
216} 278}
217 279
218# translate global coordinates to local coordinate system 280# translate global coordinates to local coordinate system
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 358 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 359 glVertex $x , $y + $self->{h};
298 glEnd; 360 glEnd;
299 glDisable GL_BLEND; 361 glDisable GL_BLEND;
300 } 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 }
301} 377}
302 378
303sub _draw { 379sub _draw {
304 my ($self) = @_; 380 my ($self) = @_;
305 381
… …
325} 401}
326 402
327sub check_size { 403sub check_size {
328 my ($self) = @_; 404 my ($self) = @_;
329 405
330 return unless $self->{parent}; 406 $self->{parent}
407 or return 1;
331 408
332 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;
333 412
334 if ($w != $self->{req_w} || $h != $self->{req_h}) { 413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w; 414 $self->{req_w} = $w;
336 $self->{req_h} = $h; 415 $self->{req_h} = $h;
337 416
338 $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
339 } 426 }
340} 427}
341 428
342sub update { 429sub update {
343 my ($self) = @_; 430 my ($self) = @_;
… …
353} 440}
354 441
355sub emit { 442sub emit {
356 my ($self, $signal, @args) = @_; 443 my ($self, $signal, @args) = @_;
357 444
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 446}
362 447
363sub DESTROY { 448sub DESTROY {
364 my ($self) = @_; 449 my ($self) = @_;
365 450
… …
432sub new { 517sub new {
433 my ($class, %arg) = @_; 518 my ($class, %arg) = @_;
434 519
435 my $children = delete $arg{children} || []; 520 my $children = delete $arg{children} || [];
436 521
437 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 );
438 $self->add ($_) for @$children; 527 $self->add ($_) for @$children;
439 528
440 $self 529 $self
441} 530}
442 531
… …
451 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 541 @{$self->{children}}, $child
453 ]; 542 ];
454 543
455 $child->check_size; 544 $child->check_size;
545 $self->update;
546}
547
548sub children {
549 @{ $_[0]{children} }
456} 550}
457 551
458sub remove { 552sub remove {
459 my ($self, $child) = @_; 553 my ($self, $child) = @_;
460 554
461 delete $child->{parent}; 555 delete $child->{parent};
556 $child->hide;
462 557
463 $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 }
464 574
465 $self->check_size; 575 $self->check_size;
466 $self->update; 576 $self->update;
467} 577}
468 578
… …
546} 656}
547 657
548sub update { 658sub update {
549 my ($self) = @_; 659 my ($self) = @_;
550 660
551 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 662 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 663}
565 664
566sub size_allocate { 665sub size_allocate {
567 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
568 667
569 $self->child->configure (0, 0, $w, $h); 668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
570 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
571 $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 };
572} 692}
573 693
574sub _draw { 694sub _draw {
575 my ($self) = @_; 695 my ($self) = @_;
576 696
… …
578 698
579 my $tex = $self->{texture} 699 my $tex = $self->{texture}
580 or return; 700 or return;
581 701
582 glEnable GL_BLEND; 702 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
585 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;
586 707
587 $tex->draw_quad (0, 0, $w, $h); 708 $tex->draw_quad (0, 0, $w, $h);
588 709
589 glDisable GL_BLEND; 710 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 711 glDisable GL_TEXTURE_2D;
… …
594 715
595package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
596 717
597our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
598 719
599sub new { die }
600
601sub size_request { 720sub size_request {
602 my ($self) = @_; 721 my ($self) = @_;
603 722
604 @$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)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
606 725
607 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
608} 727}
609 728
610sub _draw { 729sub size_allocate {
611 my ($self) = @_; 730 my ($self, $w, $h) = @_;
612 731
613 $self->{children}[1]->draw; 732 $self->update;
614} 733}
615 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
616 805
617############################################################################# 806#############################################################################
618 807
619package CFClient::UI::Frame; 808package CFClient::UI::Frame;
620 809
… …
631 border => 0.8, 820 border => 0.8,
632 @_ 821 @_
633 ); 822 );
634 823
635 $self 824 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644
645sub size_request {
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649
650sub size_allocate {
651 my ($self, $w, $h) = @_;
652 $self->{w} = $w;
653 $self->{h} = $h;
654 $self->child->configure (0, 0, $w, $h);
655} 825}
656 826
657sub _draw { 827sub _draw {
658 my ($self) = @_; 828 my ($self) = @_;
659 829
… …
694 my $class = shift; 864 my $class = shift;
695 865
696 # TODO: user_x, user_y, overwrite moveto? 866 # TODO: user_x, user_y, overwrite moveto?
697 867
698 my $self = $class->SUPER::new ( 868 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 869 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 870 border_bg => [1, 1, 1, 1],
701 border => 0.8, 871 border => 0.6,
702 can_events => 1, 872 can_events => 1,
703 @_ 873 @_
704 ); 874 );
705 875
706 $self->{title} &&= new CFClient::UI::Label 876 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 877 align => 0,
708 valign => 1, 878 valign => 1,
709 text => $self->{title}, 879 text => $self->{title},
710 fontsize => 1; 880 fontsize => $self->{border};
711 881
712 $self 882 $self
713} 883}
714 884
715sub border { 885sub border {
716 int $_[0]{border} * $::FONTSIZE 886 int $_[0]{border} * $::FONTSIZE
717} 887}
718 888
719sub size_request { 889sub size_request {
720 my ($self) = @_; 890 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 891
724 my ($w, $h) = $self->SUPER::size_request; 892 my ($w, $h) = $self->SUPER::size_request;
725 893
726 ( 894 (
727 $w + $self->border * 2, 895 $w + $self->border * 2,
… …
742} 910}
743 911
744sub button_down { 912sub button_down {
745 my ($self, $ev, $x, $y) = @_; 913 my ($self, $ev, $x, $y) = @_;
746 914
915 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 916 my $border = $self->border;
748 917
749 if ($x < $self->{w} && $x >= $self->{w} - $border 918 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 919 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 920
921 if ($lr & $td) {
922 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 924 my ($bw, $bh) = ($self->{w}, $self->{h});
754 925
926 my $mx = $x < $border;
927 my $my = $y < $border;
928
755 $self->{motion} = sub { 929 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 930 my ($ev, $x, $y) = @_;
757 931
758 ($x, $y) = ($ev->{x}, $ev->{y}); 932 my $dx = $ev->{x} - $ox;
933 my $dy = $ev->{y} - $oy;
759 934
760 $self->{user_w} = $bw + $x - $ox; 935 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 936 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
937 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
762 $self->check_size; 938 $self->check_size;
763 }; 939 };
764 940
765 } elsif ($x >= 0 && $x < $self->{w} 941 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 942 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 943 my ($bx, $by) = ($self->{x}, $self->{y});
770 944
771 $self->{motion} = sub { 945 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 946 my ($ev, $x, $y) = @_;
… …
808 $tex[1]->draw_quad (0, 0, $w, $border); 982 $tex[1]->draw_quad (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 983 $tex[3]->draw_quad (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 985 $tex[4]->draw_quad (0, $h - $border, $w, $border);
812 986
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 988 my $bg = $tex[0];
814 989
815 # TODO: repeat texture not scale 990 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 991 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 992 my $rep_y = $ch / $bg->{h};
818 993
819 glColor @{ $self->{bg} }; 994 glColor @{ $self->{bg} };
820 995
821 $bg->{s} = $rep_x; 996 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 997 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 998 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 999 $bg->draw_quad ($border, $border, $cw, $ch);
825 1000
826 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1003 }
828 1004
829 $self->{title}->draw if $self->{title}; 1005 $self->{title}->draw if $self->{title};
1006
830 $self->child->draw; 1007 $self->child->draw;
831} 1008}
832 1009
833############################################################################# 1010#############################################################################
834 1011
… …
856 $self->{children}[$y][$x] = $child; 1033 $self->{children}[$y][$x] = $child;
857 1034
858 $child->check_size; 1035 $child->check_size;
859} 1036}
860 1037
1038sub children {
1039 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040}
1041
861# 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?
862sub clear { 1043sub clear {
863 my ($self) = @_; 1044 my ($self) = @_;
864 1045
1046 my @children = $self->children;
865 delete $self->{children}; 1047 delete $self->{children};
1048
1049 for (@children) {
1050 delete $_->{parent};
1051 $_->hide;
1052 }
1053
866 $self->update; 1054 $self->update;
867} 1055}
868 1056
869sub get_wh { 1057sub get_wh {
870 my ($self) = @_; 1058 my ($self) = @_;
… …
1093 1281
1094sub new { 1282sub new {
1095 my ($class, %arg) = @_; 1283 my ($class, %arg) = @_;
1096 1284
1097 my $self = $class->SUPER::new ( 1285 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1286 fg => [1, 1, 1],
1287 #font => default_font
1099 fontsize => 1, 1288 fontsize => 1,
1100 text => "", 1289 text => "",
1101 align => -1, 1290 align => -1,
1102 valign => -1, 1291 valign => -1,
1103 padding => 2, 1292 padding => 2,
1104 layout => new CFClient::Layout, 1293 layout => new CFClient::Layout,
1105 can_events => 0, 1294 can_events => 0,
1106 %arg 1295 %arg
1107 ); 1296 );
1108 1297
1109 if (exists $self->{template}) { 1298 if (exists $self->{template}) {
… …
1116 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1305 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1117 1306
1118 $self 1307 $self
1119} 1308}
1120 1309
1121sub escape_text { 1310sub escape {
1122 local $_ = $_[1]; 1311 local $_ = $_[1];
1123 1312
1124 s/&/&amp;/g; 1313 s/&/&amp;/g;
1125 s/>/&gt;/g; 1314 s/>/&gt;/g;
1126 s/</&lt;/g; 1315 s/</&lt;/g;
1127 1316
1128 $_[1] 1317 $_[1]
1129} 1318}
1130 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
1131sub set_text { 1333sub set_text {
1132 my ($self, $text) = @_; 1334 my ($self, $text) = @_;
1133 1335
1336 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text";
1338
1134 $self->{layout}->set_text ($text); 1339 $self->{layout}->set_text ($text);
1135 1340
1136 delete $self->{texture}; 1341 delete $self->{texture};
1342 $self->update;
1137 $self->check_size; 1343 $self->check_size;
1138 $self->update;
1139} 1344}
1140 1345
1141sub set_markup { 1346sub set_markup {
1142 my ($self, $markup) = @_; 1347 my ($self, $markup) = @_;
1143 1348
1349 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup";
1351
1144 $self->{layout}->set_markup ($markup); 1352 $self->{layout}->set_markup ($markup);
1145 1353
1146 delete $self->{texture}; 1354 delete $self->{texture};
1355 $self->update;
1147 $self->check_size; 1356 $self->check_size;
1148 $self->update;
1149} 1357}
1150 1358
1151sub size_request { 1359sub size_request {
1152 my ($self) = @_; 1360 my ($self) = @_;
1153 1361
1154 $self->{layout}->set_width; 1362 $self->{layout}->set_font ($self->{font}) if $self->{font};
1363 $self->{layout}->set_width ($self->{max_w} || -1);
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1364 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1365
1157 my ($w, $h) = $self->{layout}->size; 1366 my ($w, $h) = $self->{layout}->size;
1158 1367
1159 if (exists $self->{template}) { 1368 if (exists $self->{template}) {
1369 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1370 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1371
1162 my ($w2, $h2) = $self->{template}->size; 1372 my ($w2, $h2) = $self->{template}->size;
1163 1373
1164 $w = List::Util::max $w, $w2; 1374 $w = List::Util::max $w, $w2;
… …
1188 1398
1189sub _draw { 1399sub _draw {
1190 my ($self) = @_; 1400 my ($self) = @_;
1191 1401
1192 my $tex = $self->{texture} ||= do { 1402 my $tex = $self->{texture} ||= do {
1403 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{w}); 1404 $self->{layout}->set_width ($self->{w});
1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1195 new_from_layout CFClient::Texture $self->{layout} 1406 new_from_layout CFClient::Texture $self->{layout}
1196 }; 1407 };
1197 1408
… …
1230 1441
1231sub new { 1442sub new {
1232 my $class = shift; 1443 my $class = shift;
1233 1444
1234 $class->SUPER::new ( 1445 $class->SUPER::new (
1235 fg => [1, 1, 1], 1446 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1447 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1448 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1449 active_fg => [0, 0, 0],
1239 can_hover => 1, 1450 can_hover => 1,
1240 can_focus => 1, 1451 can_focus => 1,
1241 valign => 0, 1452 valign => 0,
1242 can_events => 1, 1453 can_events => 1,
1243 @_ 1454 @_
1244 ) 1455 )
1245} 1456}
1246 1457
… …
1400 my ($self, $ev) = @_; 1611 my ($self, $ev) = @_;
1401 1612
1402 my $sym = $ev->{sym}; 1613 my $sym = $ev->{sym};
1403 1614
1404 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} = '';
1405 $self->emit (activate => $self->get_text); 1620 $self->emit (activate => $txt);
1406 $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 }
1407 1644
1408 } else { 1645 } else {
1409 $self->SUPER::key_down ($ev); 1646 $self->SUPER::key_down ($ev);
1410 } 1647 }
1411 1648
… …
1425 1662
1426sub new { 1663sub new {
1427 my $class = shift; 1664 my $class = shift;
1428 1665
1429 $class->SUPER::new ( 1666 $class->SUPER::new (
1430 padding => 4, 1667 padding => 4,
1431 fg => [1, 1, 1], 1668 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2], 1669 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1670 active_fg => [0, 0, 1],
1434 can_hover => 1, 1671 can_hover => 1,
1435 align => 0, 1672 align => 0,
1436 valign => 0, 1673 valign => 0,
1437 can_events => 1, 1674 can_events => 1,
1438 @_ 1675 @_
1439 ) 1676 )
1440} 1677}
1441 1678
… …
1600 1837
1601package CFClient::UI::VGauge; 1838package CFClient::UI::VGauge;
1602 1839
1603our @ISA = CFClient::UI::Base::; 1840our @ISA = CFClient::UI::Base::;
1604 1841
1842use List::Util qw(min max);
1843
1605use CFClient::OpenGL; 1844use CFClient::OpenGL;
1606 1845
1607my %tex = ( 1846my %tex = (
1608 food => [ 1847 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1848 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1849 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1850 ],
1612 grace => [ 1851 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1852 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 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/
1615 ], 1854 ],
1616 hp => [ 1855 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1856 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1857 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1858 ],
1620 mana => [ 1859 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1860 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 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/
1623 ], 1862 ],
1624); 1863);
1625 1864
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1865# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1866sub new {
… …
1646} 1885}
1647 1886
1648sub set_max { 1887sub set_max {
1649 my ($self, $max) = @_; 1888 my ($self, $max) = @_;
1650 1889
1890 return if $self->{max_val} == $max;
1891
1651 $self->{max_val} = $max; 1892 $self->{max_val} = $max;
1893 $self->update;
1652} 1894}
1653 1895
1654sub set_value { 1896sub set_value {
1655 my ($self, $val, $max) = @_; 1897 my ($self, $val, $max) = @_;
1656 1898
1657 $self->set_max ($max) 1899 $self->set_max ($max)
1658 if defined $max; 1900 if defined $max;
1659 1901
1660 $max = $self->{max_val}; 1902 return if $self->{val} == $val;
1903
1661 $self->{val} = $val; 1904 $self->{val} = $val;
1662
1663 $self->update; 1905 $self->update;
1664} 1906}
1665 1907
1666sub _draw { 1908sub _draw {
1667 my ($self) = @_; 1909 my ($self) = @_;
1668 1910
1669 my $tex = $tex{$self->{type}}; 1911 my $tex = $tex{$self->{type}};
1912 my ($t1, $t2, $t3) = @$tex;
1670 1913
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1914 my ($w, $h) = ($self->{w}, $self->{h});
1672 1915
1673 if ($self->{vertical}) { 1916 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1917 glRotate 90, 0, 0, 1;
… …
1676 1919
1677 ($w, $h) = ($h, $w); 1920 ($w, $h) = ($h, $w);
1678 } 1921 }
1679 1922
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1923 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1924
1683 my $t1 = $tex->[0]; 1925 my $ycut1 = max 0, min 1, $ycut;
1684 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);
1685 1930
1686 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1933 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1935
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1936 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1937 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1938 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1939 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1940 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1941 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1942 glEnd;
1701 1943
1944 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1945 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1946 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1947 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1948 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1949 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1950 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 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 }
1709 1962
1710 glDisable GL_BLEND; 1963 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1964 glDisable GL_TEXTURE_2D;
1712} 1965}
1713 1966
… …
1719 1972
1720sub new { 1973sub new {
1721 my ($class, %arg) = @_; 1974 my ($class, %arg) = @_;
1722 1975
1723 my $self = $class->SUPER::new ( 1976 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 1977 tooltip => $arg{type},
1978 can_hover => 1,
1979 can_events => 1,
1725 %arg, 1980 %arg,
1726 ); 1981 );
1727 1982
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1983 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1984 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1985 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 1986
1732 $self 1987 $self
1733} 1988}
1734 1989
… …
1737 1992
1738 $self->{value}->set_fontsize ($fsize); 1993 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 1994 $self->{max} ->set_fontsize ($fsize);
1740} 1995}
1741 1996
1997sub set_max {
1998 my ($self, $max) = @_;
1999
2000 $self->{gauge}->set_max ($max);
2001 $self->{max}->set_text ($max);
2002}
2003
1742sub set_value { 2004sub set_value {
1743 my ($self, $val, $max) = @_; 2005 my ($self, $val, $max) = @_;
1744 2006
1745 $self->set_max ($max) 2007 $self->set_max ($max)
1746 if defined $max; 2008 if defined $max;
1747 2009
1748 $self->{gauge}->set_value ($val, $max); 2010 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 2011 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 2012}
1758 2013
1759############################################################################# 2014#############################################################################
1760 2015
1761package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
… …
1780 # TODO: calculations are off 2035 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1783 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1784 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1785 req_w => 20, 2040 req_w => $::WIDTH / 80,
1786 req_h => 20, 2041 req_h => $::WIDTH / 80,
1787 vertical => 0, 2042 vertical => 0,
1788 can_hover => 1, 2043 can_hover => 1,
1789 inner_pad => 5, 2044 inner_pad => 5,
1790 @_ 2045 @_
1791 ); 2046 );
… …
1901 2156
1902sub new { 2157sub new {
1903 my $class = shift; 2158 my $class = shift;
1904 2159
1905 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1906 fontsize => 1, 2161 fontsize => 1,
2162 can_events => 0,
2163 #font => default_font
1907 @_, 2164 @_,
1908 2165
1909 layout => (new CFClient::Layout), 2166 layout => (new CFClient::Layout),
1910 par => [], 2167 par => [],
1911 height => 0, 2168 height => 0,
1912 children => [ 2169 children => [
1913 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
1915 ], 2172 ],
1916 ); 2173 );
1917 2174
1918 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2176
1922 $self 2177 $self
1923} 2178}
1924 2179
1925sub set_fontsize { 2180sub set_fontsize {
… …
1933 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
1934 2189
1935 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
1936 2191
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
1939 $layout->set_text ($text); 2194 $layout->set_text ($text);
1940 2195
1941 ($layout->size)[1] 2196 ($layout->size)[1]
1942} 2197}
1943 2198
… …
1951sub size_allocate { 2206sub size_allocate {
1952 my ($self, $w, $h) = @_; 2207 my ($self, $w, $h) = @_;
1953 2208
1954 $self->SUPER::size_allocate ($w, $h); 2209 $self->SUPER::size_allocate ($w, $h);
1955 2210
2211 $self->{layout}->set_font ($self->{font}) if $self->{font};
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2212 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1957 $self->{layout}->set_width ($self->{children}[0]{w}); 2213 $self->{layout}->set_width ($self->{children}[0]{w});
1958 2214
1959 $self->reflow; 2215 $self->reflow;
1960} 2216}
… …
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1996 2252
1997 delete $self->{texture}; 2253 delete $self->{texture};
1998 } 2254 }
1999 2255
2000 $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 {
2001 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
2003 2259
2004 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2013 2269
2014 my $y = 0; 2270 my $y = 0;
2015 2271
2016 my $layout = $self->{layout}; 2272 my $layout = $self->{layout};
2017 2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275
2018 for my $par (@{$self->{par}}) { 2276 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2277 my $h = $par->[0];
2020 2278
2021 if ($y0 < $y + $h && $y < $y1) { 2279 if ($y0 < $y + $h && $y < $y1) {
2022 $layout->set_text ($par->[2]); 2280 $layout->set_text ($par->[2]);
… …
2036} 2294}
2037 2295
2038sub _draw { 2296sub _draw {
2039 my ($self) = @_; 2297 my ($self) = @_;
2040 2298
2041 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
2043 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;
2044 $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});
2045 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
2046 } 2306 glDisable GL_BLEND;
2047 2307
2048 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
2049 2309
2050} 2310}
2051 2311
… …
2099 2359
2100sub new { 2360sub new {
2101 my $class = shift; 2361 my $class = shift;
2102 2362
2103 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
2104 state => 0, 2364 state => 0,
2105 connect_activate => \&toggle_flopper, 2365 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2366 @_
2108 ); 2367 );
2109 2368
2110 if ($self->{state}) { 2369 if ($self->{state}) {
2111 $self->{state} = 0; 2370 $self->{state} = 0;
… …
2146 @_, 2405 @_,
2147 can_events => 0, 2406 can_events => 0,
2148 ) 2407 )
2149} 2408}
2150 2409
2151sub set_text { 2410sub set_markup {
2152 my ($self, $text) = @_; 2411 my ($self, $text) = @_;
2153 2412
2154 $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];
2155 $self->{label}->set_text ($text); 2414 $self->{label}->set_markup ($text);
2156 $self->add ($self->{label}); 2415 $self->add ($self->{label});
2157} 2416}
2158 2417
2159sub size_request { 2418sub size_request {
2160 my ($self) = @_; 2419 my ($self) = @_;
2161 2420
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422
2162 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2163 2424
2164 $w = List::Util::min $::WIDTH * 0.2, $w;
2165 $h = List::Util::max $::HEIGHT * 0.2, $h;
2166
2167 ($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);
2168} 2432}
2169 2433
2170sub _draw { 2434sub _draw {
2171 my ($self) = @_; 2435 my ($self) = @_;
2172 2436
… …
2197 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
2198} 2462}
2199 2463
2200############################################################################# 2464#############################################################################
2201 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 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2489
2490 # TODO animation
2491 if ($tex) {
2492 glEnable GL_BLEND;
2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494 glEnable GL_TEXTURE_2D;
2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496 glColor 1, 1, 1, 1;
2497 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2498 glDisable GL_TEXTURE_2D;
2499 glDisable GL_BLEND;
2500 }
2501}
2502
2503#############################################################################
2504
2505package CFClient::UI::Menu;
2506
2507our @ISA = CFClient::UI::FancyFrame::;
2508
2509use CFClient::OpenGL;
2510
2511sub new {
2512 my $class = shift;
2513
2514 my $self = $class->SUPER::new (
2515 items => [],
2516 z => 100,
2517 @_,
2518 );
2519
2520 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2521
2522 for my $item (@{ $self->{items} }) {
2523 my ($widget, $cb) = @$item;
2524
2525 # handle various types of items, only text for now
2526 if (!ref $widget) {
2527 $widget = new CFClient::UI::Label
2528 can_hover => 1,
2529 can_events => 1,
2530 text => $widget;
2531 }
2532
2533 $self->{item}{$widget} = $item;
2534
2535 $self->{vbox}->add ($widget);
2536 }
2537
2538 $self
2539}
2540
2541# popup given the event (must be a mouse button down event currently)
2542sub popup {
2543 my ($self, $ev) = @_;
2544
2545 $self->emit ("popdown");
2546
2547 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self;
2549 $self->{button} = $ev->{button};
2550
2551 $self->show;
2552 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2553}
2554
2555sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_;
2557
2558 # TODO: should use vbox->find_widget or so
2559 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560 $self->{hover} = $self->{item}{$HOVER};
2561}
2562
2563sub button_up {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB;
2568 $self->hide;
2569
2570 $self->emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover};
2572 }
2573}
2574
2575#############################################################################
2576
2202package CFClient::UI::Root; 2577package CFClient::UI::Root;
2203 2578
2204our @ISA = CFClient::UI::Container::; 2579our @ISA = CFClient::UI::Container::;
2205 2580
2206use CFClient::OpenGL; 2581use CFClient::OpenGL;
… …
2278 $self->_draw; 2653 $self->_draw;
2279} 2654}
2280 2655
2281############################################################################# 2656#############################################################################
2282 2657
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_;
2666
2667 my $item = $args{item};
2668
2669 my $desc = $item->{nrof} < 2
2670 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}";
2672
2673
2674 my $self = $class->SUPER::new (
2675 can_hover => 1,
2676 can_events => 1,
2677 tooltip => (CFClient::UI::Label->escape ($desc)
2678 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679 connect_button_down => sub {
2680 my ($self, $ev, $x, $y) = @_;
2681
2682 # todo: maybe put examine on 1? but should just be a tooltip :(
2683 if ($ev->{button} == 1) {
2684 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685 } elsif ($ev->{button} == 2) {
2686 $::CONN->send ("apply $item->{tag}");
2687 } elsif ($ev->{button} == 3) {
2688 CFClient::UI::Menu->new (
2689 items => [
2690 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691 [
2692 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693 sub { $::CONN->send ("lock $item->{tag}") },
2694 ],
2695 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698 ],
2699 )->popup ($ev);
2700 }
2701
2702 1
2703 },
2704 %args
2705 );
2706 $self->add(new CFClient::UI::Face
2707 can_events => 0,
2708 face => $item->{face},
2709 anim => $item->{anim},
2710 animspeed => $item->{animspeed});
2711 $self->add(new CFClient::UI::Label
2712 can_events => 0,
2713 text => $desc);
2714
2715 $self
2716}
2717
2718#############################################################################
2719
2720package CFClient::UI::Inventory;
2721
2722our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724sub new {
2725 my $class = shift;
2726
2727 my $self = $class->SUPER::new (
2728 scrolled => (new CFClient::UI::VBox),
2729 @_,
2730 );
2731
2732 $self
2733}
2734
2735sub set_items {
2736 my ($self, $items) = @_;
2737
2738 $self->{scrolled}->clear;
2739 return unless $items;
2740
2741 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743 $self->{real_items} = \@items;
2744
2745 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2
2747 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}";
2749
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2283package CFClient::UI; 2763package CFClient::UI;
2284 2764
2285$ROOT = new CFClient::UI::Root; 2765$ROOT = new CFClient::UI::Root;
2286$TOOLTIP = new CFClient::UI::Tooltip; 2766$TOOLTIP = new CFClient::UI::Tooltip;
2287 2767

Diff Legend

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