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.183 by elmex, Sun Apr 30 13:10:46 2006 UTC

… …
14our $BUTTON_STATE; 14our $BUTTON_STATE;
15 15
16sub check_tooltip { 16sub check_tooltip {
17 if (!$GRAB) { 17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 19 if (length $widget->{tooltip}) {
20 20
21 if ($TOOLTIP->{owner} != $widget) { 21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 22 $TOOLTIP->{owner} = $widget;
23 23
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_text ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
39 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
40} 48}
41 49
42# class methods for events 50# class methods for events
43sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
45} 54}
46 55
47sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
49} 59}
50 60
51sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
52 my ($ev) = @_; 62 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 71 check_tooltip;
62 } 72 }
63 73
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 75
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
67} 80}
68 81
69sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
70 my ($ev) = @_; 83 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
72 85
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 87
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 89
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
78 94
79 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 97 $grab->update if $grab;
82 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 115
100 check_tooltip; 116 check_tooltip;
101 } 117 }
102 118
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
104} 123}
105 124
106# convert position array to integers 125# convert position array to integers
107sub harmonize { 126sub harmonize {
108 my ($vals) = @_; 127 my ($vals) = @_;
… …
126 145
127sub new { 146sub new {
128 my $class = shift; 147 my $class = shift;
129 148
130 my $self = bless { 149 my $self = bless {
131 x => 0, 150 x => 0,
132 y => 0, 151 y => 0,
133 z => 0, 152 z => 0,
134 can_events => 1, 153 can_events => 1,
135 @_ 154 @_
136 }, $class; 155 }, $class;
137 156
138 for (keys %$self) { 157 for (keys %$self) {
… …
142 } 161 }
143 162
144 $self 163 $self
145} 164}
146 165
166sub destroy {
167 my ($self) = @_;
168
169 $self->hide;
170 %$self = ();
171}
172
147sub show { 173sub show {
148 my ($self) = @_; 174 my ($self) = @_;
149 175
150 return if $self->{parent}; 176 return if $self->{parent};
151 177
… …
153} 179}
154 180
155sub hide { 181sub hide {
156 my ($self) = @_; 182 my ($self) = @_;
157 183
158 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
159 186
160 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
161} 189}
162 190
163sub move { 191sub move {
164 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
165 193
… …
168 $self->{z} = $z if defined $z; 196 $self->{z} = $z if defined $z;
169 197
170 $self->update; 198 $self->update;
171} 199}
172 200
173sub needs_redraw { 201sub set_size {
174 0 202 my ($self, $w, $h) = @_;
203
204 $self->{user_w} = $w;
205 $self->{user_h} = $h;
206
207 $self->check_size;
175} 208}
176 209
177sub size_request { 210sub size_request {
178 require Carp; 211 require Carp;
179 Carp::confess "size_request is abstract"; 212 Carp::confess "size_request is abstract";
… …
204 $self->{w} = $w; 237 $self->{w} = $w;
205 $self->{h} = $h; 238 $self->{h} = $h;
206 239
207 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
208 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
209 } 243 }
210} 244}
211 245
212sub size_allocate { 246sub size_allocate {
213 # nothing to be done 247 # nothing to be done
248}
249
250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
214} 261}
215 262
216sub set_max_size { 263sub set_max_size {
217 my ($self, $w, $h) = @_; 264 my ($self, $w, $h) = @_;
218 265
… …
221} 268}
222 269
223# return top left coordinates 270# return top left coordinates
224sub _topleft { 271sub _topleft {
225 my ($self, $x, $y) = @_; 272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
226 276
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
228} 278}
229 279
230# translate global coordinates to local coordinate system 280# translate global coordinates to local coordinate system
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 358 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 359 glVertex $x , $y + $self->{h};
310 glEnd; 360 glEnd;
311 glDisable GL_BLEND; 361 glDisable GL_BLEND;
312 } 362 }
363
364 if ($ENV{PCLIENT_DEBUG}) {
365 glPushMatrix;
366 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0;
370 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h};
373 glEnd;
374 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 }
313} 377}
314 378
315sub _draw { 379sub _draw {
316 my ($self) = @_; 380 my ($self) = @_;
317 381
… …
337} 401}
338 402
339sub check_size { 403sub check_size {
340 my ($self) = @_; 404 my ($self) = @_;
341 405
342 return unless $self->{parent}; 406 $self->{parent}
407 or return 1;
343 408
344 my ($w, $h) = $self->size_request; 409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
345 412
346 if ($w != $self->{req_w} || $h != $self->{req_h}) { 413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w; 414 $self->{req_w} = $w;
348 $self->{req_h} = $h; 415 $self->{req_h} = $h;
349 416
350 $self->{parent}->check_size; 417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
351 } 426 }
352} 427}
353 428
354sub update { 429sub update {
355 my ($self) = @_; 430 my ($self) = @_;
… …
365} 440}
366 441
367sub emit { 442sub emit {
368 my ($self, $signal, @args) = @_; 443 my ($self, $signal, @args) = @_;
369 444
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
371 $cb->($self, @args);
372 }
373} 446}
374 447
375sub DESTROY { 448sub DESTROY {
376 my ($self) = @_; 449 my ($self) = @_;
377 450
… …
444sub new { 517sub new {
445 my ($class, %arg) = @_; 518 my ($class, %arg) = @_;
446 519
447 my $children = delete $arg{children} || []; 520 my $children = delete $arg{children} || [];
448 521
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 522 my $self = $class->SUPER::new (
523 children => [],
524 can_events => 0,
525 %arg,
526 );
450 $self->add ($_) for @$children; 527 $self->add ($_) for @$children;
451 528
452 $self 529 $self
453} 530}
454 531
… …
463 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 541 @{$self->{children}}, $child
465 ]; 542 ];
466 543
467 $child->check_size; 544 $child->check_size;
545 $self->update;
546}
547
548sub children {
549 @{ $_[0]{children} }
468} 550}
469 551
470sub remove { 552sub remove {
471 my ($self, $child) = @_; 553 my ($self, $child) = @_;
472 554
473 delete $child->{parent}; 555 delete $child->{parent};
556 $child->hide;
474 557
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559
560 $self->check_size;
561 $self->update;
562}
563
564sub clear {
565 my ($self) = @_;
566
567 my $children = delete $self->{children};
568 $self->{children} = [];
569
570 for (@$children) {
571 delete $_->{parent};
572 $_->hide;
573 }
476 574
477 $self->check_size; 575 $self->check_size;
478 $self->update; 576 $self->update;
479} 577}
480 578
… …
558} 656}
559 657
560sub update { 658sub update {
561 my ($self) = @_; 659 my ($self) = @_;
562 660
563 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 662 $self->SUPER::update;
566}
567
568sub render_chld {
569 my ($self) = @_;
570
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1;
573 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw;
575 };
576} 663}
577 664
578sub size_allocate { 665sub size_allocate {
579 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
580 667
581 $self->child->configure (0, 0, $w, $h); 668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
582 671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
676sub render_child {
677 my ($self) = @_;
678
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT;
682
583 $self->render_chld; 683 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 };
584} 692}
585 693
586sub _draw { 694sub _draw {
587 my ($self) = @_; 695 my ($self) = @_;
588 696
… …
590 698
591 my $tex = $self->{texture} 699 my $tex = $self->{texture}
592 or return; 700 or return;
593 701
594 glEnable GL_BLEND; 702 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1;
598 707
599 $tex->draw_quad (0, 0, $w, $h); 708 $tex->draw_quad (0, 0, $w, $h);
600 709
601 glDisable GL_BLEND; 710 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 711 glDisable GL_TEXTURE_2D;
… …
606 715
607package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
608 717
609our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
610 719
611sub new { die }
612
613sub size_request { 720sub size_request {
614 my ($self) = @_; 721 my ($self) = @_;
615 722
616 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
618 725
619 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
620} 727}
621 728
622sub _draw { 729sub size_allocate {
623 my ($self) = @_; 730 my ($self, $w, $h) = @_;
624 731
625 $self->{children}[1]->draw; 732 $self->update;
626} 733}
627 734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744sub _render {
745 my ($self) = @_;
746
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748
749 $self->SUPER::_render;
750}
751
752#############################################################################
753
754package CFClient::UI::ScrolledWindow;
755
756our @ISA = CFClient::UI::HBox::;
757
758sub new {
759 my $class = shift;
760
761 my $self;
762
763 my $slider = new CFClient::UI::Slider
764 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
768 },
769 ;
770
771 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort),
773 slider => $slider,
774 @_,
775 );
776
777 $self->{vp}->add ($self->{scrolled});
778 $self->add ($self->{vp});
779 $self->add ($self->{slider});
780
781 $self
782}
783
784#TODO# update range on size_allocate depeneing on child
785# update viewport offset on scroll
628 786
629############################################################################# 787#############################################################################
630 788
631package CFClient::UI::Frame; 789package CFClient::UI::Frame;
632 790
… …
643 border => 0.8, 801 border => 0.8,
644 @_ 802 @_
645 ); 803 );
646 804
647 $self 805 $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} 806}
668 807
669sub _draw { 808sub _draw {
670 my ($self) = @_; 809 my ($self) = @_;
671 810
… …
706 my $class = shift; 845 my $class = shift;
707 846
708 # TODO: user_x, user_y, overwrite moveto? 847 # TODO: user_x, user_y, overwrite moveto?
709 848
710 my $self = $class->SUPER::new ( 849 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 850 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 851 border_bg => [1, 1, 1, 1],
713 border => 0.8, 852 border => 0.6,
714 can_events => 1, 853 can_events => 1,
715 @_ 854 @_
716 ); 855 );
717 856
718 $self->{title} &&= new CFClient::UI::Label 857 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 858 align => 0,
720 valign => 1, 859 valign => 1,
721 text => $self->{title}, 860 text => $self->{title},
722 fontsize => 1; 861 fontsize => $self->{border};
723 862
724 $self 863 $self
725} 864}
726 865
727sub border { 866sub border {
728 int $_[0]{border} * $::FONTSIZE 867 int $_[0]{border} * $::FONTSIZE
729} 868}
730 869
731sub size_request { 870sub size_request {
732 my ($self) = @_; 871 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 872
736 my ($w, $h) = $self->SUPER::size_request; 873 my ($w, $h) = $self->SUPER::size_request;
737 874
738 ( 875 (
739 $w + $self->border * 2, 876 $w + $self->border * 2,
… …
754} 891}
755 892
756sub button_down { 893sub button_down {
757 my ($self, $ev, $x, $y) = @_; 894 my ($self, $ev, $x, $y) = @_;
758 895
896 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 897 my $border = $self->border;
760 898
761 if ($x < $self->{w} && $x >= $self->{w} - $border 899 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 900 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 901
902 if ($lr & $td) {
903 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 904 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 905 my ($bw, $bh) = ($self->{w}, $self->{h});
766 906
907 my $mx = $x < $border;
908 my $my = $y < $border;
909
767 $self->{motion} = sub { 910 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 911 my ($ev, $x, $y) = @_;
769 912
770 ($x, $y) = ($ev->{x}, $ev->{y}); 913 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy;
771 915
772 $self->{user_w} = $bw + $x - $ox; 916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
773 $self->{user_h} = $bh + $y - $oy; 917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
774 $self->check_size; 919 $self->check_size;
775 }; 920 };
776 921
777 } elsif ($x >= 0 && $x < $self->{w} 922 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 924 my ($bx, $by) = ($self->{x}, $self->{y});
782 925
783 $self->{motion} = sub { 926 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 927 my ($ev, $x, $y) = @_;
… …
820 $tex[1]->draw_quad (0, 0, $w, $border); 963 $tex[1]->draw_quad (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 964 $tex[3]->draw_quad (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 966 $tex[4]->draw_quad (0, $h - $border, $w, $border);
824 967
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 969 my $bg = $tex[0];
826 970
827 # TODO: repeat texture not scale 971 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 972 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 973 my $rep_y = $ch / $bg->{h};
830 974
831 glColor @{ $self->{bg} }; 975 glColor @{ $self->{bg} };
832 976
833 $bg->{s} = $rep_x; 977 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 978 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 979 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 980 $bg->draw_quad ($border, $border, $cw, $ch);
837 981
838 glDisable GL_TEXTURE_2D; 982 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND; 983 glDisable GL_BLEND;
984 }
840 985
841 $self->{title}->draw if $self->{title}; 986 $self->{title}->draw if $self->{title};
987
842 $self->child->draw; 988 $self->child->draw;
843} 989}
844 990
845############################################################################# 991#############################################################################
846 992
… …
868 $self->{children}[$y][$x] = $child; 1014 $self->{children}[$y][$x] = $child;
869 1015
870 $child->check_size; 1016 $child->check_size;
871} 1017}
872 1018
1019sub children {
1020 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1021}
1022
873# TODO: move to container class maybe? send childs a signal on removal? 1023# TODO: move to container class maybe? send childs a signal on removal?
874sub clear { 1024sub clear {
875 my ($self) = @_; 1025 my ($self) = @_;
876 1026
1027 my @children = $self->children;
877 delete $self->{children}; 1028 delete $self->{children};
1029
1030 for (@children) {
1031 delete $_->{parent};
1032 $_->hide;
1033 }
1034
878 $self->update; 1035 $self->update;
879} 1036}
880 1037
881sub get_wh { 1038sub get_wh {
882 my ($self) = @_; 1039 my ($self) = @_;
… …
1105 1262
1106sub new { 1263sub new {
1107 my ($class, %arg) = @_; 1264 my ($class, %arg) = @_;
1108 1265
1109 my $self = $class->SUPER::new ( 1266 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1267 fg => [1, 1, 1],
1111 #font => default_font 1268 #font => default_font
1112 fontsize => 1, 1269 fontsize => 1,
1113 text => "", 1270 text => "",
1114 align => -1, 1271 align => -1,
1115 valign => -1, 1272 valign => -1,
1116 padding => 2, 1273 padding => 2,
1117 layout => new CFClient::Layout, 1274 layout => new CFClient::Layout,
1118 can_events => 0, 1275 can_events => 0,
1119 %arg 1276 %arg
1120 ); 1277 );
1121 1278
1122 if (exists $self->{template}) { 1279 if (exists $self->{template}) {
… …
1129 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1130 1287
1131 $self 1288 $self
1132} 1289}
1133 1290
1134sub escape_text { 1291sub escape {
1135 local $_ = $_[1]; 1292 local $_ = $_[1];
1136 1293
1137 s/&/&amp;/g; 1294 s/&/&amp;/g;
1138 s/>/&gt;/g; 1295 s/>/&gt;/g;
1139 s/</&lt;/g; 1296 s/</&lt;/g;
1140 1297
1141 $_[1] 1298 $_[1]
1142} 1299}
1143 1300
1301sub update {
1302 my ($self) = @_;
1303
1304 delete $self->{texture};
1305 $self->SUPER::update;
1306}
1307
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1144sub set_text { 1314sub set_text {
1145 my ($self, $text) = @_; 1315 my ($self, $text) = @_;
1146 1316
1317 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text";
1319
1147 $self->{layout}->set_text ($text); 1320 $self->{layout}->set_text ($text);
1148 1321
1149 delete $self->{texture}; 1322 delete $self->{texture};
1323 $self->update;
1150 $self->check_size; 1324 $self->check_size;
1151 $self->update;
1152} 1325}
1153 1326
1154sub set_markup { 1327sub set_markup {
1155 my ($self, $markup) = @_; 1328 my ($self, $markup) = @_;
1156 1329
1330 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup";
1332
1157 $self->{layout}->set_markup ($markup); 1333 $self->{layout}->set_markup ($markup);
1158 1334
1159 delete $self->{texture}; 1335 delete $self->{texture};
1336 $self->update;
1160 $self->check_size; 1337 $self->check_size;
1161 $self->update;
1162} 1338}
1163 1339
1164sub size_request { 1340sub size_request {
1165 my ($self) = @_; 1341 my ($self) = @_;
1166 1342
… …
1246 1422
1247sub new { 1423sub new {
1248 my $class = shift; 1424 my $class = shift;
1249 1425
1250 $class->SUPER::new ( 1426 $class->SUPER::new (
1251 fg => [1, 1, 1], 1427 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1428 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1429 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1430 active_fg => [0, 0, 0],
1255 can_hover => 1, 1431 can_hover => 1,
1256 can_focus => 1, 1432 can_focus => 1,
1257 valign => 0, 1433 valign => 0,
1258 can_events => 1, 1434 can_events => 1,
1259 @_ 1435 @_
1260 ) 1436 )
1261} 1437}
1262 1438
… …
1416 my ($self, $ev) = @_; 1592 my ($self, $ev) = @_;
1417 1593
1418 my $sym = $ev->{sym}; 1594 my $sym = $ev->{sym};
1419 1595
1420 if ($sym == 13) { 1596 if ($sym == 13) {
1597 unshift @{$self->{history}},
1598 my $txt = $self->get_text;
1599 $self->{history_pointer} = -1;
1600 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1601 $self->emit (activate => $txt);
1422 $self->update; 1602 $self->update;
1603
1604 } elsif ($sym == CFClient::SDLK_UP) {
1605 if ($self->{history_pointer} < 0) {
1606 $self->{history_saveback} = $self->get_text;
1607 }
1608 if (@{$self->{history} || []} > 0) {
1609 $self->{history_pointer}++;
1610 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1611 $self->{history_pointer} = @{$self->{history} || []} - 1;
1612 }
1613 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1614 }
1615
1616 } elsif ($sym == CFClient::SDLK_DOWN) {
1617 $self->{history_pointer}--;
1618 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1619
1620 if ($self->{history_pointer} >= 0) {
1621 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1622 } else {
1623 $self->set_text ($self->{history_saveback});
1624 }
1423 1625
1424 } else { 1626 } else {
1425 $self->SUPER::key_down ($ev); 1627 $self->SUPER::key_down ($ev);
1426 } 1628 }
1427 1629
… …
1441 1643
1442sub new { 1644sub new {
1443 my $class = shift; 1645 my $class = shift;
1444 1646
1445 $class->SUPER::new ( 1647 $class->SUPER::new (
1446 padding => 4, 1648 padding => 4,
1447 fg => [1, 1, 1], 1649 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2], 1650 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1651 active_fg => [0, 0, 1],
1450 can_hover => 1, 1652 can_hover => 1,
1451 align => 0, 1653 align => 0,
1452 valign => 0, 1654 valign => 0,
1453 can_events => 1, 1655 can_events => 1,
1454 @_ 1656 @_
1455 ) 1657 )
1456} 1658}
1457 1659
… …
1616 1818
1617package CFClient::UI::VGauge; 1819package CFClient::UI::VGauge;
1618 1820
1619our @ISA = CFClient::UI::Base::; 1821our @ISA = CFClient::UI::Base::;
1620 1822
1823use List::Util qw(min max);
1824
1621use CFClient::OpenGL; 1825use CFClient::OpenGL;
1622 1826
1623my %tex = ( 1827my %tex = (
1624 food => [ 1828 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1829 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1830 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1831 ],
1628 grace => [ 1832 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1834 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1835 ],
1632 hp => [ 1836 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1837 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1838 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1839 ],
1636 mana => [ 1840 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1841 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1842 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1843 ],
1640); 1844);
1641 1845
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1846# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1847sub new {
… …
1662} 1866}
1663 1867
1664sub set_max { 1868sub set_max {
1665 my ($self, $max) = @_; 1869 my ($self, $max) = @_;
1666 1870
1871 return if $self->{max_val} == $max;
1872
1667 $self->{max_val} = $max; 1873 $self->{max_val} = $max;
1874 $self->update;
1668} 1875}
1669 1876
1670sub set_value { 1877sub set_value {
1671 my ($self, $val, $max) = @_; 1878 my ($self, $val, $max) = @_;
1672 1879
1673 $self->set_max ($max) 1880 $self->set_max ($max)
1674 if defined $max; 1881 if defined $max;
1675 1882
1676 $max = $self->{max_val}; 1883 return if $self->{val} == $val;
1884
1677 $self->{val} = $val; 1885 $self->{val} = $val;
1678
1679 $self->update; 1886 $self->update;
1680} 1887}
1681 1888
1682sub _draw { 1889sub _draw {
1683 my ($self) = @_; 1890 my ($self) = @_;
1684 1891
1685 my $tex = $tex{$self->{type}}; 1892 my $tex = $tex{$self->{type}};
1893 my ($t1, $t2, $t3) = @$tex;
1686 1894
1687 my ($w, $h) = ($self->{w}, $self->{h}); 1895 my ($w, $h) = ($self->{w}, $self->{h});
1688 1896
1689 if ($self->{vertical}) { 1897 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 1898 glRotate 90, 0, 0, 1;
… …
1692 1900
1693 ($w, $h) = ($h, $w); 1901 ($w, $h) = ($h, $w);
1694 } 1902 }
1695 1903
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 1904 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 1905
1699 my $t1 = $tex->[0]; 1906 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 1907 my $ycut2 = max 0, min 1, $ycut - 1;
1908
1909 my $h1 = $self->{h} * (1 - $ycut1);
1910 my $h2 = $self->{h} * (1 - $ycut2);
1701 1911
1702 glEnable GL_BLEND; 1912 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 1914 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 1916
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1917 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 1918 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 1919 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1920 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1921 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1922 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 1923 glEnd;
1717 1924
1925 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1926 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 1927 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1928 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1929 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1930 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1931 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 1932 glEnd;
1933
1934 if ($t3) {
1935 glBindTexture GL_TEXTURE_2D, $t3->{name};
1936 glBegin GL_QUADS;
1937 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1938 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1939 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1940 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1941 glEnd;
1942 }
1725 1943
1726 glDisable GL_BLEND; 1944 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 1945 glDisable GL_TEXTURE_2D;
1728} 1946}
1729 1947
… …
1735 1953
1736sub new { 1954sub new {
1737 my ($class, %arg) = @_; 1955 my ($class, %arg) = @_;
1738 1956
1739 my $self = $class->SUPER::new ( 1957 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 1958 tooltip => $arg{type},
1959 can_hover => 1,
1960 can_events => 1,
1741 %arg, 1961 %arg,
1742 ); 1962 );
1743 1963
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1964 $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); 1965 $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); 1966 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 1967
1748 $self 1968 $self
1749} 1969}
1750 1970
1751sub set_fontsize { 1971sub set_fontsize {
… …
1753 1973
1754 $self->{value}->set_fontsize ($fsize); 1974 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 1975 $self->{max} ->set_fontsize ($fsize);
1756} 1976}
1757 1977
1978sub set_max {
1979 my ($self, $max) = @_;
1980
1981 $self->{gauge}->set_max ($max);
1982 $self->{max}->set_text ($max);
1983}
1984
1758sub set_value { 1985sub set_value {
1759 my ($self, $val, $max) = @_; 1986 my ($self, $val, $max) = @_;
1760 1987
1761 $self->set_max ($max) 1988 $self->set_max ($max)
1762 if defined $max; 1989 if defined $max;
1763 1990
1764 $self->{gauge}->set_value ($val, $max); 1991 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 1992 $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} 1993}
1774 1994
1775############################################################################# 1995#############################################################################
1776 1996
1777package CFClient::UI::Slider; 1997package CFClient::UI::Slider;
… …
1796 # TODO: calculations are off 2016 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 2017 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2018 fg => [1, 1, 1],
1799 active_fg => [0, 0, 0], 2019 active_fg => [0, 0, 0],
1800 range => [0, 0, 100, 10], 2020 range => [0, 0, 100, 10],
1801 req_w => 20, 2021 req_w => $::WIDTH / 80,
1802 req_h => 20, 2022 req_h => $::WIDTH / 80,
1803 vertical => 0, 2023 vertical => 0,
1804 can_hover => 1, 2024 can_hover => 1,
1805 inner_pad => 5, 2025 inner_pad => 5,
1806 @_ 2026 @_
1807 ); 2027 );
… …
1917 2137
1918sub new { 2138sub new {
1919 my $class = shift; 2139 my $class = shift;
1920 2140
1921 my $self = $class->SUPER::new ( 2141 my $self = $class->SUPER::new (
1922 fontsize => 1, 2142 fontsize => 1,
2143 can_events => 0,
1923 #font => default_font 2144 #font => default_font
1924 @_, 2145 @_,
1925 2146
1926 layout => (new CFClient::Layout), 2147 layout => (new CFClient::Layout),
1927 par => [], 2148 par => [],
1928 height => 0, 2149 height => 0,
1929 children => [ 2150 children => [
1930 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
1932 ], 2153 ],
1933 ); 2154 );
1934 2155
1935 $self->{children}[1]->connect (changed => sub { 2156 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2157
1939 $self 2158 $self
1940} 2159}
1941 2160
1942sub set_fontsize { 2161sub set_fontsize {
… …
1950 my ($self, $text) = @_; 2169 my ($self, $text) = @_;
1951 2170
1952 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
1953 2172
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w}); 2174 $layout->set_width ($self->{children}[0]{w});
1956 $layout->set_text ($text); 2175 $layout->set_text ($text);
1957 2176
1958 ($layout->size)[1] 2177 ($layout->size)[1]
1959} 2178}
1960 2179
… …
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2014 2233
2015 delete $self->{texture}; 2234 delete $self->{texture};
2016 } 2235 }
2017 2236
2018 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2019 glClearColor 0, 0, 0, 1; 2238 glClearColor 0, 0, 0, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
2021 2240
2022 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
… …
2056} 2275}
2057 2276
2058sub _draw { 2277sub _draw {
2059 my ($self) = @_; 2278 my ($self) = @_;
2060 2279
2061 if ($self->{texture}) { 2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2062 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2066 } 2287 glDisable GL_BLEND;
2067 2288
2068 $self->{children}[1]->draw; 2289 $self->{children}[1]->draw;
2069 2290
2070} 2291}
2071 2292
… …
2119 2340
2120sub new { 2341sub new {
2121 my $class = shift; 2342 my $class = shift;
2122 2343
2123 my $self = $class->SUPER::new ( 2344 my $self = $class->SUPER::new (
2124 state => 0, 2345 state => 0,
2125 connect_activate => \&toggle_flopper, 2346 connect_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2347 @_
2128 ); 2348 );
2129 2349
2130 if ($self->{state}) { 2350 if ($self->{state}) {
2131 $self->{state} = 0; 2351 $self->{state} = 0;
… …
2166 @_, 2386 @_,
2167 can_events => 0, 2387 can_events => 0,
2168 ) 2388 )
2169} 2389}
2170 2390
2171sub set_text { 2391sub set_markup {
2172 my ($self, $text) = @_; 2392 my ($self, $text) = @_;
2173 2393
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2175 $self->{label}->set_text ($text); 2395 $self->{label}->set_markup ($text);
2176 $self->add ($self->{label}); 2396 $self->add ($self->{label});
2177} 2397}
2178 2398
2179sub size_request { 2399sub size_request {
2180 my ($self) = @_; 2400 my ($self) = @_;
2181 2401
2182 $self->child->set_max_size ($::WIDTH * 0.2); 2402 $self->child->set_max_size ($::WIDTH * 0.3);
2183 2403
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2405
2186 ($w + 4, $h + 4) 2406 ($w + 4, $h + 4)
2407}
2408
2409sub size_allocate {
2410 my ($self, $w, $h) = @_;
2411
2412 $self->SUPER::size_allocate ($w - 4, $h - 4);
2187} 2413}
2188 2414
2189sub _draw { 2415sub _draw {
2190 my ($self) = @_; 2416 my ($self) = @_;
2191 2417
… …
2216 $self->SUPER::_draw; 2442 $self->SUPER::_draw;
2217} 2443}
2218 2444
2219############################################################################# 2445#############################################################################
2220 2446
2447package CFClient::UI::Face;
2448
2449our @ISA = CFClient::UI::Base::;
2450
2451use CFClient::OpenGL;
2452
2453sub new {
2454 my $class = shift;
2455
2456 $class->SUPER::new (
2457 aspect => 1,
2458 @_,
2459 )
2460}
2461
2462sub size_request {
2463 (32, 8)
2464}
2465
2466sub _draw {
2467 my ($self) = @_;
2468
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470
2471 # TODO animation
2472 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 }
2482}
2483
2484#############################################################################
2485
2486package CFClient::UI::Menu;
2487
2488our @ISA = CFClient::UI::FancyFrame::;
2489
2490use CFClient::OpenGL;
2491
2492sub new {
2493 my $class = shift;
2494
2495 my $self = $class->SUPER::new (
2496 items => [],
2497 z => 100,
2498 @_,
2499 );
2500
2501 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2502
2503 for my $item (@{ $self->{items} }) {
2504 my ($widget, $cb) = @$item;
2505
2506 # handle various types of items, only text for now
2507 if (!ref $widget) {
2508 $widget = new CFClient::UI::Label
2509 can_hover => 1,
2510 can_events => 1,
2511 text => $widget;
2512 }
2513
2514 $self->{item}{$widget} = $item;
2515
2516 $self->{vbox}->add ($widget);
2517 }
2518
2519 $self
2520}
2521
2522# popup given the event (must be a mouse button down event currently)
2523sub popup {
2524 my ($self, $ev) = @_;
2525
2526 $self->emit ("popdown");
2527
2528 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self;
2530 $self->{button} = $ev->{button};
2531
2532 $self->show;
2533 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2534}
2535
2536sub mouse_motion {
2537 my ($self, $ev, $x, $y) = @_;
2538
2539 # TODO: should use vbox->find_widget or so
2540 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2541 $self->{hover} = $self->{item}{$HOVER};
2542}
2543
2544sub button_up {
2545 my ($self, $ev, $x, $y) = @_;
2546
2547 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB;
2549 $self->hide;
2550
2551 $self->emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover};
2553 }
2554}
2555
2556#############################################################################
2557
2221package CFClient::UI::Root; 2558package CFClient::UI::Root;
2222 2559
2223our @ISA = CFClient::UI::Container::; 2560our @ISA = CFClient::UI::Container::;
2224 2561
2225use CFClient::OpenGL; 2562use CFClient::OpenGL;
… …
2297 $self->_draw; 2634 $self->_draw;
2298} 2635}
2299 2636
2300############################################################################# 2637#############################################################################
2301 2638
2639package CFClient::UI::InventoryItem;
2640
2641our @ISA = CFClient::UI::HBox::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my %args = @_;
2647
2648 my $item = $args{item};
2649
2650 my $desc = $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} $item->{name_pl}";
2653
2654
2655 my $self = $class->SUPER::new (
2656 can_hover => 1,
2657 can_events => 1,
2658 tooltip => (CFClient::UI::Label->escape ($desc)
2659 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2660 connect_button_down => sub {
2661 my ($self, $ev, $x, $y) = @_;
2662
2663 # todo: maybe put examine on 1? but should just be a tooltip :(
2664 if ($ev->{button} == 1) {
2665 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2666 } elsif ($ev->{button} == 2) {
2667 $::CONN->send ("apply $item->{tag}");
2668 } elsif ($ev->{button} == 3) {
2669 CFClient::UI::Menu->new (
2670 items => [
2671 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2672 [
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2674 sub { $::CONN->send ("lock $item->{tag}") },
2675 ],
2676 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2677 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2678 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2679 ],
2680 )->popup ($ev);
2681 }
2682
2683 1
2684 },
2685 %args
2686 );
2687 $self->add(new CFClient::UI::Face
2688 can_events => 0,
2689 face => $item->{face},
2690 anim => $item->{anim},
2691 animspeed => $item->{animspeed});
2692 $self->add(new CFClient::UI::Label
2693 can_events => 0,
2694 text => $desc);
2695
2696 $self
2697}
2698
2699#############################################################################
2700
2701package CFClient::UI::Inventory;
2702
2703our @ISA = CFClient::UI::ScrolledWindow::;
2704
2705sub new {
2706 my $class = shift;
2707
2708 my $self = $class->SUPER::new (
2709 scrolled => (new CFClient::UI::VBox),
2710 @_,
2711 );
2712
2713 $self
2714}
2715
2716sub set_items {
2717 my ($self, $items) = @_;
2718
2719 $self->{scrolled}->clear;
2720 return unless $items;
2721
2722 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2723
2724 $self->{real_items} = \@items;
2725
2726 for my $item (@items) {
2727 my $desc = $item->{nrof} < 2
2728 ? $item->{name}
2729 : "$item->{nrof} $item->{name_pl}";
2730
2731 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2732 }
2733
2734# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2735}
2736
2737sub size_request {
2738 my ($self) = @_;
2739 ($self->{req_w}, $self->{req_h});
2740}
2741
2742#############################################################################
2743
2302package CFClient::UI; 2744package CFClient::UI;
2303 2745
2304$ROOT = new CFClient::UI::Root; 2746$ROOT = new CFClient::UI::Root;
2305$TOOLTIP = new CFClient::UI::Tooltip; 2747$TOOLTIP = new CFClient::UI::Tooltip;
2306 2748

Diff Legend

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