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.225 by root, Tue May 23 21:14:41 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) = @_;
… …
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
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
779#TODO# update range on size_allocate depeneing on child 838#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 839# update viewport offset on scroll
781 840
782############################################################################# 841#############################################################################
783 842
784package CFClient::UI::Frame; 843package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 847use CFClient::OpenGL;
789 848
790sub new { 849sub new {
791 my $class = shift; 850 my $class = shift;
792 851
793 my $self = $class->SUPER::new ( 852 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 853 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 854 @_,
798 ); 855 )
799
800 $self
801} 856}
802 857
803sub _draw { 858sub _draw {
804 my ($self) = @_; 859 my ($self) = @_;
805 860
806 my ($w, $h) = ($self->{w}, $self->{h}); 861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
807 863
808 glEnable GL_BLEND; 864 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 866 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 867
813# glBegin GL_QUADS; 868 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 869 glVertex 0 , 0;
816# glVertex 0 , $h; 870 glVertex 0 , $h;
817# glVertex $w, $h; 871 glVertex $w, $h;
818# glVertex $w, 0; 872 glVertex $w, 0;
819# glEnd; 873 glEnd;
820 874
821
822 $self->child->draw;
823 glDisable GL_BLEND; 875 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 876 }
877
878 $self->SUPER::_draw;
825} 879}
826 880
827############################################################################# 881#############################################################################
828 882
829package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
… …
843 897
844 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
847 border => 0.6, 901 border => 0.6,
902 toplevel => 1,
848 can_events => 1, 903 can_events => 1,
849 @_ 904 @_
850 ); 905 );
851 906
852 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
… …
877 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
878 933
879 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
881 936
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 938 if $self->{title};
884 939
885 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
886} 941}
887 942
… …
945 my ($self) = @_; 1000 my ($self) = @_;
946 1001
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1002 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 1004
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1005 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1007
955 my $border = $self->border; 1008 my $border = $self->border;
956 1009
957 glColor @{ $self->{border_bg} }; 1010 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1015
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1017 my $bg = $tex[0];
965 1018
966 # TODO: repeat texture not scale 1019 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 1023 glColor @{ $self->{bg} };
971 1024
972 $bg->{s} = $rep_x; 1025 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1026 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1027 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 }
976 1030
977 glDisable GL_TEXTURE_2D; 1031 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1032
981 $self->{title}->draw if $self->{title}; 1033 $self->{title}->draw if $self->{title};
982 1034
983 $self->child->draw; 1035 $self->child->draw;
984} 1036}
… …
1251 1303
1252############################################################################# 1304#############################################################################
1253 1305
1254package CFClient::UI::Label; 1306package CFClient::UI::Label;
1255 1307
1256our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1257 1309
1258use CFClient::OpenGL; 1310use CFClient::OpenGL;
1259 1311
1260sub new { 1312sub new {
1261 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1262 1314
1263 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1265 #font => default_font 1319 #font => default_font
1266 #text => initial text 1320 #text => initial text
1267 #markup => initial narkup 1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1324 layout => (new CFClient::Layout),
1269 fontsize => 1, 1325 fontsize => 1,
1270 align => -1, 1326 align => -1,
1271 valign => -1, 1327 valign => -1,
1272 padding => 2, 1328 padding => 2,
… …
1287 } 1343 }
1288 1344
1289 $self 1345 $self
1290} 1346}
1291 1347
1292sub escape { 1348sub escape($) {
1293 local $_ = $_[1]; 1349 local $_ = $_[0];
1294 1350
1295 s/&/&amp;/g; 1351 s/&/&amp;/g;
1296 s/>/&gt;/g; 1352 s/>/&gt;/g;
1297 s/</&lt;/g; 1353 s/</&lt;/g;
1298 1354
1299 $_[1] 1355 $_
1300} 1356}
1301 1357
1302sub update { 1358sub update {
1303 my ($self) = @_; 1359 my ($self) = @_;
1304 1360
… …
1337sub size_request { 1393sub size_request {
1338 my ($self) = @_; 1394 my ($self) = @_;
1339 1395
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1401
1344 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1345 1403
1346 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1376} 1434}
1377 1435
1378sub _draw { 1436sub _draw {
1379 my ($self) = @_; 1437 my ($self) = @_;
1380 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1381 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1442 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1448
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1450
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1453 : ($self->{w} - $tex->{w}) * 0.5);
1392 1454
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1457 : ($self->{h} - $tex->{h}) * 0.5);
1396 1458
1397 $tex 1459 $tex
1398 }; 1460 };
1399 1461
1400 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
… …
1428 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1429 can_hover => 1, 1491 can_hover => 1,
1430 can_focus => 1, 1492 can_focus => 1,
1431 valign => 0, 1493 valign => 0,
1432 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1433 @_ 1496 @_
1434 ) 1497 )
1435} 1498}
1436 1499
1437sub _set_text { 1500sub _set_text {
… …
1455sub set_text { 1518sub set_text {
1456 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1457 1520
1458 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1522 $self->_set_text ($text);
1523 $self->update;
1460 $self->check_size; 1524 $self->check_size;
1461 $self->update;
1462} 1525}
1463 1526
1464sub get_text { 1527sub get_text {
1465 $_[0]{text} 1528 $_[0]{text}
1466} 1529}
… …
1486 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1488 1551
1489 my $text = $self->get_text; 1552 my $text = $self->get_text;
1490 1553
1491 if ($sym == 8) { 1554 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1567 $self->emit ('escape');
1505 } elsif ($uni) { 1568 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1570 }
1508 1571
1509 $self->_set_text ($text); 1572 $self->_set_text ($text);
1510 $self->update; 1573 $self->update;
1574 $self->check_size;
1511} 1575}
1512 1576
1513sub focus_in { 1577sub focus_in {
1514 my ($self) = @_; 1578 my ($self) = @_;
1515 1579
… …
1644 my $class = shift; 1708 my $class = shift;
1645 1709
1646 $class->SUPER::new ( 1710 $class->SUPER::new (
1647 padding => 4, 1711 padding => 4,
1648 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1651 can_hover => 1, 1714 can_hover => 1,
1652 align => 0, 1715 align => 0,
1653 valign => 0, 1716 valign => 0,
1654 can_events => 1, 1717 can_events => 1,
… …
1702 1765
1703 $class->SUPER::new ( 1766 $class->SUPER::new (
1704 padding => 2, 1767 padding => 2,
1705 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1706 active_fg => [1, 1, 0], 1769 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5],
1707 state => 0, 1772 state => 0,
1708 can_hover => 1, 1773 can_hover => 1,
1709 @_ 1774 @_
1710 ) 1775 )
1711} 1776}
… …
1735 1800
1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1737 1802
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 1804
1805 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806
1740 glEnable GL_TEXTURE_2D; 1807 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 1808 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 1809 glDisable GL_TEXTURE_2D;
1747} 1810}
1748 1811
1749############################################################################# 1812#############################################################################
1750 1813
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1998 2061
1999sub new { 2062sub new {
2000 my $class = shift; 2063 my $class = shift;
2001 2064
2002 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
2003 2066
2004 # TODO: 0-width page 2067 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2069 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
2011 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2013 vertical => 0, 2078 vertical => 0,
2014 can_hover => 1, 2079 can_hover => 1,
2015 inner_pad => 5, 2080 inner_pad => 0.02,
2016 @_ 2081 @_
2017 ); 2082 );
2018 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
2019 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2098sub set_value {
2099 my ($self, $value) = @_;
2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102
2103 $hi = $lo + 1 if $hi <= $lo;
2104
2105 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi;
2107
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
2020} 2119}
2021 2120
2022sub size_request { 2121sub size_request {
2023 my ($self) = @_; 2122 my ($self) = @_;
2024 2123
… …
2037 2136
2038sub mouse_motion { 2137sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
2040 2139
2041 if ($GRAB == $self) { 2140 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142
2143 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2146
2147 $self->set_value ($x * ($hi - $lo) + $lo);
2148 }
2149}
2150
2151sub update {
2152 my ($self) = @_;
2153
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]);
2156
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2157 my ($value, $lo, $hi, $page) = @{$self->{range}};
2043 2158
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2159 my $inner_w = 1 - 2 * $self->{inner_pad};
2045 2160
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2048 2162
2049 $x -= $inner_pad_px; # substract the padding 2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2164 $value = $self->{scale} * ($value - $lo);
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2165
2055 $self->emit (changed => $x); 2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2056 $self->update; 2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value;
2172 $self->{knob_w} = $page;
2057 } 2173 });
2058}
2059 2174
2060# the inner_* stuff is for generating a padding for the slider handle, 2175 $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} 2176}
2067 2177
2068sub _draw { 2178sub _draw {
2069 my ($self) = @_; 2179 my ($self) = @_;
2070 2180
2071 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
2072 2182
2073 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
2074 2184
2075 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2077 2187
2188 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2190 }
2083 2191
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2194
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; 2195 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2197
2108 # draw background 2198 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2200
2111 # draw handle 2201 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2203
2114 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2115} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2116 2247
2117############################################################################# 2248#############################################################################
2118 2249
2119package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2120 2251
… …
2150 2281
2151 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2152 $self->reflow; 2283 $self->reflow;
2153} 2284}
2154 2285
2286sub size_allocate {
2287 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290
2291 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294
2295 $self->reflow;
2296}
2297
2155sub text_height { 2298sub text_height {
2156 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2157 2300
2158 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2159 2302
2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2161 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2162 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2163 2306
2164 ($layout->size)[1] 2307 ($layout->size)[1]
2165} 2308}
2166 2309
… …
2169 2312
2170 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2171 $self->update; 2314 $self->update;
2172} 2315}
2173 2316
2174sub size_allocate {
2175 my ($self, $w, $h) = @_;
2176
2177 $self->SUPER::size_allocate ($w, $h);
2178
2179 $self->{layout}->set_font ($self->{font}) if $self->{font};
2180 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2181 $self->{layout}->set_width ($self->{children}[0]{w});
2182
2183 $self->reflow;
2184}
2185
2186sub add_paragraph { 2317sub add_paragraph {
2187 my ($self, $color, $text) = @_; 2318 my ($self, $color, $text, $indent) = @_;
2188 2319
2189 #TODO: intelligently "reformat" paragraph 2320 #TODO: intelligently "reformat" paragraph
2190 2321
2322 for my $line (split /\n/, $text) {
2191 my $height = $self->text_height ($text); 2323 my $height = $self->text_height ($line);
2192
2193 $self->{height} += $height; 2324 $self->{height} += $height;
2194
2195 push @{$self->{par}}, [$height, $color, $text]; 2325 push @{$self->{par}}, [$height, $color, $indent, $line];
2326 }
2196 2327
2197 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2198 $self->{children}[1]->update; 2329 $self->{children}[1]->update;
2199} 2330}
2200 2331
… …
2205 2336
2206 return unless $self->{h} > 0; 2337 return unless $self->{h} > 0;
2207 2338
2208 delete $self->{texture}; 2339 delete $self->{texture};
2209 2340
2210 $ROOT->on_refresh ($self, sub { 2341 $ROOT->on_post_alloc ($self, sub {
2211 if (delete $self->{need_reflow}) { 2342 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2343 my $height = 0;
2213 2344
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2215 for @{$self->{par}}; 2346 for @{$self->{par}};
2216 2347
2217 $self->{height} = $height; 2348 $self->{height} = $height;
2218 2349
2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2351 $self->{children}[1]->update;
2220 2352
2221 delete $self->{texture}; 2353 delete $self->{texture};
2222 } 2354 }
2223 2355
2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2225 glClearColor 0, 0, 0, 0; 2357 glClearColor 0.5, 0.5, 0.5, 0;
2226 glClear GL_COLOR_BUFFER_BIT; 2358 glClear GL_COLOR_BUFFER_BIT;
2227
2228 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230 2359
2231 my $top = int $self->{children}[1]{range}[0]; 2360 my $top = int $self->{children}[1]{range}[0];
2232 2361
2233 my $y0 = $top; 2362 my $y0 = $top;
2234 my $y1 = $top + $self->{h}; 2363 my $y1 = $top + $self->{h};
… …
2237 2366
2238 my $layout = $self->{layout}; 2367 my $layout = $self->{layout};
2239 2368
2240 $layout->set_font ($self->{font}) if $self->{font}; 2369 $layout->set_font ($self->{font}) if $self->{font};
2241 2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2242 for my $par (@{$self->{par}}) { 2374 for my $par (@{$self->{par}}) {
2243 my $h = $par->[0]; 2375 my $h = $par->[0];
2244 2376
2245 if ($y0 < $y + $h && $y < $y1) { 2377 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] }); 2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2247 $layout->set_markup ($par->[2]); 2380 $layout->set_markup ($par->[3]);
2248 2381
2249 my ($W, $H) = $layout->size; 2382 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2383
2384 glRasterPos $par->[2], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2251 } 2386 }
2252 2387
2253 $y += $h; 2388 $y += $h;
2254 } 2389 }
2255 2390
2256 glDisable GL_TEXTURE_2D; 2391 glDisable GL_BLEND;
2257 }; 2392 };
2258 }); 2393 });
2259} 2394}
2260 2395
2261sub _draw { 2396sub _draw {
2262 my ($self) = @_; 2397 my ($self) = @_;
2263 2398
2264 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 1, 1, 1, 1; 2401 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2402 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2268 glDisable GL_TEXTURE_2D; 2403 glDisable GL_TEXTURE_2D;
2269 2404
2270 $self->{children}[1]->draw; 2405 $self->{children}[1]->draw;
2271 2406
2272} 2407}
… …
2367 @_, 2502 @_,
2368 can_events => 0, 2503 can_events => 0,
2369 ) 2504 )
2370} 2505}
2371 2506
2372sub set_markup { 2507sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2508 my ($self, $widget) = @_;
2374 2509
2375 $self->{label} = new CFClient::UI::Label 2510 $self->add (new CFClient::UI::Label
2511 markup => $widget->{tooltip},
2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2513 fontsize => 0.8,
2377 fg => [0, 0, 0], 2514 fg => [0, 0, 0, 1],
2515 ellipsise => 0,
2378 font => ($font || $::FONT_PROP); 2516 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2517 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2518}
2384 2519
2385sub size_request { 2520sub size_request {
2386 my ($self) = @_; 2521 my ($self) = @_;
2387 2522
… …
2397} 2532}
2398 2533
2399sub _draw { 2534sub _draw {
2400 my ($self) = @_; 2535 my ($self) = @_;
2401 2536
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2537 glTranslate 0.375, 0.375;
2404 2538
2405 my ($w, $h) = @$self{qw(w h)}; 2539 my ($w, $h) = @$self{qw(w h)};
2406 2540
2407 glColor 1, 0.8, 0.4; 2541 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2552 glVertex 0 , $h;
2419 glVertex $w, $h; 2553 glVertex $w, $h;
2420 glVertex $w, 0; 2554 glVertex $w, 0;
2421 glEnd; 2555 glEnd;
2422 2556
2423 glPopMatrix; 2557 glTranslate 2 - 0.375, 2 - 0.375;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2558 $self->SUPER::_draw;
2427} 2559}
2428 2560
2429############################################################################# 2561#############################################################################
2430 2562
… …
2435use CFClient::OpenGL; 2567use CFClient::OpenGL;
2436 2568
2437sub new { 2569sub new {
2438 my $class = shift; 2570 my $class = shift;
2439 2571
2440 $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2441 aspect => 1, 2573 aspect => 1,
2442 @_, 2574 @_,
2443 ) 2575 );
2576
2577 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self);
2579
2580 $self->{timer} = Event->timer (
2581 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2582 hard => 1,
2583 interval => $self->{animspeed},
2584 cb => sub {
2585 ++$widget->{frame};
2586 $widget->update;
2587 },
2588 );
2589 }
2590
2591 $self
2444} 2592}
2445 2593
2446sub size_request { 2594sub size_request {
2447 (32, 8) 2595 (32, 8)
2448} 2596}
2449 2597
2598sub update {
2599 my ($self) = @_;
2600
2601 return unless $self->{visible};
2602
2603 $self->SUPER::update;
2604}
2605
2450sub _draw { 2606sub _draw {
2451 my ($self) = @_; 2607 my ($self) = @_;
2452 2608
2453 return unless $::CONN;#d# manage and cache textures differently 2609 return unless $::CONN;#d# manage and cache textures differently
2610
2611 my $face;
2612
2613 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}];
2615
2616 $face = $anim->[ $self->{frame} % @$anim ]
2617 if $anim && @$anim;
2618 }
2619
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2455 2621
2456 # TODO animation
2457 if ($tex) { 2622 if ($tex) {
2458 glEnable GL_TEXTURE_2D; 2623 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1; 2625 glColor 1, 1, 1, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2463 } 2628 }
2464} 2629}
2465 2630
2631sub DESTROY {
2632 my ($self) = @_;
2633
2634 $self->{timer}->cancel
2635 if $self->{timer};
2636
2637 $self->SUPER::DESTROY;
2638}
2639
2466############################################################################# 2640#############################################################################
2467 2641
2468package CFClient::UI::InventoryItem; 2642package CFClient::UI::InventoryItem;
2469 2643
2470our @ISA = CFClient::UI::HBox::; 2644our @ISA = CFClient::UI::HBox::;
2645
2646sub _item_to_desc {
2647 my ($item) = @_;
2648
2649 my $desc =
2650 $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} × $item->{name_pl}";
2653
2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2655 and $desc .= " (open)";
2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2657 and $desc .= " (applied)";
2658 $item->{flags} & Crossfire::Protocol::F_UNPAID
2659 and $desc .= " (unpaid)";
2660 $item->{flags} & Crossfire::Protocol::F_MAGIC
2661 and $desc .= " (magic)";
2662 $item->{flags} & Crossfire::Protocol::F_CURSED
2663 and $desc .= " (cursed)";
2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2665 and $desc .= " (damned)";
2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2667 and $desc .= " *";
2668
2669 $desc
2670}
2471 2671
2472sub new { 2672sub new {
2473 my $class = shift; 2673 my $class = shift;
2474 2674
2475 my %args = @_; 2675 my %args = @_;
2476 2676
2477 my $item = delete $args{item}; 2677 my $item = delete $args{item};
2478 2678
2479 my $desc = $item->{nrof} < 2 2679 my $desc = _item_to_desc ($item);
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483 2680
2484 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2485 can_hover => 1, 2682 can_hover => 1,
2486 can_events => 1, 2683 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc) 2684 tooltip => ((CFClient::UI::Label::escape $desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub { 2686 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_; 2687 my ($self, $ev, $x, $y) = @_;
2491 2688
2492 # todo: maybe put examine on 1? but should just be a tooltip :( 2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2691 my $targ = $::CONN->{player}{tag};
2692
2693 if ($item->{container} == $::CONN->{player}{tag}) {
2694 $targ = $main::OPENCONT;
2695 }
2696
2697 $::CONN->send ("move $targ $item->{tag} 0");
2493 if ($ev->{button} == 1) { 2698 } elsif ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2699 $::CONN->send ("examine $item->{tag}");
2495 } elsif ($ev->{button} == 2) { 2700 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}"); 2701 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) { 2702 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new ( 2703 my @menu_items = (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2704 ["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}") }], 2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2706 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2707 (
2708 $item->{flags} & Crossfire::Protocol::F_LOCKED
2709 ? (
2710 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2711 )
2712 : (
2713 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2508 ], 2716 ),
2509 )->popup ($ev); 2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2510 } 2720 }
2511 2721
2512 1 2722 1
2513 }, 2723 },
2514 %args 2724 %args
2515 ); 2725 );
2726
2516 2727
2517 $self->add (new CFClient::UI::Face 2728 $self->add (new CFClient::UI::Face
2518 can_events => 0, 2729 can_events => 0,
2519 face => $item->{face}, 2730 face => $item->{face},
2520 anim => $item->{anim}, 2731 anim => $item->{anim},
2521 animspeed => $item->{animspeed}, 2732 animspeed => $item->{animspeed},
2522 ); 2733 );
2523 2734
2524 $self->add (new CFClient::UI::Label 2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2525 can_events => 0, 2736
2526 text => $desc, 2737 $self->{item} = $item;
2527 ); 2738
2739 $self->update_item;
2528 2740
2529 $self 2741 $self
2742}
2743
2744sub update_item {
2745 my ($self) = @_;
2746
2747 my $desc = _item_to_desc ($self->{item});
2748
2749 $self->{name_lbl}->set_text ($desc);
2530} 2750}
2531 2751
2532############################################################################# 2752#############################################################################
2533 2753
2534package CFClient::UI::Inventory; 2754package CFClient::UI::Inventory;
… …
2537 2757
2538sub new { 2758sub new {
2539 my $class = shift; 2759 my $class = shift;
2540 2760
2541 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox), 2762 scrolled => (new CFClient::UI::Table),
2543 @_, 2763 @_,
2544 ); 2764 );
2545 2765
2546 $self 2766 $self
2547} 2767}
… …
2550 my ($self, $items) = @_; 2770 my ($self, $items) = @_;
2551 2771
2552 $self->{scrolled}->clear; 2772 $self->{scrolled}->clear;
2553 return unless $items; 2773 return unless $items;
2554 2774
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2556 2779
2557 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2558 2781
2559 for my $item (@items) { 2782 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2 2783 $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); 2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2786 }
2787
2788 my $i = 0;
2789 for (@items) {
2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2565 } 2793 }
2566 2794
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2568} 2796}
2569 2797
… …
2648 2876
2649package CFClient::UI::Statusbox; 2877package CFClient::UI::Statusbox;
2650 2878
2651our @ISA = CFClient::UI::VBox::; 2879our @ISA = CFClient::UI::VBox::;
2652 2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2653sub reorder { 2890sub reorder {
2654 my ($self) = @_; 2891 my ($self) = @_;
2655 my $NOW = time; 2892 my $NOW = time;
2656 2893
2657 while (my ($k, $v) = each %{ $self->{item} }) { 2894 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2895 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 2896 }
2660 2897
2661 my @widgets; 2898 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2899
2900 my @items = sort {
2901 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} };
2904
2663 my $count = 10 + 1; 2905 my $count = 10 + 1;
2664 for my $item (@items) { 2906 for my $item (@items) {
2665 last unless --$count; 2907 last unless --$count;
2666 2908
2667 push @widgets, $item->{label} ||= do { 2909 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 2910 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 2911 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text};
2914
2670 for ($short) { 2915 for ($short) {
2671 s/^\s+//; 2916 s/^\s+//;
2672 s/\012.*//s; 2917 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 } 2918 }
2676 2919
2677 new CFClient::UI::Label 2920 new CFClient::UI::Label
2678 markup => $short, 2921 markup => $short,
2679 tooltip => delete $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2680 fontsize => delete $item->{fontsize}, 2923 tooltip_font => $::FONT_PROP,
2681 color => delete $item->{color}, 2924 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg},
2682 can_events => 1, 2928 can_events => 1,
2683 can_hover => 1, 2929 can_hover => 1
2684 }; 2930 };
2685 } 2931 }
2686 2932
2687 $self->clear; 2933 $self->clear;
2688 $self->SUPER::add (@widgets); 2934 $self->SUPER::add (reverse @widgets);
2689} 2935}
2690 2936
2691sub add { 2937sub add {
2692 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2693 2939
2694 my $item = { 2940 $text =~ s/^\s+//;
2695 time => time, 2941 $text =~ s/\s+$//;
2942
2943 my $timeout = time + ((delete $arg{timeout}) || 60);
2944
2945 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2946
2947 if (my $item = $self->{item}{$group}) {
2948 if ($item->{text} eq $text) {
2949 $item->{count}++;
2950 } else {
2951 $item->{count} = 1;
2952 $item->{text} = $item->{tooltip} = $text;
2953 }
2954 $item->{id} = ++$self->{id};
2955 $item->{timeout} = $timeout;
2956 delete $item->{label};
2957 } else {
2958 $self->{item}{$group} = {
2959 id => ++$self->{id},
2696 text => $text, 2960 text => $text,
2697 timeout => 60, 2961 timeout => $timeout,
2698 tooltip => $text, 2962 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 2963 fg => [0.8, 0.8, 0.8, 0.8],
2964 pri => 0,
2965 count => 1,
2701 %arg, 2966 %arg,
2967 };
2702 }; 2968 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 2969
2709 $self->reorder; 2970 $self->reorder;
2971}
2972
2973sub reconfigure {
2974 my ($self) = @_;
2975
2976 delete $_->{label}
2977 for values %{ $self->{item} || {} };
2978
2979 $self->reorder;
2980 $self->SUPER::reconfigure;
2710} 2981}
2711 2982
2712############################################################################# 2983#############################################################################
2713 2984
2714package CFClient::UI::Root; 2985package CFClient::UI::Root;
… …
2746} 3017}
2747 3018
2748sub size_allocate { 3019sub size_allocate {
2749 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h) = @_;
2750 3021
2751 my $old_w = $self->{old_w}; 3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2752 my $old_h = $self->{old_h}; 3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2753 3024
2754 if ($old_w && $old_h) { 3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2755 for my $child ($self->children) { 3026 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 3027
2767 for my $child ($self->children) { 3028 for my $child ($self->children) {
2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769 3030
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x};
3033
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3037 $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; 3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
2772 $child->configure ($X, $Y, $W, $H); 3040 $child->configure ($X, $Y, $W, $H);
2773 } 3041 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777} 3042}
2778 3043
2779sub coord2local { 3044sub coord2local {
2780 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2781 3046
… …
2794 $self->check_size; 3059 $self->check_size;
2795 $::WANT_REFRESH++; 3060 $::WANT_REFRESH++;
2796} 3061}
2797 3062
2798sub add { 3063sub add {
2799 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2800 3065
3066 for my $child (@children) {
3067 $child->{toplevel} = 1;
3068
2801 # integerise window positions 3069 # integerise window positions
2802 $child->{x} = int $child->{x}; 3070 $child->{x} = int $child->{x};
2803 $child->{y} = int $child->{y}; 3071 $child->{y} = int $child->{y};
3072 }
2804 3073
2805 $self->SUPER::add ($child); 3074 $self->SUPER::add (@children);
3075
3076 while (@children) {
3077 my $w = pop @children;
3078 push @children, $w->children;
3079 $w->{visible} = 1;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 }
2806} 3093}
2807 3094
2808sub on_refresh { 3095sub on_refresh {
2809 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2810 3097
2811 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2812} 3099}
2813 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2814sub draw { 3107sub draw {
2815 my ($self) = @_; 3108 my ($self) = @_;
3109
3110 while ($self->{refresh_hook}) {
3111 $_->()
3112 for values %{delete $self->{refresh_hook}};
3113 }
2816 3114
2817 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
2818 my @queue = ([], []); 3116 my @queue = ([], []);
2819 3117
2820 for (;;) { 3118 for (;;) {
… …
2828 3126
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3127 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2830 ? @$widget{qw(user_w user_h)} 3128 ? @$widget{qw(user_w user_h)}
2831 : $widget->size_request; 3129 : $widget->size_request;
2832 3130
3131 if (delete $widget->{force_alloc}
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3132 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3133 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835 3134
2836 $widget->{req_w} = $w; 3135 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h; 3136 $widget->{req_h} = $h;
2838 3137
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3138 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2840 3139
2841 $widget->{parent}->check_size 3140 $widget->{parent}->check_size
2842 if $widget->{parent}; 3141 if $widget->{parent};
2843 } 3142 }
2844 } 3143 }
… …
2856 $widget->size_allocate ($w, $h); 3155 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h); 3156 $widget->emit (size_allocate => $w, $h);
2858 } 3157 }
2859 } 3158 }
2860 3159
2861 while ($self->{refresh_hook}) { 3160 while ($self->{post_alloc_hook}) {
2862 $_->() 3161 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3162 for values %{delete $self->{post_alloc_hook}};
2864 } 3163 }
2865 3164
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3165 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 3167 glClear GL_COLOR_BUFFER_BIT;
2869 3168
2870 glMatrixMode GL_PROJECTION; 3169 glMatrixMode GL_PROJECTION;
2871 glLoadIdentity; 3170 glLoadIdentity;
2872 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2873 glMatrixMode GL_MODELVIEW; 3172 glMatrixMode GL_MODELVIEW;
2874 glLoadIdentity; 3173 glLoadIdentity;
2875 3174
2876 $self->_draw; 3175 $self->_draw;
2877} 3176}
… …
2879############################################################################# 3178#############################################################################
2880 3179
2881package CFClient::UI; 3180package CFClient::UI;
2882 3181
2883$ROOT = new CFClient::UI::Root; 3182$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip; 3183$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885 3184
28861 31851
2887 3186

Diff Legend

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