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.188 by root, Mon May 8 21:16:09 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 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
214} 263}
215 264
216sub set_max_size { 265sub set_max_size {
217 my ($self, $w, $h) = @_; 266 my ($self, $w, $h) = @_;
218 267
… …
221} 270}
222 271
223# return top left coordinates 272# return top left coordinates
224sub _topleft { 273sub _topleft {
225 my ($self, $x, $y) = @_; 274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
226 278
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228} 280}
229 281
230# translate global coordinates to local coordinate system 282# translate global coordinates to local coordinate system
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 360 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 361 glVertex $x , $y + $self->{h};
310 glEnd; 362 glEnd;
311 glDisable GL_BLEND; 363 glDisable GL_BLEND;
312 } 364 }
365
366 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix;
368 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0;
372 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h};
375 glEnd;
376 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 }
313} 379}
314 380
315sub _draw { 381sub _draw {
316 my ($self) = @_; 382 my ($self) = @_;
317 383
… …
337} 403}
338 404
339sub check_size { 405sub check_size {
340 my ($self) = @_; 406 my ($self) = @_;
341 407
342 return unless $self->{parent}; 408 $self->{parent}
409 or return 1;
343 410
344 my ($w, $h) = $self->size_request; 411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
345 414
346 if ($w != $self->{req_w} || $h != $self->{req_h}) { 415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w; 416 $self->{req_w} = $w;
348 $self->{req_h} = $h; 417 $self->{req_h} = $h;
349 418
350 $self->{parent}->check_size; 419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
351 } 428 }
352} 429}
353 430
354sub update { 431sub update {
355 my ($self) = @_; 432 my ($self) = @_;
… …
365} 442}
366 443
367sub emit { 444sub emit {
368 my ($self, $signal, @args) = @_; 445 my ($self, $signal, @args) = @_;
369 446
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 448}
374 449
375sub DESTROY { 450sub DESTROY {
376 my ($self) = @_; 451 my ($self) = @_;
377 452
… …
444sub new { 519sub new {
445 my ($class, %arg) = @_; 520 my ($class, %arg) = @_;
446 521
447 my $children = delete $arg{children} || []; 522 my $children = delete $arg{children} || [];
448 523
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 524 my $self = $class->SUPER::new (
525 children => [],
526 can_events => 0,
527 %arg,
528 );
450 $self->add ($_) for @$children; 529 $self->add ($_) for @$children;
451 530
452 $self 531 $self
453} 532}
454 533
455sub add { 534sub add {
456 my ($self, $child) = @_; 535 my ($self, @widgets) = @_;
457 536
458 $child->set_parent ($self); 537 $_->set_parent ($self)
538 for @widgets;
459 539
460 use sort 'stable'; 540 use sort 'stable';
461 541
462 $self->{children} = [ 542 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 543 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 544 @{$self->{children}}, @widgets
465 ]; 545 ];
466 546
467 $child->check_size; 547 $_->check_size
548 for @widgets;
549
550 $self->update;
551}
552
553sub children {
554 @{ $_[0]{children} }
468} 555}
469 556
470sub remove { 557sub remove {
471 my ($self, $child) = @_; 558 my ($self, $child) = @_;
472 559
473 delete $child->{parent}; 560 delete $child->{parent};
561 $child->hide;
474 562
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
564
565 $self->check_size;
566 $self->update;
567}
568
569sub clear {
570 my ($self) = @_;
571
572 my $children = delete $self->{children};
573 $self->{children} = [];
574
575 for (@$children) {
576 delete $_->{parent};
577 $_->hide;
578 }
476 579
477 $self->check_size; 580 $self->check_size;
478 $self->update; 581 $self->update;
479} 582}
480 583
… …
558} 661}
559 662
560sub update { 663sub update {
561 my ($self) = @_; 664 my ($self) = @_;
562 665
563 # we want to do this delayed... 666 $ROOT->on_refresh ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 667 $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} 668}
577 669
578sub size_allocate { 670sub size_allocate {
579 my ($self, $w, $h) = @_; 671 my ($self, $w, $h) = @_;
580 672
581 $self->child->configure (0, 0, $w, $h); 673 $self->SUPER::size_allocate ($w, $h);
674 $self->update;
675}
582 676
677sub _render {
678 $_[0]{children}[0]->draw;
679}
680
681sub render_child {
682 my ($self) = @_;
683
684 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
685 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT;
687
583 $self->render_chld; 688 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 };
584} 697}
585 698
586sub _draw { 699sub _draw {
587 my ($self) = @_; 700 my ($self) = @_;
588 701
… …
590 703
591 my $tex = $self->{texture} 704 my $tex = $self->{texture}
592 or return; 705 or return;
593 706
594 glEnable GL_BLEND; 707 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 709 glEnable GL_TEXTURE_2D;
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1;
598 712
599 $tex->draw_quad (0, 0, $w, $h); 713 $tex->draw_quad (0, 0, $w, $h);
600 714
601 glDisable GL_BLEND; 715 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 716 glDisable GL_TEXTURE_2D;
… …
606 720
607package CFClient::UI::ViewPort; 721package CFClient::UI::ViewPort;
608 722
609our @ISA = CFClient::UI::Window::; 723our @ISA = CFClient::UI::Window::;
610 724
611sub new { die }
612
613sub size_request { 725sub size_request {
614 my ($self) = @_; 726 my ($self) = @_;
615 727
616 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 728 @$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)}); 729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
618 730
619 @$self{qw(child_w child_h)} 731 @$self{qw(child_w child_h)}
620} 732}
621 733
622sub _draw { 734sub size_allocate {
623 my ($self) = @_; 735 my ($self, $w, $h) = @_;
624 736
625 $self->{children}[1]->draw; 737 $self->update;
626} 738}
627 739
740sub set_offset {
741 my ($self, $x, $y) = @_;
742
743 $self->{view_x} = int $x;
744 $self->{view_y} = int $y;
745
746 $self->update;
747}
748
749# hmm, this does not work for topleft of $self... but we should not aks for that
750sub _topleft {
751 my ($self, $x, $y) = @_;
752
753 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
754}
755
756sub find_widget {
757 my ($self, $x, $y) = @_;
758
759 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
760 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
761 ) {
762 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
763 } else {
764 $self->CFClient::UI::Base::find_widget ($x, $y)
765 }
766}
767
768sub _render {
769 my ($self) = @_;
770
771 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
772
773 $self->SUPER::_render;
774}
775
776#############################################################################
777
778package CFClient::UI::ScrolledWindow;
779
780our @ISA = CFClient::UI::HBox::;
781
782sub new {
783 my $class = shift;
784
785 my $self;
786
787 my $slider = new CFClient::UI::Slider
788 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
792 },
793 ;
794
795 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort),
797 slider => $slider,
798 @_,
799 );
800
801 $self->{vp}->add ($self->{scrolled});
802 $self->add ($self->{vp});
803 $self->add ($self->{slider});
804
805 $self
806}
807
808#TODO# update range on size_allocate depeneing on child
809# update viewport offset on scroll
628 810
629############################################################################# 811#############################################################################
630 812
631package CFClient::UI::Frame; 813package CFClient::UI::Frame;
632 814
… …
643 border => 0.8, 825 border => 0.8,
644 @_ 826 @_
645 ); 827 );
646 828
647 $self 829 $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} 830}
668 831
669sub _draw { 832sub _draw {
670 my ($self) = @_; 833 my ($self) = @_;
671 834
… …
706 my $class = shift; 869 my $class = shift;
707 870
708 # TODO: user_x, user_y, overwrite moveto? 871 # TODO: user_x, user_y, overwrite moveto?
709 872
710 my $self = $class->SUPER::new ( 873 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 874 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 875 border_bg => [1, 1, 1, 1],
713 border => 0.8, 876 border => 0.6,
714 can_events => 1, 877 can_events => 1,
715 @_ 878 @_
716 ); 879 );
717 880
718 $self->{title} &&= new CFClient::UI::Label 881 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 882 align => 0,
720 valign => 1, 883 valign => 1,
721 text => $self->{title}, 884 text => $self->{title},
722 fontsize => 1; 885 fontsize => $self->{border};
723 886
724 $self 887 $self
725} 888}
726 889
727sub border { 890sub border {
728 int $_[0]{border} * $::FONTSIZE 891 int $_[0]{border} * $::FONTSIZE
729} 892}
730 893
731sub size_request { 894sub size_request {
732 my ($self) = @_; 895 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 896
736 my ($w, $h) = $self->SUPER::size_request; 897 my ($w, $h) = $self->SUPER::size_request;
737 898
738 ( 899 (
739 $w + $self->border * 2, 900 $w + $self->border * 2,
… …
754} 915}
755 916
756sub button_down { 917sub button_down {
757 my ($self, $ev, $x, $y) = @_; 918 my ($self, $ev, $x, $y) = @_;
758 919
920 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 921 my $border = $self->border;
760 922
761 if ($x < $self->{w} && $x >= $self->{w} - $border 923 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 924 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 925
926 if ($lr & $td) {
927 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 928 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 929 my ($bw, $bh) = ($self->{w}, $self->{h});
766 930
931 my $mx = $x < $border;
932 my $my = $y < $border;
933
767 $self->{motion} = sub { 934 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 935 my ($ev, $x, $y) = @_;
769 936
770 ($x, $y) = ($ev->{x}, $ev->{y}); 937 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy;
771 939
772 $self->{user_w} = $bw + $x - $ox; 940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
774 $self->check_size; 943 $self->check_size;
775 }; 944 };
776 945
777 } elsif ($x >= 0 && $x < $self->{w} 946 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 947 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 948 my ($bx, $by) = ($self->{x}, $self->{y});
782 949
783 $self->{motion} = sub { 950 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 951 my ($ev, $x, $y) = @_;
… …
820 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad (0, $h - $border, $w, $border);
824 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 993 my $bg = $tex[0];
826 994
827 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
830 998
831 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
832 1000
833 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad ($border, $border, $cw, $ch);
837 1005
838 glDisable GL_TEXTURE_2D; 1006 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND; 1007 glDisable GL_BLEND;
1008 }
840 1009
841 $self->{title}->draw if $self->{title}; 1010 $self->{title}->draw if $self->{title};
1011
842 $self->child->draw; 1012 $self->child->draw;
843} 1013}
844 1014
845############################################################################# 1015#############################################################################
846 1016
… …
868 $self->{children}[$y][$x] = $child; 1038 $self->{children}[$y][$x] = $child;
869 1039
870 $child->check_size; 1040 $child->check_size;
871} 1041}
872 1042
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
873# TODO: move to container class maybe? send childs a signal on removal? 1047# TODO: move to container class maybe? send childs a signal on removal?
874sub clear { 1048sub clear {
875 my ($self) = @_; 1049 my ($self) = @_;
876 1050
1051 my @children = $self->children;
877 delete $self->{children}; 1052 delete $self->{children};
1053
1054 for (@children) {
1055 delete $_->{parent};
1056 $_->hide;
1057 }
1058
878 $self->update; 1059 $self->update;
879} 1060}
880 1061
881sub get_wh { 1062sub get_wh {
882 my ($self) = @_; 1063 my ($self) = @_;
… …
1105 1286
1106sub new { 1287sub new {
1107 my ($class, %arg) = @_; 1288 my ($class, %arg) = @_;
1108 1289
1109 my $self = $class->SUPER::new ( 1290 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1291 fg => [1, 1, 1],
1111 #font => default_font 1292 #font => default_font
1112 fontsize => 1, 1293 fontsize => 1,
1113 text => "", 1294 text => "",
1114 align => -1, 1295 align => -1,
1115 valign => -1, 1296 valign => -1,
1116 padding => 2, 1297 padding => 2,
1117 layout => new CFClient::Layout, 1298 layout => new CFClient::Layout,
1118 can_events => 0, 1299 can_events => 0,
1119 %arg 1300 %arg
1120 ); 1301 );
1121 1302
1122 if (exists $self->{template}) { 1303 if (exists $self->{template}) {
… …
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1310 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130 1311
1131 $self 1312 $self
1132} 1313}
1133 1314
1134sub escape_text { 1315sub escape {
1135 local $_ = $_[1]; 1316 local $_ = $_[1];
1136 1317
1137 s/&/&amp;/g; 1318 s/&/&amp;/g;
1138 s/>/&gt;/g; 1319 s/>/&gt;/g;
1139 s/</&lt;/g; 1320 s/</&lt;/g;
1140 1321
1141 $_[1] 1322 $_[1]
1142} 1323}
1143 1324
1325sub update {
1326 my ($self) = @_;
1327
1328 delete $self->{texture};
1329 $self->SUPER::update;
1330}
1331
1144sub set_text { 1332sub set_text {
1145 my ($self, $text) = @_; 1333 my ($self, $text) = @_;
1146 1334
1335 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text";
1337
1147 $self->{layout}->set_text ($text); 1338 $self->{layout}->set_text ($text);
1148 1339
1149 delete $self->{texture}; 1340 delete $self->{texture};
1341 $self->update;
1150 $self->check_size; 1342 $self->check_size;
1151 $self->update;
1152} 1343}
1153 1344
1154sub set_markup { 1345sub set_markup {
1155 my ($self, $markup) = @_; 1346 my ($self, $markup) = @_;
1156 1347
1348 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup";
1350
1157 $self->{layout}->set_markup ($markup); 1351 $self->{layout}->set_markup ($markup);
1158 1352
1159 delete $self->{texture}; 1353 delete $self->{texture};
1354 $self->update;
1160 $self->check_size; 1355 $self->check_size;
1161 $self->update;
1162} 1356}
1163 1357
1164sub size_request { 1358sub size_request {
1165 my ($self) = @_; 1359 my ($self) = @_;
1166 1360
… …
1195sub set_fontsize { 1389sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1390 my ($self, $fontsize) = @_;
1197 1391
1198 $self->{fontsize} = $fontsize; 1392 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1393 delete $self->{texture};
1394
1395 $self->update;
1200 $self->check_size; 1396 $self->check_size;
1201 $self->update;
1202} 1397}
1203 1398
1204sub _draw { 1399sub _draw {
1205 my ($self) = @_; 1400 my ($self) = @_;
1206 1401
… …
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::InventoryItem;
2507
2508our @ISA = CFClient::UI::HBox::;
2509
2510sub new {
2511 my $class = shift;
2512
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new (
2523 can_hover => 1,
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_,
2578 );
2579
2580 $self
2581}
2582
2583sub set_items {
2584 my ($self, $items) = @_;
2585
2586 $self->{scrolled}->clear;
2587 return unless $items;
2588
2589 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2590
2591 $self->{real_items} = \@items;
2592
2593 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2599 }
2600
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2602}
2603
2604sub size_request {
2605 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h});
2607}
2608
2609#############################################################################
2610
2611package CFClient::UI::Menu;
2612
2613our @ISA = CFClient::UI::FancyFrame::;
2614
2615use CFClient::OpenGL;
2616
2617sub new {
2618 my $class = shift;
2619
2620 my $self = $class->SUPER::new (
2621 items => [],
2622 z => 100,
2623 @_,
2624 );
2625
2626 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2627
2628 for my $item (@{ $self->{items} }) {
2629 my ($widget, $cb) = @$item;
2630
2631 # handle various types of items, only text for now
2632 if (!ref $widget) {
2633 $widget = new CFClient::UI::Label
2634 can_hover => 1,
2635 can_events => 1,
2636 text => $widget;
2637 }
2638
2639 $self->{item}{$widget} = $item;
2640
2641 $self->{vbox}->add ($widget);
2642 }
2643
2644 $self
2645}
2646
2647# popup given the event (must be a mouse button down event currently)
2648sub popup {
2649 my ($self, $ev) = @_;
2650
2651 $self->emit ("popdown");
2652
2653 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self;
2655 $self->{button} = $ev->{button};
2656
2657 $self->show;
2658 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2659}
2660
2661sub mouse_motion {
2662 my ($self, $ev, $x, $y) = @_;
2663
2664 # TODO: should use vbox->find_widget or so
2665 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2666 $self->{hover} = $self->{item}{$HOVER};
2667}
2668
2669sub button_up {
2670 my ($self, $ev, $x, $y) = @_;
2671
2672 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB;
2674 $self->hide;
2675
2676 $self->emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover};
2678 }
2679}
2680
2681#############################################################################
2682
2221package CFClient::UI::Root; 2683package CFClient::UI::Root;
2222 2684
2223our @ISA = CFClient::UI::Container::; 2685our @ISA = CFClient::UI::Container::;
2224 2686
2225use CFClient::OpenGL; 2687use CFClient::OpenGL;
2226 2688
2227sub check_size { 2689sub check_size {
2228 my ($self) = @_; 2690 my ($self) = @_;
2229 2691
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2692 $self->configure (0, 0, $self->{w}, $self->{h});
2231} 2693}
2232 2694
2233sub size_request { 2695sub size_request {
2234 ($::WIDTH, $::HEIGHT) 2696 my ($self) = @_;
2697
2698 ($self->{w}, $self->{h})
2699}
2700
2701sub size_allocate {
2702 my ($self, $w, $h) = @_;
2703
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 }
2718 }
2719
2720 $self->{old_w} = $w;
2721 $self->{old_h} = $h;
2235} 2722}
2236 2723
2237sub configure { 2724sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 2725 my ($self, $x, $y, $w, $h) = @_;
2239 2726
2240 $self->SUPER::configure ($x, $y, $w, $h); 2727 $self->SUPER::configure ($x, $y, $w, $h);
2241 2728
2242 for my $child (@{$self->{children}}) { 2729 for my $child ($self->children) {
2243 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2730 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2244 2731
2245 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2732 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2246 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2733 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2247 $child->configure ($X, $Y, $W,$H); 2734 $child->configure ($X, $Y, $W, $H);
2248 } 2735 }
2249} 2736}
2250 2737
2251sub _topleft { 2738sub _topleft {
2252 my ($self, $x, $y) = @_; 2739 my ($self, $x, $y) = @_;

Diff Legend

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