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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
24 26
25 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
26 28
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 30
29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font}); 31 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 32 $TOOLTIP->show;
32 33
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34 35
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
38 38
39 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
40 } 42 }
41 43
42 return; 44 return;
43 } 45 }
44 } 46 }
… …
131 133
132 for (@$vals) { 134 for (@$vals) {
133 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
134 $rem += $_ - $i; 136 $rem += $_ - $i;
135 $_ = $i; 137 $_ = $i;
138 }
139}
140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
136 } 169 }
137} 170}
138 171
139############################################################################# 172#############################################################################
140 173
… …
159 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
161 } 194 }
162 } 195 }
163 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
164 $self 199 $self
165} 200}
166 201
167sub destroy { 202sub destroy {
168 my ($self) = @_; 203 my ($self) = @_;
… …
171 %$self = (); 206 %$self = ();
172} 207}
173 208
174sub show { 209sub show {
175 my ($self) = @_; 210 my ($self) = @_;
176
177 return if $self->{parent}; 211 return if $self->{parent};
178 212
179 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
180} 227}
181 228
182sub hide { 229sub hide {
183 my ($self) = @_; 230 my ($self) = @_;
184 231
… …
241 288
242sub size_allocate { 289sub size_allocate {
243 # nothing to be done 290 # nothing to be done
244} 291}
245 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
246sub children { 300sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259} 301}
260 302
261sub set_max_size { 303sub set_max_size {
262 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
263 305
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
308}
309
310sub set_tooltip {
311 my ($self, $tooltip) = @_;
312
313 $self->{tooltip} = $tooltip;
314
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
266} 319}
267 320
268# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
269sub coord2local { 322sub coord2local {
270 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
359 glEnd; 412 glEnd;
360 glPopMatrix; 413 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 415 }
363} 416}
364 417
365sub _draw { 418sub _draw {
366 my ($self) = @_; 419 my ($self) = @_;
… …
383sub set_parent { 436sub set_parent {
384 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
385 438
386 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
387 440
441 # TODO: req_w _does_change after ->reconfigure
388 $self->check_size 442 $self->check_size
389 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
390} 446}
391 447
392sub check_size { 448sub check_size {
393 my ($self) = @_; 449 my ($self, $forced) = @_;
394 450
451 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 453}
397 454
398sub update { 455sub update {
399 my ($self) = @_; 456 my ($self) = @_;
… …
415} 472}
416 473
417sub DESTROY { 474sub DESTROY {
418 my ($self) = @_; 475 my ($self) = @_;
419 476
477 delete $WIDGET{$self+0};
420 #$self->deactivate; 478 #$self->deactivate;
421} 479}
422 480
423############################################################################# 481#############################################################################
424 482
… …
433 my $class = shift; 491 my $class = shift;
434 492
435 # range [value, low, high, page] 493 # range [value, low, high, page]
436 494
437 $class->SUPER::new ( 495 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
440 @_ 498 @_
441 ) 499 )
442} 500}
443 501
444sub _draw { 502sub _draw {
445 my ($self) = @_; 503 my ($self) = @_;
446 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
448 511
449 glEnable GL_BLEND; 512 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
452 515
453 glBegin GL_QUADS; 516 glBegin GL_QUADS;
454 glVertex 0 , 0; 517 glVertex 0 , 0;
455 glVertex 0 , $h; 518 glVertex 0 , $h;
456 glVertex $w, $h; 519 glVertex $w, $h;
457 glVertex $w, 0; 520 glVertex $w, 0;
458 glEnd; 521 glEnd;
459 522
460 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
461} 525}
462 526
463############################################################################# 527#############################################################################
464 528
465package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
509 $self->{children} = [ 573 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 575 @{$self->{children}}, @widgets
512 ]; 576 ];
513 577
514 $self->check_size; 578 $self->check_size (1);
515 $self->update; 579 $self->update;
516} 580}
517 581
518sub children { 582sub children {
519 @{ $_[0]{children} } 583 @{ $_[0]{children} }
… …
626} 690}
627 691
628sub update { 692sub update {
629 my ($self) = @_; 693 my ($self) = @_;
630 694
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 696 $self->SUPER::update;
633} 697}
634 698
635sub size_allocate { 699sub size_allocate {
636 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
… …
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
652 716
653 $self->_render; 717 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 718 };
662} 719}
663 720
664sub _draw { 721sub _draw {
665 my ($self) = @_; 722 my ($self) = @_;
… …
669 my $tex = $self->{texture} 726 my $tex = $self->{texture}
670 or return; 727 or return;
671 728
672 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
675 732
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677 734
678 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
679} 736}
… …
686 743
687sub size_request { 744sub size_request {
688 my ($self) = @_; 745 my ($self) = @_;
689 746
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 748
693 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
694} 750}
695 751
696sub size_allocate { 752sub size_allocate {
697 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
698 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
699 $self->update; 758 $self->update;
700} 759}
701 760
702sub set_offset { 761sub set_offset {
703 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
757 816
758 my $slider = new CFClient::UI::Slider 817 my $slider = new CFClient::UI::Slider
759 vertical => 1, 818 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix 819 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub { 820 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1]);
763 }, 822 },
764 ; 823 ;
765 824
766 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
768 slider => $slider, 827 slider => $slider,
769 @_, 828 @_,
770 ); 829 );
771 830
772 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
774 $self->add ($self->{slider}); 833 $self->add ($self->{slider});
775 834
776 $self 835 $self
777} 836}
778 837
838sub size_allocate {
839 my ($self, $w, $h) = @_;
840
841 $self->SUPER::size_allocate ($w, $h);
842
843 my $child = $self->{vp}->child;
844 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
845}
846
779#TODO# update range on size_allocate depeneing on child 847#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 848# update viewport offset on scroll
781 849
782############################################################################# 850#############################################################################
783 851
784package CFClient::UI::Frame; 852package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 856use CFClient::OpenGL;
789 857
790sub new { 858sub new {
791 my $class = shift; 859 my $class = shift;
792 860
793 my $self = $class->SUPER::new ( 861 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 862 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 863 @_,
798 ); 864 )
799
800 $self
801} 865}
802 866
803sub _draw { 867sub _draw {
804 my ($self) = @_; 868 my ($self) = @_;
805 869
806 my ($w, $h) = ($self->{w}, $self->{h}); 870 if ($self->{bg}) {
871 my ($w, $h) = @$self{qw(w h)};
807 872
808 glEnable GL_BLEND; 873 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 874 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 875 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 876
813# glBegin GL_QUADS; 877 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 878 glVertex 0 , 0;
816# glVertex 0 , $h; 879 glVertex 0 , $h;
817# glVertex $w, $h; 880 glVertex $w, $h;
818# glVertex $w, 0; 881 glVertex $w, 0;
819# glEnd; 882 glEnd;
820 883
821
822 $self->child->draw;
823 glDisable GL_BLEND; 884 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 885 }
886
887 $self->SUPER::_draw;
825} 888}
826 889
827############################################################################# 890#############################################################################
828 891
829package CFClient::UI::FancyFrame; 892package CFClient::UI::FancyFrame;
… …
843 906
844 my $self = $class->SUPER::new ( 907 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 908 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 909 border_bg => [1, 1, 1, 1],
847 border => 0.6, 910 border => 0.6,
911 toplevel => 1,
848 can_events => 1, 912 can_events => 1,
849 @_ 913 @_
850 ); 914 );
851 915
852 $self->{title} &&= new CFClient::UI::Label 916 $self->{title} &&= new CFClient::UI::Label
… …
877 my ($self, $w, $h) = @_; 941 my ($self, $w, $h) = @_;
878 942
879 $h -= List::Util::max 0, $self->border * 2; 943 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 944 $w -= List::Util::max 0, $self->border * 2;
881 945
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 946 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 947 if $self->{title};
884 948
885 $self->child->configure ($self->border, $self->border, $w, $h); 949 $self->child->configure ($self->border, $self->border, $w, $h);
886} 950}
887 951
… …
945 my ($self) = @_; 1009 my ($self) = @_;
946 1010
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1011 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1012 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 1013
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1014 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1015 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1016
955 my $border = $self->border; 1017 my $border = $self->border;
956 1018
957 glColor @{ $self->{border_bg} }; 1019 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1020 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1021 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1022 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1023 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1024
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1025 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1026 my $bg = $tex[0];
965 1027
966 # TODO: repeat texture not scale 1028 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 1032 glColor @{ $self->{bg} };
971 1033
972 $bg->{s} = $rep_x; 1034 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1035 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1036 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1037 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1038 }
976 1039
977 glDisable GL_TEXTURE_2D; 1040 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1041
981 $self->{title}->draw if $self->{title}; 1042 $self->{title}->draw if $self->{title};
982 1043
983 $self->child->draw; 1044 $self->child->draw;
984} 1045}
… …
1251 1312
1252############################################################################# 1313#############################################################################
1253 1314
1254package CFClient::UI::Label; 1315package CFClient::UI::Label;
1255 1316
1256our @ISA = CFClient::UI::Base::; 1317our @ISA = CFClient::UI::DrawBG::;
1257 1318
1258use CFClient::OpenGL; 1319use CFClient::OpenGL;
1259 1320
1260sub new { 1321sub new {
1261 my ($class, %arg) = @_; 1322 my ($class, %arg) = @_;
1262 1323
1263 my $self = $class->SUPER::new ( 1324 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1325 fg => [1, 1, 1],
1326 #bg => none
1327 #active_bg => none
1265 #font => default_font 1328 #font => default_font
1266 #text => initial text 1329 #text => initial text
1267 #markup => initial narkup 1330 #markup => initial narkup
1331 #max_w => maximum pixel width
1332 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1333 layout => (new CFClient::Layout),
1269 fontsize => 1, 1334 fontsize => 1,
1270 align => -1, 1335 align => -1,
1271 valign => -1, 1336 valign => -1,
1272 padding => 2, 1337 padding => 2,
… …
1287 } 1352 }
1288 1353
1289 $self 1354 $self
1290} 1355}
1291 1356
1292sub escape { 1357sub escape($) {
1293 local $_ = $_[1]; 1358 local $_ = $_[0];
1294 1359
1295 s/&/&amp;/g; 1360 s/&/&amp;/g;
1296 s/>/&gt;/g; 1361 s/>/&gt;/g;
1297 s/</&lt;/g; 1362 s/</&lt;/g;
1298 1363
1299 $_[1] 1364 $_
1300} 1365}
1301 1366
1302sub update { 1367sub update {
1303 my ($self) = @_; 1368 my ($self) = @_;
1304 1369
… …
1337sub size_request { 1402sub size_request {
1338 my ($self) = @_; 1403 my ($self) = @_;
1339 1404
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1405 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1406 $self->{layout}->set_width ($self->{max_w} || -1);
1407 $self->{layout}->set_ellipsise ($self->{ellipsise});
1408 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1409 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1410
1344 my ($w, $h) = $self->{layout}->size; 1411 my ($w, $h) = $self->{layout}->size;
1345 1412
1346 if (exists $self->{template}) { 1413 if (exists $self->{template}) {
… …
1376} 1443}
1377 1444
1378sub _draw { 1445sub _draw {
1379 my ($self) = @_; 1446 my ($self) = @_;
1380 1447
1448 $self->SUPER::_draw; # draw background, if applicable
1449
1381 my $tex = $self->{texture} ||= do { 1450 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1451 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1452 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1453 $self->{layout}->set_width ($self->{w});
1454 $self->{layout}->set_ellipsise ($self->{ellipsise});
1455 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1456 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1457
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1458 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1459
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1460 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1461 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1462 : ($self->{w} - $tex->{w}) * 0.5);
1392 1463
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1464 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1465 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1466 : ($self->{h} - $tex->{h}) * 0.5);
1396 1467
1397 $tex 1468 $tex
1398 }; 1469 };
1399 1470
1400 glEnable GL_TEXTURE_2D; 1471 glEnable GL_TEXTURE_2D;
… …
1428 active_fg => [0, 0, 0], 1499 active_fg => [0, 0, 0],
1429 can_hover => 1, 1500 can_hover => 1,
1430 can_focus => 1, 1501 can_focus => 1,
1431 valign => 0, 1502 valign => 0,
1432 can_events => 1, 1503 can_events => 1,
1504 #text => ...
1433 @_ 1505 @_
1434 ) 1506 )
1435} 1507}
1436 1508
1437sub _set_text { 1509sub _set_text {
… …
1455sub set_text { 1527sub set_text {
1456 my ($self, $text) = @_; 1528 my ($self, $text) = @_;
1457 1529
1458 $self->{cursor} = length $text; 1530 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1531 $self->_set_text ($text);
1532 $self->update;
1460 $self->check_size; 1533 $self->check_size;
1461 $self->update;
1462} 1534}
1463 1535
1464sub get_text { 1536sub get_text {
1465 $_[0]{text} 1537 $_[0]{text}
1466} 1538}
… …
1486 my $sym = $ev->{sym}; 1558 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1559 my $uni = $ev->{unicode};
1488 1560
1489 my $text = $self->get_text; 1561 my $text = $self->get_text;
1490 1562
1491 if ($sym == 8) { 1563 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1564 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1565 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1566 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1567 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1568 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1569 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1570 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1571 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1572 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1573 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1574 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1575 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1576 $self->emit ('escape');
1505 } elsif ($uni) { 1577 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1578 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1579 }
1508 1580
1509 $self->_set_text ($text); 1581 $self->_set_text ($text);
1510 $self->update; 1582 $self->update;
1583 $self->check_size;
1511} 1584}
1512 1585
1513sub focus_in { 1586sub focus_in {
1514 my ($self) = @_; 1587 my ($self) = @_;
1515 1588
… …
1644 my $class = shift; 1717 my $class = shift;
1645 1718
1646 $class->SUPER::new ( 1719 $class->SUPER::new (
1647 padding => 4, 1720 padding => 4,
1648 fg => [1, 1, 1], 1721 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1722 active_fg => [0, 0, 1],
1651 can_hover => 1, 1723 can_hover => 1,
1652 align => 0, 1724 align => 0,
1653 valign => 0, 1725 valign => 0,
1654 can_events => 1, 1726 can_events => 1,
… …
1702 1774
1703 $class->SUPER::new ( 1775 $class->SUPER::new (
1704 padding => 2, 1776 padding => 2,
1705 fg => [1, 1, 1], 1777 fg => [1, 1, 1],
1706 active_fg => [1, 1, 0], 1778 active_fg => [1, 1, 0],
1779 bg => [0, 0, 0, 0.2],
1780 active_bg => [1, 1, 1, 0.5],
1707 state => 0, 1781 state => 0,
1708 can_hover => 1, 1782 can_hover => 1,
1709 @_ 1783 @_
1710 ) 1784 )
1711} 1785}
… …
1735 1809
1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1810 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1737 1811
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1812 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 1813
1814 my $tex = $self->{state} ? $tex[1] : $tex[0];
1815
1740 glEnable GL_TEXTURE_2D; 1816 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 1817 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 1818 glDisable GL_TEXTURE_2D;
1747} 1819}
1748 1820
1749############################################################################# 1821#############################################################################
1750 1822
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2069 qw(s1_slider.png s1_slider_bg.png);
1998 2070
1999sub new { 2071sub new {
2000 my $class = shift; 2072 my $class = shift;
2001 2073
2002 # range [value, low, high, page] 2074 # range [value, low, high, page, unit]
2003 2075
2004 # TODO: 0-width page 2076 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2077 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2078 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2081 active_fg => [0, 0, 0],
2082 bg => [0, 0, 0, 0.2],
2083 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2084 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2085 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2086 req_h => $::WIDTH / 80,
2013 vertical => 0, 2087 vertical => 0,
2014 can_hover => 1, 2088 can_hover => 1,
2015 inner_pad => 5, 2089 inner_pad => 0.02,
2016 @_ 2090 @_
2017 ); 2091 );
2018 2092
2093 $self->set_value ($self->{range}[0]);
2094 $self->update;
2095
2019 $self 2096 $self
2097}
2098
2099sub set_range {
2100 my ($self, $range) = @_;
2101
2102 $self->{range} = $range;
2103
2104 $self->update;
2105}
2106
2107sub set_value {
2108 my ($self, $value) = @_;
2109
2110 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2111
2112 $hi = $lo + 1 if $hi <= $lo;
2113
2114 $page = $hi - $lo if $page > $hi - $lo;
2115
2116 $value = $lo if $value < $lo;
2117 $value = $hi - $page if $value > $hi - $page;
2118
2119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2120 if $unit;
2121
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123
2124 if ($value != $old_value) {
2125 $self->emit (changed => $value);
2126 $self->update;
2127 }
2020} 2128}
2021 2129
2022sub size_request { 2130sub size_request {
2023 my ($self) = @_; 2131 my ($self) = @_;
2024 2132
… …
2030 2138
2031sub button_down { 2139sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2140 my ($self, $ev, $x, $y) = @_;
2033 2141
2034 $self->SUPER::button_down ($ev, $x, $y); 2142 $self->SUPER::button_down ($ev, $x, $y);
2143
2144 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2145
2035 $self->mouse_motion ($ev, $x, $y); 2146 $self->mouse_motion ($ev, $x, $y);
2036} 2147}
2037 2148
2038sub mouse_motion { 2149sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2150 my ($self, $ev, $x, $y) = @_;
2040 2151
2041 if ($GRAB == $self) { 2152 if ($GRAB == $self) {
2153 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2154
2155 my (undef, $lo, $hi, $page) = @{$self->{range}};
2156
2157 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2158
2159 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2160 }
2161}
2162
2163sub update {
2164 my ($self) = @_;
2165
2166 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2167 $self->set_value ($self->{range}[0]);
2168
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2169 my ($value, $lo, $hi, $page) = @{$self->{range}};
2170 my $range = ($hi - $page - $lo) || 1e-100;
2043 2171
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2172 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2173
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2174 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2175 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2176
2049 $x -= $inner_pad_px; # substract the padding 2177 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2178 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2179
2055 $self->emit (changed => $x); 2180 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2181 $self->{knob_w} = $knob_w;
2057 } 2182 });
2058}
2059 2183
2060# the inner_* stuff is for generating a padding for the slider handle, 2184 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2185}
2067 2186
2068sub _draw { 2187sub _draw {
2069 my ($self) = @_; 2188 my ($self) = @_;
2070 2189
2071 $self->SUPER::_draw (); 2190 $self->SUPER::_draw ();
2072 2191
2073 my ($w, $h) = @$self{qw(w h)}; 2192 glScale $self->{w}, $self->{h};
2074 2193
2075 if ($self->{vertical}) { 2194 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2195 # draw a vertical slider like a rotated horizontal slider
2077 2196
2197 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2198 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2199 }
2083 2200
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2201 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2202 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2203
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_TEXTURE_2D; 2204 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2206
2108 # draw background 2207 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2208 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2209
2111 # draw handle 2210 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2211 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2212
2114 glDisable GL_TEXTURE_2D; 2213 glDisable GL_TEXTURE_2D;
2115} 2214}
2215
2216#############################################################################
2217
2218package CFClient::UI::ValSlider;
2219
2220our @ISA = CFClient::UI::HBox::;
2221
2222sub new {
2223 my ($class, %arg) = @_;
2224
2225 my $range = delete $arg{range};
2226
2227 my $self = $class->SUPER::new (
2228 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2229 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2230 to_value => sub { shift },
2231 from_value => sub { shift },
2232 %arg,
2233 );
2234
2235 $self->{slider}->connect (changed => sub {
2236 my ($self, $value) = @_;
2237 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2238 $self->{parent}->emit (changed => $value);
2239 });
2240
2241# $self->{entry}->connect (changed => sub {
2242# my ($self, $value) = @_;
2243# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2244# $self->{parent}->emit (changed => $value);
2245# });
2246
2247 $self->add ($self->{slider}, $self->{entry});
2248
2249 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2250
2251 $self
2252}
2253
2254sub set_range { shift->{slider}->set_range (@_) }
2255sub set_value { shift->{slider}->set_value (@_) }
2116 2256
2117############################################################################# 2257#############################################################################
2118 2258
2119package CFClient::UI::TextView; 2259package CFClient::UI::TextView;
2120 2260
… …
2150 2290
2151 $self->{fontsize} = $fontsize; 2291 $self->{fontsize} = $fontsize;
2152 $self->reflow; 2292 $self->reflow;
2153} 2293}
2154 2294
2155sub text_height {
2156 my ($self, $text) = @_;
2157
2158 my $layout = $self->{layout};
2159
2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2161 $layout->set_width ($self->{children}[0]{w});
2162 $layout->set_markup ($text);
2163
2164 ($layout->size)[1]
2165}
2166
2167sub reflow {
2168 my ($self) = @_;
2169
2170 $self->{need_reflow}++;
2171 $self->update;
2172}
2173
2174sub size_allocate { 2295sub size_allocate {
2175 my ($self, $w, $h) = @_; 2296 my ($self, $w, $h) = @_;
2176 2297
2177 $self->SUPER::size_allocate ($w, $h); 2298 $self->SUPER::size_allocate ($w, $h);
2178 2299
… …
2181 $self->{layout}->set_width ($self->{children}[0]{w}); 2302 $self->{layout}->set_width ($self->{children}[0]{w});
2182 2303
2183 $self->reflow; 2304 $self->reflow;
2184} 2305}
2185 2306
2307sub text_size {
2308 my ($self, $text, $indent) = @_;
2309
2310 my $layout = $self->{layout};
2311
2312 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2313 $layout->set_width ($self->{children}[0]{w} - $indent);
2314 $layout->set_markup ($text);
2315
2316 $layout->size
2317}
2318
2319sub reflow {
2320 my ($self) = @_;
2321
2322 $self->{need_reflow}++;
2323 $self->update;
2324}
2325
2326sub set_offset {
2327 my ($self, $offset) = @_;
2328
2329 # todo: base offset on lines or so, not on pixels
2330 $self->{children}[1]->set_value ($offset);
2331}
2332
2333sub clear {
2334 my ($self) = @_;
2335
2336 $self->{par} = [];
2337 $self->{height} = 0;
2338 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2339}
2340
2186sub add_paragraph { 2341sub add_paragraph {
2187 my ($self, $color, $text) = @_; 2342 my ($self, $color, $text, $indent) = @_;
2188 2343
2189 #TODO: intelligently "reformat" paragraph 2344 for my $line (split /\n/, $text) {
2190 2345 my ($w, $h) = $self->text_size ($line);
2191 my $height = $self->text_height ($text);
2192
2193 $self->{height} += $height; 2346 $self->{height} += $h;
2347 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2348 }
2194 2349
2195 push @{$self->{par}}, [$height, $color, $text];
2196
2197 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2350 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2198 $self->{children}[1]->update;
2199} 2351}
2200 2352
2201sub update { 2353sub update {
2202 my ($self) = @_; 2354 my ($self) = @_;
2203 2355
… …
2205 2357
2206 return unless $self->{h} > 0; 2358 return unless $self->{h} > 0;
2207 2359
2208 delete $self->{texture}; 2360 delete $self->{texture};
2209 2361
2210 $ROOT->on_refresh ($self, sub { 2362 $ROOT->on_post_alloc ($self, sub {
2363 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2364
2211 if (delete $self->{need_reflow}) { 2365 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2366 my $height = 0;
2213 2367
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2368 my $layout = $self->{layout};
2369
2370 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2371
2215 for @{$self->{par}}; 2372 for (@{$self->{par}}) {
2373 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2374 $layout->set_width ($W - $_->[3]);
2375 $layout->set_markup ($_->[4]);
2376 my ($w, $h) = $layout->size;
2377 $_->[0] = $w + $_->[3];
2378 $_->[1] = $h;
2379 }
2380
2381 $height += $_->[1];
2382 }
2216 2383
2217 $self->{height} = $height; 2384 $self->{height} = $height;
2218 2385
2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2386 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2220 2387
2221 delete $self->{texture}; 2388 delete $self->{texture};
2222 } 2389 }
2223 2390
2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2391 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2225 glClearColor 0, 0, 0, 0; 2392 glClearColor 0.5, 0.5, 0.5, 0;
2226 glClear GL_COLOR_BUFFER_BIT; 2393 glClear GL_COLOR_BUFFER_BIT;
2227 2394
2228 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231 my $top = int $self->{children}[1]{range}[0]; 2395 my $top = int $self->{children}[1]{range}[0];
2232 2396
2233 my $y0 = $top; 2397 my $y0 = $top;
2234 my $y1 = $top + $self->{h}; 2398 my $y1 = $top + $H;
2235 2399
2236 my $y = 0; 2400 my $y = 0;
2237 2401
2238 my $layout = $self->{layout}; 2402 my $layout = $self->{layout};
2239 2403
2240 $layout->set_font ($self->{font}) if $self->{font}; 2404 $layout->set_font ($self->{font}) if $self->{font};
2241 2405
2406 glEnable GL_BLEND;
2407 #TODO# not correct in windows where rgba is forced off
2408 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2409
2242 for my $par (@{$self->{par}}) { 2410 for my $par (@{$self->{par}}) {
2243 my $h = $par->[0]; 2411 my $h = $par->[1];
2244 2412
2245 if ($y0 < $y + $h && $y < $y1) { 2413 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] }); 2414 $layout->set_foreground (@{ $par->[2] });
2415 $layout->set_width ($W - $par->[3]);
2247 $layout->set_markup ($par->[2]); 2416 $layout->set_markup ($par->[4]);
2248 2417
2249 my ($W, $H) = $layout->size; 2418 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2419
2420 glRasterPos $par->[3], $y - $y0;
2421 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2251 } 2422 }
2252 2423
2253 $y += $h; 2424 $y += $h;
2254 } 2425 }
2255 2426
2256 glDisable GL_TEXTURE_2D; 2427 glDisable GL_BLEND;
2257 }; 2428 };
2258 }); 2429 });
2259} 2430}
2260 2431
2261sub _draw { 2432sub _draw {
2262 my ($self) = @_; 2433 my ($self) = @_;
2263 2434
2264 glEnable GL_TEXTURE_2D; 2435 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 1, 1, 1, 1; 2437 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2438 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2268 glDisable GL_TEXTURE_2D; 2439 glDisable GL_TEXTURE_2D;
2269 2440
2270 $self->{children}[1]->draw; 2441 $self->{children}[1]->draw;
2271 2442
2272} 2443}
… …
2367 @_, 2538 @_,
2368 can_events => 0, 2539 can_events => 0,
2369 ) 2540 )
2370} 2541}
2371 2542
2372sub set_markup { 2543sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2544 my ($self, $widget) = @_;
2374 2545
2375 $self->{label} = new CFClient::UI::Label 2546 $self->add (new CFClient::UI::Label
2547 markup => $widget->{tooltip},
2548 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2549 fontsize => 0.8,
2377 fg => [0, 0, 0], 2550 fg => [0, 0, 0, 1],
2551 ellipsise => 0,
2378 font => ($font || $::FONT_PROP); 2552 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2553 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2554}
2384 2555
2385sub size_request { 2556sub size_request {
2386 my ($self) = @_; 2557 my ($self) = @_;
2387 2558
… …
2397} 2568}
2398 2569
2399sub _draw { 2570sub _draw {
2400 my ($self) = @_; 2571 my ($self) = @_;
2401 2572
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2573 glTranslate 0.375, 0.375;
2404 2574
2405 my ($w, $h) = @$self{qw(w h)}; 2575 my ($w, $h) = @$self{qw(w h)};
2406 2576
2407 glColor 1, 0.8, 0.4; 2577 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2588 glVertex 0 , $h;
2419 glVertex $w, $h; 2589 glVertex $w, $h;
2420 glVertex $w, 0; 2590 glVertex $w, 0;
2421 glEnd; 2591 glEnd;
2422 2592
2423 glPopMatrix; 2593 glTranslate 2 - 0.375, 2 - 0.375;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2594 $self->SUPER::_draw;
2427} 2595}
2428 2596
2429############################################################################# 2597#############################################################################
2430 2598
… …
2435use CFClient::OpenGL; 2603use CFClient::OpenGL;
2436 2604
2437sub new { 2605sub new {
2438 my $class = shift; 2606 my $class = shift;
2439 2607
2440 $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2441 aspect => 1, 2609 aspect => 1,
2442 @_, 2610 @_,
2443 ) 2611 );
2612
2613 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self);
2615
2616 $self->{timer} = Event->timer (
2617 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2618 hard => 1,
2619 interval => $self->{animspeed},
2620 cb => sub {
2621 ++$widget->{frame};
2622 $widget->update;
2623 },
2624 );
2625 }
2626
2627 $self
2444} 2628}
2445 2629
2446sub size_request { 2630sub size_request {
2447 (32, 8) 2631 (32, 8)
2448} 2632}
2449 2633
2634sub update {
2635 my ($self) = @_;
2636
2637 return unless $self->{visible};
2638
2639 $self->SUPER::update;
2640}
2641
2450sub _draw { 2642sub _draw {
2451 my ($self) = @_; 2643 my ($self) = @_;
2452 2644
2453 return unless $::CONN;#d# manage and cache textures differently 2645 return unless $::CONN;
2646
2647 my $face;
2648
2649 if ($self->{frame}) {
2650 my $anim = $::CONN->{anim}[$self->{anim}];
2651
2652 $face = $anim->[ $self->{frame} % @$anim ]
2653 if $anim && @$anim;
2654 }
2655
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2656 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2455 2657
2456 # TODO animation
2457 if ($tex) { 2658 if ($tex) {
2458 glEnable GL_TEXTURE_2D; 2659 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1; 2661 glColor 1, 1, 1, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2662 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D; 2663 glDisable GL_TEXTURE_2D;
2463 } 2664 }
2464} 2665}
2465 2666
2667sub DESTROY {
2668 my ($self) = @_;
2669
2670 $self->{timer}->cancel
2671 if $self->{timer};
2672
2673 $self->SUPER::DESTROY;
2674}
2675
2466############################################################################# 2676#############################################################################
2467 2677
2468package CFClient::UI::InventoryItem; 2678package CFClient::UI::InventoryItem;
2469 2679
2470our @ISA = CFClient::UI::HBox::; 2680our @ISA = CFClient::UI::HBox::;
2681
2682sub _item_to_desc {
2683 my ($item) = @_;
2684
2685 my $desc =
2686 $item->{nrof} < 2
2687 ? $item->{name}
2688 : "$item->{nrof} × $item->{name_pl}";
2689
2690 $item->{flags} & Crossfire::Protocol::F_OPEN
2691 and $desc .= " (open)";
2692 $item->{flags} & Crossfire::Protocol::F_APPLIED
2693 and $desc .= " (applied)";
2694 $item->{flags} & Crossfire::Protocol::F_UNPAID
2695 and $desc .= " (unpaid)";
2696 $item->{flags} & Crossfire::Protocol::F_MAGIC
2697 and $desc .= " (magic)";
2698 $item->{flags} & Crossfire::Protocol::F_CURSED
2699 and $desc .= " (cursed)";
2700 $item->{flags} & Crossfire::Protocol::F_DAMNED
2701 and $desc .= " (damned)";
2702 $item->{flags} & Crossfire::Protocol::F_LOCKED
2703 and $desc .= " *";
2704
2705 $desc
2706}
2471 2707
2472sub new { 2708sub new {
2473 my $class = shift; 2709 my $class = shift;
2474 2710
2475 my %args = @_; 2711 my %args = @_;
2476 2712
2477 my $item = delete $args{item}; 2713 my $item = delete $args{item};
2478 2714
2479 my $desc = $item->{nrof} < 2 2715 my $desc = _item_to_desc ($item);
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483 2716
2484 my $self = $class->SUPER::new ( 2717 my $self = $class->SUPER::new (
2485 can_hover => 1, 2718 can_hover => 1,
2486 can_events => 1, 2719 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc) 2720 tooltip => ((CFClient::UI::Label::escape $desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub { 2722 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_; 2723 my ($self, $ev, $x, $y) = @_;
2491 2724
2492 # todo: maybe put examine on 1? but should just be a tooltip :( 2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2727 my $targ = $::CONN->{player}{tag};
2728
2729 if ($item->{container} == $::CONN->{player}{tag}) {
2730 $targ = $main::OPENCONT;
2731 }
2732
2733 $::CONN->send ("move $targ $item->{tag} 0");
2493 if ($ev->{button} == 1) { 2734 } elsif ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2735 $::CONN->send ("examine $item->{tag}");
2495 } elsif ($ev->{button} == 2) { 2736 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}"); 2737 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) { 2738 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new ( 2739 my @menu_items = (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2740 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2741 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2742 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2743 (
2744 $item->{flags} & Crossfire::Protocol::F_LOCKED
2745 ? (
2746 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2747 )
2748 : (
2749 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2750 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2751 )
2508 ], 2752 ),
2509 )->popup ($ev); 2753 );
2754
2755 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2510 } 2756 }
2511 2757
2512 1 2758 1
2513 }, 2759 },
2514 %args 2760 %args
2515 ); 2761 );
2762
2516 2763
2517 $self->add (new CFClient::UI::Face 2764 $self->add (new CFClient::UI::Face
2518 can_events => 0, 2765 can_events => 0,
2519 face => $item->{face}, 2766 face => $item->{face},
2520 anim => $item->{anim}, 2767 anim => $item->{anim},
2521 animspeed => $item->{animspeed}, 2768 animspeed => $item->{animspeed},
2522 ); 2769 );
2523 2770
2524 $self->add (new CFClient::UI::Label 2771 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2525 can_events => 0, 2772
2526 text => $desc, 2773 $self->{item} = $item;
2527 ); 2774
2775 $self->update_item;
2528 2776
2529 $self 2777 $self
2778}
2779
2780sub update_item {
2781 my ($self) = @_;
2782
2783 my $desc = _item_to_desc ($self->{item});
2784
2785 $self->{name_lbl}->set_text ($desc);
2530} 2786}
2531 2787
2532############################################################################# 2788#############################################################################
2533 2789
2534package CFClient::UI::Inventory; 2790package CFClient::UI::Inventory;
… …
2537 2793
2538sub new { 2794sub new {
2539 my $class = shift; 2795 my $class = shift;
2540 2796
2541 my $self = $class->SUPER::new ( 2797 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox), 2798 scrolled => (new CFClient::UI::Table),
2543 @_, 2799 @_,
2544 ); 2800 );
2545 2801
2546 $self 2802 $self
2547} 2803}
… …
2550 my ($self, $items) = @_; 2806 my ($self, $items) = @_;
2551 2807
2552 $self->{scrolled}->clear; 2808 $self->{scrolled}->clear;
2553 return unless $items; 2809 return unless $items;
2554 2810
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2811 my @items = sort {
2812 ($a->{type} <=> $b->{type})
2813 or ($a->{name} cmp $b->{name})
2814 } @$items;
2556 2815
2557 $self->{real_items} = \@items; 2816 $self->{real_items} = \@items;
2558 2817
2559 for my $item (@items) { 2818 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2 2819 $item->{item} = $item;
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2822 }
2823
2824 my $i = 0;
2825 for (@items) {
2826 $self->{scrolled}->add (0, $i, $_);
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2565 } 2829 }
2566 2830
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568} 2832}
2569 2833
… …
2648 2912
2649package CFClient::UI::Statusbox; 2913package CFClient::UI::Statusbox;
2650 2914
2651our @ISA = CFClient::UI::VBox::; 2915our @ISA = CFClient::UI::VBox::;
2652 2916
2917sub new {
2918 my $class = shift;
2919
2920 $class->SUPER::new (
2921 fontsize => 0.8,
2922 @_,
2923 )
2924}
2925
2653sub reorder { 2926sub reorder {
2654 my ($self) = @_; 2927 my ($self) = @_;
2655 my $NOW = time; 2928 my $NOW = time;
2656 2929
2657 while (my ($k, $v) = each %{ $self->{item} }) { 2930 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2931 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 2932 }
2660 2933
2661 my @widgets; 2934 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2935
2936 my @items = sort {
2937 $a->{pri} <=> $b->{pri}
2938 or $b->{id} <=> $a->{id}
2939 } values %{ $self->{item} };
2940
2663 my $count = 10 + 1; 2941 my $count = 10 + 1;
2664 for my $item (@items) { 2942 for my $item (@items) {
2665 last unless --$count; 2943 last unless --$count;
2666 2944
2667 push @widgets, $item->{label} ||= do { 2945 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 2946 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 2947 my $short = $item->{count} > 1
2948 ? "<b>$item->{count} ×</b> $item->{text}"
2949 : $item->{text};
2950
2670 for ($short) { 2951 for ($short) {
2671 s/^\s+//; 2952 s/^\s+//;
2672 s/\012.*//s; 2953 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 } 2954 }
2676 2955
2677 new CFClient::UI::Label 2956 new CFClient::UI::Label
2678 markup => $short, 2957 markup => $short,
2679 tooltip => delete $item->{tooltip}, 2958 tooltip => $item->{tooltip},
2680 fontsize => delete $item->{fontsize}, 2959 tooltip_font => $::FONT_PROP,
2681 color => delete $item->{color}, 2960 tooltip_width => 0.67,
2961 fontsize => $item->{fontsize} || $self->{fontsize},
2962 max_w => $::WIDTH * 0.44,
2963 fg => $item->{fg},
2682 can_events => 1, 2964 can_events => 1,
2683 can_hover => 1, 2965 can_hover => 1
2684 }; 2966 };
2685 } 2967 }
2686 2968
2687 $self->clear; 2969 $self->clear;
2688 $self->SUPER::add (@widgets); 2970 $self->SUPER::add (reverse @widgets);
2689} 2971}
2690 2972
2691sub add { 2973sub add {
2692 my ($self, $text, %arg) = @_; 2974 my ($self, $text, %arg) = @_;
2693 2975
2694 my $item = { 2976 $text =~ s/^\s+//;
2695 time => time, 2977 $text =~ s/\s+$//;
2978
2979 my $timeout = time + ((delete $arg{timeout}) || 60);
2980
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982
2983 if (my $item = $self->{item}{$group}) {
2984 if ($item->{text} eq $text) {
2985 $item->{count}++;
2986 } else {
2987 $item->{count} = 1;
2988 $item->{text} = $item->{tooltip} = $text;
2989 }
2990 $item->{id} = ++$self->{id};
2991 $item->{timeout} = $timeout;
2992 delete $item->{label};
2993 } else {
2994 $self->{item}{$group} = {
2995 id => ++$self->{id},
2696 text => $text, 2996 text => $text,
2697 timeout => 60, 2997 timeout => $timeout,
2698 tooltip => $text, 2998 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 2999 fg => [0.8, 0.8, 0.8, 0.8],
3000 pri => 0,
3001 count => 1,
2701 %arg, 3002 %arg,
3003 };
2702 }; 3004 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 3005
2709 $self->reorder; 3006 $self->reorder;
3007}
3008
3009sub reconfigure {
3010 my ($self) = @_;
3011
3012 delete $_->{label}
3013 for values %{ $self->{item} || {} };
3014
3015 $self->reorder;
3016 $self->SUPER::reconfigure;
2710} 3017}
2711 3018
2712############################################################################# 3019#############################################################################
2713 3020
2714package CFClient::UI::Root; 3021package CFClient::UI::Root;
… …
2746} 3053}
2747 3054
2748sub size_allocate { 3055sub size_allocate {
2749 my ($self, $w, $h) = @_; 3056 my ($self, $w, $h) = @_;
2750 3057
2751 my $old_w = $self->{old_w}; 3058 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2752 my $old_h = $self->{old_h}; 3059 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2753 3060
2754 if ($old_w && $old_h) { 3061 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2755 for my $child ($self->children) { 3062 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766 3063
2767 for my $child ($self->children) { 3064 for my $child ($self->children) {
2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3065 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769 3066
3067 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3068 if exists $child->{req_x};
3069
3070 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3071 if exists $child->{req_y};
3072
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3073 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3074 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3075
2772 $child->configure ($X, $Y, $W, $H); 3076 $child->configure ($X, $Y, $W, $H);
2773 } 3077 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777} 3078}
2778 3079
2779sub coord2local { 3080sub coord2local {
2780 my ($self, $x, $y) = @_; 3081 my ($self, $x, $y) = @_;
2781 3082
… …
2794 $self->check_size; 3095 $self->check_size;
2795 $::WANT_REFRESH++; 3096 $::WANT_REFRESH++;
2796} 3097}
2797 3098
2798sub add { 3099sub add {
2799 my ($self, $child) = @_; 3100 my ($self, @children) = @_;
2800 3101
3102 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children;
3104 $w->{root} = $self;
3105 $w->{visible} = 1;
3106 }
3107
3108 for my $child (@children) {
3109 $child->{toplevel} = 1;
3110
2801 # integerise window positions 3111 # integerise window positions
2802 $child->{x} = int $child->{x}; 3112 $child->{x} = int $child->{x};
2803 $child->{y} = int $child->{y}; 3113 $child->{y} = int $child->{y};
3114 }
2804 3115
2805 $self->SUPER::add ($child); 3116 $self->SUPER::add (@children);
3117}
3118
3119sub remove {
3120 my ($self, @children) = @_;
3121
3122 $self->SUPER::remove (@children);
3123
3124 while (@children) {
3125 my $w = pop @children;
3126 push @children, $w->children;
3127 delete $w->{visible};
3128 }
2806} 3129}
2807 3130
2808sub on_refresh { 3131sub on_refresh {
2809 my ($self, $id, $cb) = @_; 3132 my ($self, $id, $cb) = @_;
2810 3133
2811 $self->{refresh_hook}{$id} = $cb; 3134 $self->{refresh_hook}{$id} = $cb;
2812} 3135}
2813 3136
3137sub on_post_alloc {
3138 my ($self, $id, $cb) = @_;
3139
3140 $self->{post_alloc_hook}{$id} = $cb;
3141}
3142
2814sub draw { 3143sub draw {
2815 my ($self) = @_; 3144 my ($self) = @_;
3145
3146 while ($self->{refresh_hook}) {
3147 $_->()
3148 for values %{delete $self->{refresh_hook}};
3149 }
2816 3150
2817 if ($self->{check_size}) { 3151 if ($self->{check_size}) {
2818 my @queue = ([], []); 3152 my @queue = ([], []);
2819 3153
2820 for (;;) { 3154 for (;;) {
… …
2828 3162
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3163 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)} 3164 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request; 3165 : $widget->size_request;
2832 3166
3167 if (delete $widget->{force_alloc}
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3168 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3169 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835 3170
2836 $widget->{req_w} = $w; 3171 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h; 3172 $widget->{req_h} = $h;
2838 3173
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3174 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2840 3175
2841 $widget->{parent}->check_size 3176 $widget->{parent}->check_size
2842 if $widget->{parent}; 3177 if $widget->{parent};
2843 } 3178 }
2844 } 3179 }
… …
2856 $widget->size_allocate ($w, $h); 3191 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h); 3192 $widget->emit (size_allocate => $w, $h);
2858 } 3193 }
2859 } 3194 }
2860 3195
2861 while ($self->{refresh_hook}) { 3196 while ($self->{post_alloc_hook}) {
2862 $_->() 3197 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3198 for values %{delete $self->{post_alloc_hook}};
2864 } 3199 }
2865 3200
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3201 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 3203 glClear GL_COLOR_BUFFER_BIT;
2869 3204
2870 glMatrixMode GL_PROJECTION; 3205 glMatrixMode GL_PROJECTION;
2871 glLoadIdentity; 3206 glLoadIdentity;
2872 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2873 glMatrixMode GL_MODELVIEW; 3208 glMatrixMode GL_MODELVIEW;
2874 glLoadIdentity; 3209 glLoadIdentity;
2875 3210
2876 $self->_draw; 3211 $self->_draw;
2877} 3212}
… …
2879############################################################################# 3214#############################################################################
2880 3215
2881package CFClient::UI; 3216package CFClient::UI;
2882 3217
2883$ROOT = new CFClient::UI::Root; 3218$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip; 3219$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885 3220
28861 32211
2887 3222

Diff Legend

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