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.158 by root, Mon Apr 24 02:41:48 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
… …
216 244
217sub size_allocate { 245sub size_allocate {
218 # nothing to be done 246 # nothing to be done
219} 247}
220 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
221sub set_max_size { 262sub set_max_size {
222 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
223 264
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 265 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 266 delete $self->{max_h}; $self->{max_h} = $h if $h;
226} 267}
227 268
228# return top left coordinates 269# return top left coordinates
229sub _topleft { 270sub _topleft {
230 my ($self, $x, $y) = @_; 271 my ($self, $x, $y) = @_;
272
273 $self->{parent}
274 or Carp::confess "no parent widget in _topleft\n";#d#
231 275
232 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
233} 277}
234 278
235# translate global coordinates to local coordinate system 279# translate global coordinates to local coordinate system
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 357 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 358 glVertex $x , $y + $self->{h};
315 glEnd; 359 glEnd;
316 glDisable GL_BLEND; 360 glDisable GL_BLEND;
317 } 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 }
318} 376}
319 377
320sub _draw { 378sub _draw {
321 my ($self) = @_; 379 my ($self) = @_;
322 380
… …
381} 439}
382 440
383sub emit { 441sub emit {
384 my ($self, $signal, @args) = @_; 442 my ($self, $signal, @args) = @_;
385 443
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
387 $cb->($self, @args);
388 }
389} 445}
390 446
391sub DESTROY { 447sub DESTROY {
392 my ($self) = @_; 448 my ($self) = @_;
393 449
… …
460sub new { 516sub new {
461 my ($class, %arg) = @_; 517 my ($class, %arg) = @_;
462 518
463 my $children = delete $arg{children} || []; 519 my $children = delete $arg{children} || [];
464 520
465 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 );
466 $self->add ($_) for @$children; 526 $self->add ($_) for @$children;
467 527
468 $self 528 $self
469} 529}
470 530
… …
481 ]; 541 ];
482 542
483 $child->check_size; 543 $child->check_size;
484} 544}
485 545
546sub children {
547 @{ $_[0]{children} }
548}
549
486sub remove { 550sub remove {
487 my ($self, $child) = @_; 551 my ($self, $child) = @_;
488 552
489 delete $child->{parent}; 553 delete $child->{parent};
554 $child->hide;
490 555
491 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
492 557
493 $self->check_size; 558 $self->check_size;
494 $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 }
495} 572}
496 573
497sub find_widget { 574sub find_widget {
498 my ($self, $x, $y) = @_; 575 my ($self, $x, $y) = @_;
499 576
… …
574} 651}
575 652
576sub update { 653sub update {
577 my ($self) = @_; 654 my ($self) = @_;
578 655
579 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 657 $self->SUPER::update;
582} 658}
583 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
584sub render_chld { 667sub render_child {
585 my ($self) = @_; 668 my ($self) = @_;
586 669
587 $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 {
588 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
589 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
590 $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;
591 }; 681 };
592}
593
594sub size_allocate {
595 my ($self, $w, $h) = @_;
596
597 $self->child->configure (0, 0, $w, $h);
598
599 $self->render_chld;
600} 682}
601 683
602sub _draw { 684sub _draw {
603 my ($self) = @_; 685 my ($self) = @_;
604 686
… …
606 688
607 my $tex = $self->{texture} 689 my $tex = $self->{texture}
608 or return; 690 or return;
609 691
610 glEnable GL_BLEND; 692 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
613 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;
614 697
615 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
616 699
617 glDisable GL_BLEND; 700 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
703 my $class = shift; 786 my $class = shift;
704 787
705 # TODO: user_x, user_y, overwrite moveto? 788 # TODO: user_x, user_y, overwrite moveto?
706 789
707 my $self = $class->SUPER::new ( 790 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 791 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 792 border_bg => [1, 1, 1, 1],
710 border => 0.8, 793 border => 0.6,
711 can_events => 1, 794 can_events => 1,
712 @_ 795 @_
713 ); 796 );
714 797
715 $self->{title} &&= new CFClient::UI::Label 798 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 799 align => 0,
717 valign => 1, 800 valign => 1,
718 text => $self->{title}, 801 text => $self->{title},
719 fontsize => 1; 802 fontsize => $self->{border};
720 803
721 $self 804 $self
722} 805}
723 806
724sub border { 807sub border {
… …
749} 832}
750 833
751sub button_down { 834sub button_down {
752 my ($self, $ev, $x, $y) = @_; 835 my ($self, $ev, $x, $y) = @_;
753 836
837 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 838 my $border = $self->border;
755 839
756 if ($x < $self->{w} && $x >= $self->{w} - $border 840 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 841 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 842
843 if ($lr & $td) {
844 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 845 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 846 my ($bw, $bh) = ($self->{w}, $self->{h});
761 847
848 my $mx = $x < $border;
849 my $my = $y < $border;
850
762 $self->{motion} = sub { 851 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 852 my ($ev, $x, $y) = @_;
764 853
765 ($x, $y) = ($ev->{x}, $ev->{y}); 854 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy;
766 856
767 $self->{user_w} = $bw + $x - $ox; 857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
768 $self->{user_h} = $bh + $y - $oy; 858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
769 $self->check_size; 860 $self->check_size;
770 }; 861 };
771 862
772 } elsif ($x >= 0 && $x < $self->{w} 863 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 864 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 865 my ($bx, $by) = ($self->{x}, $self->{y});
777 866
778 $self->{motion} = sub { 867 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 868 my ($ev, $x, $y) = @_;
… …
815 $tex[1]->draw_quad (0, 0, $w, $border); 904 $tex[1]->draw_quad (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 905 $tex[3]->draw_quad (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 907 $tex[4]->draw_quad (0, $h - $border, $w, $border);
819 908
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820 my $bg = $tex[0]; 910 my $bg = $tex[0];
821 911
822 # TODO: repeat texture not scale 912 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 913 my $rep_x = $cw / $bg->{w};
824 my $rep_y = $ch / $bg->{h}; 914 my $rep_y = $ch / $bg->{h};
825 915
826 glColor @{ $self->{bg} }; 916 glColor @{ $self->{bg} };
827 917
828 $bg->{s} = $rep_x; 918 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y; 919 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1; 920 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 921 $bg->draw_quad ($border, $border, $cw, $ch);
832 922
833 glDisable GL_TEXTURE_2D; 923 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND; 924 glDisable GL_BLEND;
925 }
835 926
836 $self->{title}->draw if $self->{title}; 927 $self->{title}->draw if $self->{title};
928
837 $self->child->draw; 929 $self->child->draw;
838} 930}
839 931
840############################################################################# 932#############################################################################
841 933
… …
863 $self->{children}[$y][$x] = $child; 955 $self->{children}[$y][$x] = $child;
864 956
865 $child->check_size; 957 $child->check_size;
866} 958}
867 959
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
868# 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?
869sub clear { 965sub clear {
870 my ($self) = @_; 966 my ($self) = @_;
871 967
968 my @children = $self->children;
872 delete $self->{children}; 969 delete $self->{children};
970
971 for (@children) {
972 delete $_->{parent};
973 $_->hide;
974 }
975
873 $self->update; 976 $self->update;
874} 977}
875 978
876sub get_wh { 979sub get_wh {
877 my ($self) = @_; 980 my ($self) = @_;
… …
1100 1203
1101sub new { 1204sub new {
1102 my ($class, %arg) = @_; 1205 my ($class, %arg) = @_;
1103 1206
1104 my $self = $class->SUPER::new ( 1207 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1208 fg => [1, 1, 1],
1106 #font => default_font 1209 #font => default_font
1107 fontsize => 1, 1210 fontsize => 1,
1108 text => "", 1211 text => "",
1109 align => -1, 1212 align => -1,
1110 valign => -1, 1213 valign => -1,
1111 padding => 2, 1214 padding => 2,
1112 layout => new CFClient::Layout, 1215 layout => new CFClient::Layout,
1113 can_events => 0, 1216 can_events => 0,
1114 %arg 1217 %arg
1115 ); 1218 );
1116 1219
1117 if (exists $self->{template}) { 1220 if (exists $self->{template}) {
… …
1124 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1125 1228
1126 $self 1229 $self
1127} 1230}
1128 1231
1129sub escape_text { 1232sub escape {
1130 local $_ = $_[1]; 1233 local $_ = $_[1];
1131 1234
1132 s/&/&amp;/g; 1235 s/&/&amp;/g;
1133 s/>/&gt;/g; 1236 s/>/&gt;/g;
1134 s/</&lt;/g; 1237 s/</&lt;/g;
1135 1238
1136 $_[1] 1239 $_[1]
1137} 1240}
1138 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
1139sub set_text { 1255sub set_text {
1140 my ($self, $text) = @_; 1256 my ($self, $text) = @_;
1141 1257
1258 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text";
1260
1142 $self->{layout}->set_text ($text); 1261 $self->{layout}->set_text ($text);
1143 1262
1144 delete $self->{texture}; 1263 delete $self->{texture};
1264 $self->update;
1145 $self->check_size; 1265 $self->check_size;
1146 $self->update;
1147} 1266}
1148 1267
1149sub set_markup { 1268sub set_markup {
1150 my ($self, $markup) = @_; 1269 my ($self, $markup) = @_;
1151 1270
1271 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup";
1273
1152 $self->{layout}->set_markup ($markup); 1274 $self->{layout}->set_markup ($markup);
1153 1275
1154 delete $self->{texture}; 1276 delete $self->{texture};
1277 $self->update;
1155 $self->check_size; 1278 $self->check_size;
1156 $self->update;
1157} 1279}
1158 1280
1159sub size_request { 1281sub size_request {
1160 my ($self) = @_; 1282 my ($self) = @_;
1161 1283
… …
1241 1363
1242sub new { 1364sub new {
1243 my $class = shift; 1365 my $class = shift;
1244 1366
1245 $class->SUPER::new ( 1367 $class->SUPER::new (
1246 fg => [1, 1, 1], 1368 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1369 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1370 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1371 active_fg => [0, 0, 0],
1250 can_hover => 1, 1372 can_hover => 1,
1251 can_focus => 1, 1373 can_focus => 1,
1252 valign => 0, 1374 valign => 0,
1253 can_events => 1, 1375 can_events => 1,
1254 @_ 1376 @_
1255 ) 1377 )
1256} 1378}
1257 1379
… …
1411 my ($self, $ev) = @_; 1533 my ($self, $ev) = @_;
1412 1534
1413 my $sym = $ev->{sym}; 1535 my $sym = $ev->{sym};
1414 1536
1415 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} = '';
1416 $self->emit (activate => $self->get_text); 1542 $self->emit (activate => $txt);
1417 $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 }
1418 1566
1419 } else { 1567 } else {
1420 $self->SUPER::key_down ($ev); 1568 $self->SUPER::key_down ($ev);
1421 } 1569 }
1422 1570
… …
1436 1584
1437sub new { 1585sub new {
1438 my $class = shift; 1586 my $class = shift;
1439 1587
1440 $class->SUPER::new ( 1588 $class->SUPER::new (
1441 padding => 4, 1589 padding => 4,
1442 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2], 1591 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1592 active_fg => [0, 0, 1],
1445 can_hover => 1, 1593 can_hover => 1,
1446 align => 0, 1594 align => 0,
1447 valign => 0, 1595 valign => 0,
1448 can_events => 1, 1596 can_events => 1,
1449 @_ 1597 @_
1450 ) 1598 )
1451} 1599}
1452 1600
… …
1659} 1807}
1660 1808
1661sub set_max { 1809sub set_max {
1662 my ($self, $max) = @_; 1810 my ($self, $max) = @_;
1663 1811
1812 return if $self->{max_val} == $max;
1813
1664 $self->{max_val} = $max; 1814 $self->{max_val} = $max;
1815 $self->update;
1665} 1816}
1666 1817
1667sub set_value { 1818sub set_value {
1668 my ($self, $val, $max) = @_; 1819 my ($self, $val, $max) = @_;
1669 1820
1670 $self->set_max ($max) 1821 $self->set_max ($max)
1671 if defined $max; 1822 if defined $max;
1672 1823
1673 $max = $self->{max_val}; 1824 return if $self->{val} == $val;
1825
1674 $self->{val} = $val; 1826 $self->{val} = $val;
1675
1676 $self->update; 1827 $self->update;
1677} 1828}
1678 1829
1679sub _draw { 1830sub _draw {
1680 my ($self) = @_; 1831 my ($self) = @_;
… …
1743 1894
1744sub new { 1895sub new {
1745 my ($class, %arg) = @_; 1896 my ($class, %arg) = @_;
1746 1897
1747 my $self = $class->SUPER::new ( 1898 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 1899 tooltip => $arg{type},
1900 can_hover => 1,
1901 can_events => 1,
1749 %arg, 1902 %arg,
1750 ); 1903 );
1751 1904
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 1905 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 1906 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 1907 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 1908
1756 $self 1909 $self
1757} 1910}
1758 1911
1759sub set_fontsize { 1912sub set_fontsize {
… …
1761 1914
1762 $self->{value}->set_fontsize ($fsize); 1915 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 1916 $self->{max} ->set_fontsize ($fsize);
1764} 1917}
1765 1918
1919sub set_max {
1920 my ($self, $max) = @_;
1921
1922 $self->{gauge}->set_max ($max);
1923 $self->{max}->set_text ($max);
1924}
1925
1766sub set_value { 1926sub set_value {
1767 my ($self, $val, $max) = @_; 1927 my ($self, $val, $max) = @_;
1768 1928
1769 $self->set_max ($max) 1929 $self->set_max ($max)
1770 if defined $max; 1930 if defined $max;
1771 1931
1772 $self->{gauge}->set_value ($val, $max); 1932 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 1933 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 1934}
1782 1935
1783############################################################################# 1936#############################################################################
1784 1937
1785package CFClient::UI::Slider; 1938package CFClient::UI::Slider;
… …
1925 2078
1926sub new { 2079sub new {
1927 my $class = shift; 2080 my $class = shift;
1928 2081
1929 my $self = $class->SUPER::new ( 2082 my $self = $class->SUPER::new (
1930 fontsize => 1, 2083 fontsize => 1,
2084 can_events => 0,
1931 #font => default_font 2085 #font => default_font
1932 @_, 2086 @_,
1933 2087
1934 layout => (new CFClient::Layout), 2088 layout => (new CFClient::Layout),
1935 par => [], 2089 par => [],
1936 height => 0, 2090 height => 0,
1937 children => [ 2091 children => [
1938 (new CFClient::UI::Empty expand => 1), 2092 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2093 (new CFClient::UI::Slider vertical => 1),
1940 ], 2094 ],
1941 ); 2095 );
1942 2096
1943 $self->{children}[1]->connect (changed => sub { 2097 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2098
1947 $self 2099 $self
1948} 2100}
1949 2101
1950sub set_fontsize { 2102sub set_fontsize {
… …
1958 my ($self, $text) = @_; 2110 my ($self, $text) = @_;
1959 2111
1960 my $layout = $self->{layout}; 2112 my $layout = $self->{layout};
1961 2113
1962 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963 $layout->set_width ($self->{w}); 2115 $layout->set_width ($self->{children}[0]{w});
1964 $layout->set_text ($text); 2116 $layout->set_text ($text);
1965 2117
1966 ($layout->size)[1] 2118 ($layout->size)[1]
1967} 2119}
1968 2120
… …
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2022 2174
2023 delete $self->{texture}; 2175 delete $self->{texture};
2024 } 2176 }
2025 2177
2026 $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 {
2027 glClearColor 0, 0, 0, 1; 2179 glClearColor 0, 0, 0, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2180 glClear GL_COLOR_BUFFER_BIT;
2029 2181
2030 glEnable GL_BLEND; 2182 glEnable GL_BLEND;
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
… …
2064} 2216}
2065 2217
2066sub _draw { 2218sub _draw {
2067 my ($self) = @_; 2219 my ($self) = @_;
2068 2220
2069 if ($self->{texture}) { 2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2071 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;
2072 $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});
2073 glDisable GL_TEXTURE_2D; 2227 glDisable GL_TEXTURE_2D;
2074 } 2228 glDisable GL_BLEND;
2075 2229
2076 $self->{children}[1]->draw; 2230 $self->{children}[1]->draw;
2077 2231
2078} 2232}
2079 2233
… …
2127 2281
2128sub new { 2282sub new {
2129 my $class = shift; 2283 my $class = shift;
2130 2284
2131 my $self = $class->SUPER::new ( 2285 my $self = $class->SUPER::new (
2132 state => 0, 2286 state => 0,
2133 connect_activate => \&toggle_flopper, 2287 connect_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2288 @_
2136 ); 2289 );
2137 2290
2138 if ($self->{state}) { 2291 if ($self->{state}) {
2139 $self->{state} = 0; 2292 $self->{state} = 0;
… …
2174 @_, 2327 @_,
2175 can_events => 0, 2328 can_events => 0,
2176 ) 2329 )
2177} 2330}
2178 2331
2179sub set_text { 2332sub set_markup {
2180 my ($self, $text) = @_; 2333 my ($self, $text) = @_;
2181 2334
2182 $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];
2183 $self->{label}->set_text ($text); 2336 $self->{label}->set_markup ($text);
2184 $self->add ($self->{label}); 2337 $self->add ($self->{label});
2185} 2338}
2186 2339
2187sub size_request { 2340sub size_request {
2188 my ($self) = @_; 2341 my ($self) = @_;
2189 2342
2190 $self->child->set_max_size ($::WIDTH * 0.2); 2343 $self->child->set_max_size ($::WIDTH * 0.3);
2191 2344
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2346
2194 ($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);
2195} 2354}
2196 2355
2197sub _draw { 2356sub _draw {
2198 my ($self) = @_; 2357 my ($self) = @_;
2199 2358
… …
2224 $self->SUPER::_draw; 2383 $self->SUPER::_draw;
2225} 2384}
2226 2385
2227############################################################################# 2386#############################################################################
2228 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
2229package CFClient::UI::Root; 2499package CFClient::UI::Root;
2230 2500
2231our @ISA = CFClient::UI::Container::; 2501our @ISA = CFClient::UI::Container::;
2232 2502
2233use CFClient::OpenGL; 2503use CFClient::OpenGL;
… …
2305 $self->_draw; 2575 $self->_draw;
2306} 2576}
2307 2577
2308############################################################################# 2578#############################################################################
2309 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
2310package CFClient::UI; 2687package CFClient::UI;
2311 2688
2312$ROOT = new CFClient::UI::Root; 2689$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 2690$TOOLTIP = new CFClient::UI::Tooltip;
2314 2691

Diff Legend

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