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.155 by root, Sun Apr 23 02:22:54 2006 UTC vs.
Revision 1.179 by elmex, Fri Apr 28 05:17:21 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";
… …
211 244
212sub size_allocate { 245sub size_allocate {
213 # nothing to be done 246 # nothing to be done
214} 247}
215 248
249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size {
263 my ($self, $w, $h) = @_;
264
265 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h;
267}
268
216# return top left coordinates 269# return top left coordinates
217sub _topleft { 270sub _topleft {
218 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
219 275
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
221} 277}
222 278
223# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
303 glEnd; 359 glEnd;
304 glDisable GL_BLEND; 360 glDisable GL_BLEND;
305 } 361 }
362
363 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix;
365 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0;
369 glVertex $self->{w}, 0;
370 glVertex $self->{w}, $self->{h};
371 glVertex 0 , $self->{h};
372 glEnd;
373 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 }
306} 376}
307 377
308sub _draw { 378sub _draw {
309 my ($self) = @_; 379 my ($self) = @_;
310 380
… …
330} 400}
331 401
332sub check_size { 402sub check_size {
333 my ($self) = @_; 403 my ($self) = @_;
334 404
335 return unless $self->{parent}; 405 $self->{parent}
406 or return 1;
336 407
337 my ($w, $h) = $self->size_request; 408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
338 411
339 if ($w != $self->{req_w} || $h != $self->{req_h}) { 412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w; 413 $self->{req_w} = $w;
341 $self->{req_h} = $h; 414 $self->{req_h} = $h;
342 415
343 $self->{parent}->check_size; 416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
344 } 425 }
345} 426}
346 427
347sub update { 428sub update {
348 my ($self) = @_; 429 my ($self) = @_;
… …
358} 439}
359 440
360sub emit { 441sub emit {
361 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
362 443
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
364 $cb->($self, @args);
365 }
366} 445}
367 446
368sub DESTROY { 447sub DESTROY {
369 my ($self) = @_; 448 my ($self) = @_;
370 449
… …
437sub new { 516sub new {
438 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
439 518
440 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
441 520
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 521 my $self = $class->SUPER::new (
522 children => [],
523 can_events => 0,
524 %arg,
525 );
443 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
444 527
445 $self 528 $self
446} 529}
447 530
… …
458 ]; 541 ];
459 542
460 $child->check_size; 543 $child->check_size;
461} 544}
462 545
546sub children {
547 @{ $_[0]{children} }
548}
549
463sub remove { 550sub remove {
464 my ($self, $child) = @_; 551 my ($self, $child) = @_;
465 552
466 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
467 555
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
469 557
470 $self->check_size; 558 $self->check_size;
471 $self->update; 559 $self->update;
560}
561
562sub clear {
563 my ($self) = @_;
564
565 my $children = delete $self->{children};
566 $self->{children} = [];
567
568 for (@$children) {
569 delete $_->{parent};
570 $_->hide;
571 }
472} 572}
473 573
474sub find_widget { 574sub find_widget {
475 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
476 576
… …
551} 651}
552 652
553sub update { 653sub update {
554 my ($self) = @_; 654 my ($self) = @_;
555 655
556 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 657 $self->SUPER::update;
559} 658}
560 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
561sub render_chld { 667sub render_child {
562 my ($self) = @_; 668 my ($self) = @_;
563 669
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
566 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw; 673 $self->child->draw;
674# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
568 }; 681 };
569}
570
571sub size_allocate {
572 my ($self, $w, $h) = @_;
573
574 $self->child->configure (0, 0, $w, $h);
575
576 $self->render_chld;
577} 682}
578 683
579sub _draw { 684sub _draw {
580 my ($self) = @_; 685 my ($self) = @_;
581 686
… …
583 688
584 my $tex = $self->{texture} 689 my $tex = $self->{texture}
585 or return; 690 or return;
586 691
587 glEnable GL_BLEND; 692 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
591 697
592 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
593 699
594 glDisable GL_BLEND; 700 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
636 border => 0.8, 742 border => 0.8,
637 @_ 743 @_
638 ); 744 );
639 745
640 $self 746 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648}
649
650sub size_request {
651 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h})
653}
654
655sub size_allocate {
656 my ($self, $w, $h) = @_;
657 $self->{w} = $w;
658 $self->{h} = $h;
659 $self->child->configure (0, 0, $w, $h);
660} 747}
661 748
662sub _draw { 749sub _draw {
663 my ($self) = @_; 750 my ($self) = @_;
664 751
… …
699 my $class = shift; 786 my $class = shift;
700 787
701 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
702 789
703 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
706 border => 0.8, 793 border => 0.6,
707 can_events => 1, 794 can_events => 1,
708 @_ 795 @_
709 ); 796 );
710 797
711 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 799 align => 0,
713 valign => 1, 800 valign => 1,
714 text => $self->{title}, 801 text => $self->{title},
715 fontsize => 1; 802 fontsize => $self->{border};
716 803
717 $self 804 $self
718} 805}
719 806
720sub border { 807sub border {
721 int $_[0]{border} * $::FONTSIZE 808 int $_[0]{border} * $::FONTSIZE
722} 809}
723 810
724sub size_request { 811sub size_request {
725 my ($self) = @_; 812 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 813
729 my ($w, $h) = $self->SUPER::size_request; 814 my ($w, $h) = $self->SUPER::size_request;
730 815
731 ( 816 (
732 $w + $self->border * 2, 817 $w + $self->border * 2,
… …
747} 832}
748 833
749sub button_down { 834sub button_down {
750 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
751 836
837 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 838 my $border = $self->border;
753 839
754 if ($x < $self->{w} && $x >= $self->{w} - $border 840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
759 847
848 my $mx = $x < $border;
849 my $my = $y < $border;
850
760 $self->{motion} = sub { 851 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
762 853
763 ($x, $y) = ($ev->{x}, $ev->{y}); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
764 856
765 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
767 $self->check_size; 860 $self->check_size;
768 }; 861 };
769 862
770 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
775 866
776 $self->{motion} = sub { 867 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
… …
813 $tex[1]->draw_quad (0, 0, $w, $border); 904 $tex[1]->draw_quad (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 905 $tex[3]->draw_quad (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 907 $tex[4]->draw_quad (0, $h - $border, $w, $border);
817 908
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 910 my $bg = $tex[0];
819 911
820 # TODO: repeat texture not scale 912 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 913 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 914 my $rep_y = $ch / $bg->{h};
823 915
824 glColor @{ $self->{bg} }; 916 glColor @{ $self->{bg} };
825 917
826 $bg->{s} = $rep_x; 918 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 919 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 920 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 921 $bg->draw_quad ($border, $border, $cw, $ch);
830 922
831 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND; 924 glDisable GL_BLEND;
925 }
833 926
834 $self->{title}->draw if $self->{title}; 927 $self->{title}->draw if $self->{title};
928
835 $self->child->draw; 929 $self->child->draw;
836} 930}
837 931
838############################################################################# 932#############################################################################
839 933
… …
861 $self->{children}[$y][$x] = $child; 955 $self->{children}[$y][$x] = $child;
862 956
863 $child->check_size; 957 $child->check_size;
864} 958}
865 959
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
866# TODO: move to container class maybe? send childs a signal on removal? 964# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 965sub clear {
868 my ($self) = @_; 966 my ($self) = @_;
869 967
968 my @children = $self->children;
870 delete $self->{children}; 969 delete $self->{children};
970
971 for (@children) {
972 delete $_->{parent};
973 $_->hide;
974 }
975
871 $self->update; 976 $self->update;
872} 977}
873 978
874sub get_wh { 979sub get_wh {
875 my ($self) = @_; 980 my ($self) = @_;
… …
1098 1203
1099sub new { 1204sub new {
1100 my ($class, %arg) = @_; 1205 my ($class, %arg) = @_;
1101 1206
1102 my $self = $class->SUPER::new ( 1207 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1208 fg => [1, 1, 1],
1209 #font => default_font
1104 fontsize => 1, 1210 fontsize => 1,
1105 text => "", 1211 text => "",
1106 align => -1, 1212 align => -1,
1107 valign => -1, 1213 valign => -1,
1108 padding => 2, 1214 padding => 2,
1109 layout => new CFClient::Layout, 1215 layout => new CFClient::Layout,
1110 can_events => 0, 1216 can_events => 0,
1111 %arg 1217 %arg
1112 ); 1218 );
1113 1219
1114 if (exists $self->{template}) { 1220 if (exists $self->{template}) {
… …
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1122 1228
1123 $self 1229 $self
1124} 1230}
1125 1231
1126sub escape_text { 1232sub escape {
1127 local $_ = $_[1]; 1233 local $_ = $_[1];
1128 1234
1129 s/&/&amp;/g; 1235 s/&/&amp;/g;
1130 s/>/&gt;/g; 1236 s/>/&gt;/g;
1131 s/</&lt;/g; 1237 s/</&lt;/g;
1132 1238
1133 $_[1] 1239 $_[1]
1134} 1240}
1135 1241
1242sub update {
1243 my ($self) = @_;
1244
1245 delete $self->{texture};
1246 $self->SUPER::update;
1247}
1248
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1136sub set_text { 1255sub set_text {
1137 my ($self, $text) = @_; 1256 my ($self, $text) = @_;
1138 1257
1258 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text";
1260
1139 $self->{layout}->set_text ($text); 1261 $self->{layout}->set_text ($text);
1140 1262
1141 delete $self->{texture}; 1263 delete $self->{texture};
1264 $self->update;
1142 $self->check_size; 1265 $self->check_size;
1143 $self->update;
1144} 1266}
1145 1267
1146sub set_markup { 1268sub set_markup {
1147 my ($self, $markup) = @_; 1269 my ($self, $markup) = @_;
1148 1270
1271 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup";
1273
1149 $self->{layout}->set_markup ($markup); 1274 $self->{layout}->set_markup ($markup);
1150 1275
1151 delete $self->{texture}; 1276 delete $self->{texture};
1277 $self->update;
1152 $self->check_size; 1278 $self->check_size;
1153 $self->update;
1154} 1279}
1155 1280
1156sub size_request { 1281sub size_request {
1157 my ($self) = @_; 1282 my ($self) = @_;
1158 1283
1159 $self->{layout}->set_width; 1284 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1);
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1287
1162 my ($w, $h) = $self->{layout}->size; 1288 my ($w, $h) = $self->{layout}->size;
1163 1289
1164 if (exists $self->{template}) { 1290 if (exists $self->{template}) {
1291 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1292 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1293
1167 my ($w2, $h2) = $self->{template}->size; 1294 my ($w2, $h2) = $self->{template}->size;
1168 1295
1169 $w = List::Util::max $w, $w2; 1296 $w = List::Util::max $w, $w2;
… …
1193 1320
1194sub _draw { 1321sub _draw {
1195 my ($self) = @_; 1322 my ($self) = @_;
1196 1323
1197 my $tex = $self->{texture} ||= do { 1324 my $tex = $self->{texture} ||= do {
1325 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1326 $self->{layout}->set_width ($self->{w});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1200 new_from_layout CFClient::Texture $self->{layout} 1328 new_from_layout CFClient::Texture $self->{layout}
1201 }; 1329 };
1202 1330
… …
1235 1363
1236sub new { 1364sub new {
1237 my $class = shift; 1365 my $class = shift;
1238 1366
1239 $class->SUPER::new ( 1367 $class->SUPER::new (
1240 fg => [1, 1, 1], 1368 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1369 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1370 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1371 active_fg => [0, 0, 0],
1244 can_hover => 1, 1372 can_hover => 1,
1245 can_focus => 1, 1373 can_focus => 1,
1246 valign => 0, 1374 valign => 0,
1247 can_events => 1, 1375 can_events => 1,
1248 @_ 1376 @_
1249 ) 1377 )
1250} 1378}
1251 1379
… …
1405 my ($self, $ev) = @_; 1533 my ($self, $ev) = @_;
1406 1534
1407 my $sym = $ev->{sym}; 1535 my $sym = $ev->{sym};
1408 1536
1409 if ($sym == 13) { 1537 if ($sym == 13) {
1538 unshift @{$self->{history}},
1539 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1542 $self->emit (activate => $txt);
1411 $self->update; 1543 $self->update;
1544
1545 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text;
1548 }
1549 if (@{$self->{history} || []} > 0) {
1550 $self->{history_pointer}++;
1551 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1552 $self->{history_pointer} = @{$self->{history} || []} - 1;
1553 }
1554 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1555 }
1556
1557 } elsif ($sym == CFClient::SDLK_DOWN) {
1558 $self->{history_pointer}--;
1559 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1560
1561 if ($self->{history_pointer} >= 0) {
1562 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1563 } else {
1564 $self->set_text ($self->{history_saveback});
1565 }
1412 1566
1413 } else { 1567 } else {
1414 $self->SUPER::key_down ($ev); 1568 $self->SUPER::key_down ($ev);
1415 } 1569 }
1416 1570
… …
1430 1584
1431sub new { 1585sub new {
1432 my $class = shift; 1586 my $class = shift;
1433 1587
1434 $class->SUPER::new ( 1588 $class->SUPER::new (
1435 padding => 4, 1589 padding => 4,
1436 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2], 1591 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1592 active_fg => [0, 0, 1],
1439 can_hover => 1, 1593 can_hover => 1,
1440 align => 0, 1594 align => 0,
1441 valign => 0, 1595 valign => 0,
1442 can_events => 1, 1596 can_events => 1,
1443 @_ 1597 @_
1444 ) 1598 )
1445} 1599}
1446 1600
… …
1605 1759
1606package CFClient::UI::VGauge; 1760package CFClient::UI::VGauge;
1607 1761
1608our @ISA = CFClient::UI::Base::; 1762our @ISA = CFClient::UI::Base::;
1609 1763
1764use List::Util qw(min max);
1765
1610use CFClient::OpenGL; 1766use CFClient::OpenGL;
1611 1767
1612my %tex = ( 1768my %tex = (
1613 food => [ 1769 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1770 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1771 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1772 ],
1617 grace => [ 1773 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1774 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1775 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1776 ],
1621 hp => [ 1777 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1778 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1779 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1780 ],
1625 mana => [ 1781 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1783 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1784 ],
1629); 1785);
1630 1786
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1787# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1788sub new {
… …
1651} 1807}
1652 1808
1653sub set_max { 1809sub set_max {
1654 my ($self, $max) = @_; 1810 my ($self, $max) = @_;
1655 1811
1812 return if $self->{max_val} == $max;
1813
1656 $self->{max_val} = $max; 1814 $self->{max_val} = $max;
1815 $self->update;
1657} 1816}
1658 1817
1659sub set_value { 1818sub set_value {
1660 my ($self, $val, $max) = @_; 1819 my ($self, $val, $max) = @_;
1661 1820
1662 $self->set_max ($max) 1821 $self->set_max ($max)
1663 if defined $max; 1822 if defined $max;
1664 1823
1665 $max = $self->{max_val}; 1824 return if $self->{val} == $val;
1825
1666 $self->{val} = $val; 1826 $self->{val} = $val;
1667
1668 $self->update; 1827 $self->update;
1669} 1828}
1670 1829
1671sub _draw { 1830sub _draw {
1672 my ($self) = @_; 1831 my ($self) = @_;
1673 1832
1674 my $tex = $tex{$self->{type}}; 1833 my $tex = $tex{$self->{type}};
1834 my ($t1, $t2, $t3) = @$tex;
1675 1835
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1836 my ($w, $h) = ($self->{w}, $self->{h});
1677 1837
1678 if ($self->{vertical}) { 1838 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1839 glRotate 90, 0, 0, 1;
… …
1681 1841
1682 ($w, $h) = ($h, $w); 1842 ($w, $h) = ($h, $w);
1683 } 1843 }
1684 1844
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1845 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1846
1688 my $t1 = $tex->[0]; 1847 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1848 my $ycut2 = max 0, min 1, $ycut - 1;
1849
1850 my $h1 = $self->{h} * (1 - $ycut1);
1851 my $h2 = $self->{h} * (1 - $ycut2);
1690 1852
1691 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1855 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1856 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1857
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1858 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1859 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1860 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1861 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1862 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1863 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1864 glEnd;
1706 1865
1866 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1867 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1868 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1869 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1870 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1871 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1872 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1873 glEnd;
1874
1875 if ($t3) {
1876 glBindTexture GL_TEXTURE_2D, $t3->{name};
1877 glBegin GL_QUADS;
1878 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1879 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1880 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1881 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1882 glEnd;
1883 }
1714 1884
1715 glDisable GL_BLEND; 1885 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1886 glDisable GL_TEXTURE_2D;
1717} 1887}
1718 1888
… …
1724 1894
1725sub new { 1895sub new {
1726 my ($class, %arg) = @_; 1896 my ($class, %arg) = @_;
1727 1897
1728 my $self = $class->SUPER::new ( 1898 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 1899 tooltip => $arg{type},
1900 can_hover => 1,
1901 can_events => 1,
1730 %arg, 1902 %arg,
1731 ); 1903 );
1732 1904
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 1905 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1906 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 1907 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 1908
1737 $self 1909 $self
1738} 1910}
1739 1911
… …
1742 1914
1743 $self->{value}->set_fontsize ($fsize); 1915 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 1916 $self->{max} ->set_fontsize ($fsize);
1745} 1917}
1746 1918
1919sub set_max {
1920 my ($self, $max) = @_;
1921
1922 $self->{gauge}->set_max ($max);
1923 $self->{max}->set_text ($max);
1924}
1925
1747sub set_value { 1926sub set_value {
1748 my ($self, $val, $max) = @_; 1927 my ($self, $val, $max) = @_;
1749 1928
1750 $self->set_max ($max) 1929 $self->set_max ($max)
1751 if defined $max; 1930 if defined $max;
1752 1931
1753 $self->{gauge}->set_value ($val, $max); 1932 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 1933 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 1934}
1763 1935
1764############################################################################# 1936#############################################################################
1765 1937
1766package CFClient::UI::Slider; 1938package CFClient::UI::Slider;
… …
1906 2078
1907sub new { 2079sub new {
1908 my $class = shift; 2080 my $class = shift;
1909 2081
1910 my $self = $class->SUPER::new ( 2082 my $self = $class->SUPER::new (
1911 fontsize => 1, 2083 fontsize => 1,
2084 can_events => 0,
2085 #font => default_font
1912 @_, 2086 @_,
1913 2087
1914 layout => (new CFClient::Layout), 2088 layout => (new CFClient::Layout),
1915 par => [], 2089 par => [],
1916 height => 0, 2090 height => 0,
1917 children => [ 2091 children => [
1918 (new CFClient::UI::Empty expand => 1), 2092 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2093 (new CFClient::UI::Slider vertical => 1),
1920 ], 2094 ],
1921 ); 2095 );
1922 2096
1923 $self->{children}[1]->connect (changed => sub { 2097 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2098
1927 $self 2099 $self
1928} 2100}
1929 2101
1930sub set_fontsize { 2102sub set_fontsize {
… …
1938 my ($self, $text) = @_; 2110 my ($self, $text) = @_;
1939 2111
1940 my $layout = $self->{layout}; 2112 my $layout = $self->{layout};
1941 2113
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2115 $layout->set_width ($self->{children}[0]{w});
1944 $layout->set_text ($text); 2116 $layout->set_text ($text);
1945 2117
1946 ($layout->size)[1] 2118 ($layout->size)[1]
1947} 2119}
1948 2120
… …
1956sub size_allocate { 2128sub size_allocate {
1957 my ($self, $w, $h) = @_; 2129 my ($self, $w, $h) = @_;
1958 2130
1959 $self->SUPER::size_allocate ($w, $h); 2131 $self->SUPER::size_allocate ($w, $h);
1960 2132
2133 $self->{layout}->set_font ($self->{font}) if $self->{font};
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2134 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1962 $self->{layout}->set_width ($self->{children}[0]{w}); 2135 $self->{layout}->set_width ($self->{children}[0]{w});
1963 2136
1964 $self->reflow; 2137 $self->reflow;
1965} 2138}
… …
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2001 2174
2002 delete $self->{texture}; 2175 delete $self->{texture};
2003 } 2176 }
2004 2177
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2006 glClearColor 0, 0, 0, 1; 2179 glClearColor 0, 0, 0, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2180 glClear GL_COLOR_BUFFER_BIT;
2008 2181
2009 glEnable GL_BLEND; 2182 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
… …
2018 2191
2019 my $y = 0; 2192 my $y = 0;
2020 2193
2021 my $layout = $self->{layout}; 2194 my $layout = $self->{layout};
2022 2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197
2023 for my $par (@{$self->{par}}) { 2198 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2199 my $h = $par->[0];
2025 2200
2026 if ($y0 < $y + $h && $y < $y1) { 2201 if ($y0 < $y + $h && $y < $y1) {
2027 $layout->set_text ($par->[2]); 2202 $layout->set_text ($par->[2]);
… …
2041} 2216}
2042 2217
2043sub _draw { 2218sub _draw {
2044 my ($self) = @_; 2219 my ($self) = @_;
2045 2220
2046 if ($self->{texture}) { 2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2047 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2227 glDisable GL_TEXTURE_2D;
2051 } 2228 glDisable GL_BLEND;
2052 2229
2053 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2054 2231
2055} 2232}
2056 2233
… …
2104 2281
2105sub new { 2282sub new {
2106 my $class = shift; 2283 my $class = shift;
2107 2284
2108 my $self = $class->SUPER::new ( 2285 my $self = $class->SUPER::new (
2109 state => 0, 2286 state => 0,
2110 connect_activate => \&toggle_flopper, 2287 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2288 @_
2113 ); 2289 );
2114 2290
2115 if ($self->{state}) { 2291 if ($self->{state}) {
2116 $self->{state} = 0; 2292 $self->{state} = 0;
… …
2151 @_, 2327 @_,
2152 can_events => 0, 2328 can_events => 0,
2153 ) 2329 )
2154} 2330}
2155 2331
2156sub set_text { 2332sub set_markup {
2157 my ($self, $text) = @_; 2333 my ($self, $text) = @_;
2158 2334
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2160 $self->{label}->set_text ($text); 2336 $self->{label}->set_markup ($text);
2161 $self->add ($self->{label}); 2337 $self->add ($self->{label});
2162} 2338}
2163 2339
2164sub size_request { 2340sub size_request {
2165 my ($self) = @_; 2341 my ($self) = @_;
2166 2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2346
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2347 ($w + 4, $h + 4)
2348}
2349
2350sub size_allocate {
2351 my ($self, $w, $h) = @_;
2352
2353 $self->SUPER::size_allocate ($w - 4, $h - 4);
2173} 2354}
2174 2355
2175sub _draw { 2356sub _draw {
2176 my ($self) = @_; 2357 my ($self) = @_;
2177 2358
… …
2202 $self->SUPER::_draw; 2383 $self->SUPER::_draw;
2203} 2384}
2204 2385
2205############################################################################# 2386#############################################################################
2206 2387
2388package CFClient::UI::Face;
2389
2390our @ISA = CFClient::UI::Base::;
2391
2392use CFClient::OpenGL;
2393
2394sub new {
2395 my $class = shift;
2396
2397 $class->SUPER::new (
2398 aspect => 1,
2399 @_,
2400 )
2401}
2402
2403sub size_request {
2404 (32, 8)
2405}
2406
2407sub _draw {
2408 my ($self) = @_;
2409
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2411
2412 # TODO animation
2413 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 }
2423}
2424
2425#############################################################################
2426
2427package CFClient::UI::Menu;
2428
2429our @ISA = CFClient::UI::FancyFrame::;
2430
2431use CFClient::OpenGL;
2432
2433sub new {
2434 my $class = shift;
2435
2436 my $self = $class->SUPER::new (
2437 items => [],
2438 z => 100,
2439 @_,
2440 );
2441
2442 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2443
2444 for my $item (@{ $self->{items} }) {
2445 my ($widget, $cb) = @$item;
2446
2447 # handle various types of items, only text for now
2448 if (!ref $widget) {
2449 $widget = new CFClient::UI::Label
2450 can_hover => 1,
2451 can_events => 1,
2452 text => $widget;
2453 }
2454
2455 $self->{item}{$widget} = $item;
2456
2457 $self->{vbox}->add ($widget);
2458 }
2459
2460 $self
2461}
2462
2463# popup given the event (must be a mouse button down event currently)
2464sub popup {
2465 my ($self, $ev) = @_;
2466
2467 $self->emit ("popdown");
2468
2469 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self;
2471 $self->{button} = $ev->{button};
2472
2473 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475}
2476
2477sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # TODO: should use vbox->fdind_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER};
2483}
2484
2485sub button_up {
2486 my ($self, $ev, $x, $y) = @_;
2487
2488 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB;
2490 $self->hide;
2491
2492 $self->emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover};
2494 }
2495}
2496
2497#############################################################################
2498
2207package CFClient::UI::Root; 2499package CFClient::UI::Root;
2208 2500
2209our @ISA = CFClient::UI::Container::; 2501our @ISA = CFClient::UI::Container::;
2210 2502
2211use CFClient::OpenGL; 2503use CFClient::OpenGL;
… …
2283 $self->_draw; 2575 $self->_draw;
2284} 2576}
2285 2577
2286############################################################################# 2578#############################################################################
2287 2579
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2288package CFClient::UI; 2687package CFClient::UI;
2289 2688
2290$ROOT = new CFClient::UI::Root; 2689$ROOT = new CFClient::UI::Root;
2291$TOOLTIP = new CFClient::UI::Tooltip; 2690$TOOLTIP = new CFClient::UI::Tooltip;
2292 2691

Diff Legend

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