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.196 by root, Fri May 12 00:16:34 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}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $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;
135 } 169 }
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
… …
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
… …
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $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 );
179} 227}
180 228
181sub hide { 229sub hide {
182 my ($self) = @_; 230 my ($self) = @_;
183 231
… …
240 288
241sub size_allocate { 289sub size_allocate {
242 # nothing to be done 290 # nothing to be done
243} 291}
244 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
245sub children { 300sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 301}
259 302
260sub set_max_size { 303sub set_max_size {
261 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
262 305
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 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 }
265} 319}
266 320
267# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
268sub coord2local { 322sub coord2local {
269 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
… …
355 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
358 glEnd; 412 glEnd;
359 glPopMatrix; 413 glPopMatrix;
360 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;
361 } 415 }
362} 416}
363 417
364sub _draw { 418sub _draw {
365 my ($self) = @_; 419 my ($self) = @_;
… …
382sub set_parent { 436sub set_parent {
383 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
384 438
385 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
386 440
441 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 442 $self->check_size
388 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
389} 446}
390 447
391sub check_size { 448sub check_size {
392 my ($self) = @_; 449 my ($self, $forced) = @_;
393 450
451 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 453}
396 454
397sub update { 455sub update {
398 my ($self) = @_; 456 my ($self) = @_;
… …
414} 472}
415 473
416sub DESTROY { 474sub DESTROY {
417 my ($self) = @_; 475 my ($self) = @_;
418 476
477 delete $WIDGET{$self+0};
419 #$self->deactivate; 478 #$self->deactivate;
420} 479}
421 480
422############################################################################# 481#############################################################################
423 482
… …
432 my $class = shift; 491 my $class = shift;
433 492
434 # range [value, low, high, page] 493 # range [value, low, high, page]
435 494
436 $class->SUPER::new ( 495 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
439 @_ 498 @_
440 ) 499 )
441} 500}
442 501
443sub _draw { 502sub _draw {
444 my ($self) = @_; 503 my ($self) = @_;
445 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
447 511
448 glEnable GL_BLEND; 512 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
451 515
452 glBegin GL_QUADS; 516 glBegin GL_QUADS;
453 glVertex 0 , 0; 517 glVertex 0 , 0;
454 glVertex 0 , $h; 518 glVertex 0 , $h;
455 glVertex $w, $h; 519 glVertex $w, $h;
456 glVertex $w, 0; 520 glVertex $w, 0;
457 glEnd; 521 glEnd;
458 522
459 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
460} 525}
461 526
462############################################################################# 527#############################################################################
463 528
464package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
508 $self->{children} = [ 573 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 575 @{$self->{children}}, @widgets
511 ]; 576 ];
512 577
513 $self->check_size; 578 $self->check_size (1);
514 $self->update; 579 $self->update;
515} 580}
516 581
517sub children { 582sub children {
518 @{ $_[0]{children} } 583 @{ $_[0]{children} }
… …
625} 690}
626 691
627sub update { 692sub update {
628 my ($self) = @_; 693 my ($self) = @_;
629 694
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 696 $self->SUPER::update;
632} 697}
633 698
634sub size_allocate { 699sub size_allocate {
635 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
… …
648 $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 {
649 glClearColor 0, 0, 0, 0; 714 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 715 glClear GL_COLOR_BUFFER_BIT;
651 716
652 $self->_render; 717 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 718 };
661} 719}
662 720
663sub _draw { 721sub _draw {
664 my ($self) = @_; 722 my ($self) = @_;
… …
668 my $tex = $self->{texture} 726 my $tex = $self->{texture}
669 or return; 727 or return;
670 728
671 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673 glColor 0, 0, 0, 1; 731 glColor 1, 1, 1, 1;
674 732
675 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
676 734
677 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
678} 736}
… …
685 743
686sub size_request { 744sub size_request {
687 my ($self) = @_; 745 my ($self) = @_;
688 746
689 @$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)};
690 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
691 748
692 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
693} 750}
694 751
695sub size_allocate { 752sub size_allocate {
696 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
697 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
698 $self->update; 758 $self->update;
699} 759}
700 760
701sub set_offset { 761sub set_offset {
702 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
761 $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}));
762 }, 822 },
763 ; 823 ;
764 824
765 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
766 vp => (new CFClient::UI::ViewPort), 826 vp => (new CFClient::UI::ViewPort expand => 1),
767 slider => $slider, 827 slider => $slider,
768 @_, 828 @_,
769 ); 829 );
770 830
771 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
… …
773 $self->add ($self->{slider}); 833 $self->add ($self->{slider});
774 834
775 $self 835 $self
776} 836}
777 837
778#TODO# update range on size_allocate depeneing on child 838#TODO# update range on size_allocate depending on child
779# update viewport offset on scroll 839# update viewport offset on scroll
780 840
781############################################################################# 841#############################################################################
782 842
783package CFClient::UI::Frame; 843package CFClient::UI::Frame;
… …
787use CFClient::OpenGL; 847use CFClient::OpenGL;
788 848
789sub new { 849sub new {
790 my $class = shift; 850 my $class = shift;
791 851
792 my $self = $class->SUPER::new ( 852 $class->SUPER::new (
793 bg => [1, 1, 1, 1], 853 bg => undef,
794 border_bg => [1, 1, 1, 1],
795 border => 0.8,
796 @_ 854 @_,
797 ); 855 )
798
799 $self
800} 856}
801 857
802sub _draw { 858sub _draw {
803 my ($self) = @_; 859 my ($self) = @_;
804 860
805 my ($w, $h) = ($self->{w}, $self->{h}); 861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
806 863
807 glEnable GL_BLEND; 864 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 866 glColor @{ $self->{bg} };
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811 867
812# glBegin GL_QUADS; 868 glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0; 869 glVertex 0 , 0;
815# glVertex 0 , $h; 870 glVertex 0 , $h;
816# glVertex $w, $h; 871 glVertex $w, $h;
817# glVertex $w, 0; 872 glVertex $w, 0;
818# glEnd; 873 glEnd;
819 874
820
821 $self->child->draw;
822 glDisable GL_BLEND; 875 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D; 876 }
877
878 $self->SUPER::_draw;
824} 879}
825 880
826############################################################################# 881#############################################################################
827 882
828package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
… …
842 897
843 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
846 border => 0.6, 901 border => 0.6,
902 toplevel => 1,
847 can_events => 1, 903 can_events => 1,
848 @_ 904 @_
849 ); 905 );
850 906
851 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
… …
876 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
877 933
878 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
879 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
880 936
881 $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)
882 if $self->{title}; 938 if $self->{title};
883 939
884 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
885} 941}
886 942
… …
944 my ($self) = @_; 1000 my ($self) = @_;
945 1001
946 my ($w, $h ) = ($self->{w}, $self->{h}); 1002 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
948 1004
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 1005 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 1007
954 my $border = $self->border; 1008 my $border = $self->border;
955 1009
956 glColor @{ $self->{border_bg} }; 1010 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
961 1015
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 1017 my $bg = $tex[0];
964 1018
965 # TODO: repeat texture not scale 1019 # TODO: repeat texture not scale
… …
969 glColor @{ $self->{bg} }; 1023 glColor @{ $self->{bg} };
970 1024
971 $bg->{s} = $rep_x; 1025 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y; 1026 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1; 1027 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 }
975 1030
976 glDisable GL_TEXTURE_2D; 1031 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 1032
980 $self->{title}->draw if $self->{title}; 1033 $self->{title}->draw if $self->{title};
981 1034
982 $self->child->draw; 1035 $self->child->draw;
983} 1036}
… …
1250 1303
1251############################################################################# 1304#############################################################################
1252 1305
1253package CFClient::UI::Label; 1306package CFClient::UI::Label;
1254 1307
1255our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1256 1309
1257use CFClient::OpenGL; 1310use CFClient::OpenGL;
1258 1311
1259sub new { 1312sub new {
1260 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1261 1314
1262 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1263 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1264 #font => default_font 1319 #font => default_font
1265 #text => initial text 1320 #text => initial text
1266 #markup => initial narkup 1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1267 layout => (new CFClient::Layout), 1324 layout => (new CFClient::Layout),
1268 fontsize => 1, 1325 fontsize => 1,
1269 align => -1, 1326 align => -1,
1270 valign => -1, 1327 valign => -1,
1271 padding => 2, 1328 padding => 2,
… …
1286 } 1343 }
1287 1344
1288 $self 1345 $self
1289} 1346}
1290 1347
1291sub escape { 1348sub escape($) {
1292 local $_ = $_[1]; 1349 local $_ = $_[0];
1293 1350
1294 s/&/&amp;/g; 1351 s/&/&amp;/g;
1295 s/>/&gt;/g; 1352 s/>/&gt;/g;
1296 s/</&lt;/g; 1353 s/</&lt;/g;
1297 1354
1298 $_[1] 1355 $_
1299} 1356}
1300 1357
1301sub update { 1358sub update {
1302 my ($self) = @_; 1359 my ($self) = @_;
1303 1360
… …
1336sub size_request { 1393sub size_request {
1337 my ($self) = @_; 1394 my ($self) = @_;
1338 1395
1339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $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});
1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342 1401
1343 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1344 1403
1345 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1375} 1434}
1376 1435
1377sub _draw { 1436sub _draw {
1378 my ($self) = @_; 1437 my ($self) = @_;
1379 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1380 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}}); 1442 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1383 $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});
1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1448
1386 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1387 1450
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5; 1453 : ($self->{w} - $tex->{w}) * 0.5);
1391 1454
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394 : ($self->{h} - $tex->{h}) * 0.5; 1457 : ($self->{h} - $tex->{h}) * 0.5);
1395 1458
1396 $tex 1459 $tex
1397 }; 1460 };
1398 1461
1399 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
… …
1427 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1428 can_hover => 1, 1491 can_hover => 1,
1429 can_focus => 1, 1492 can_focus => 1,
1430 valign => 0, 1493 valign => 0,
1431 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1432 @_ 1496 @_
1433 ) 1497 )
1434} 1498}
1435 1499
1436sub _set_text { 1500sub _set_text {
… …
1454sub set_text { 1518sub set_text {
1455 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1456 1520
1457 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1458 $self->_set_text ($text); 1522 $self->_set_text ($text);
1523 $self->update;
1459 $self->check_size; 1524 $self->check_size;
1460 $self->update;
1461} 1525}
1462 1526
1463sub get_text { 1527sub get_text {
1464 $_[0]{text} 1528 $_[0]{text}
1465} 1529}
… …
1485 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1487 1551
1488 my $text = $self->get_text; 1552 my $text = $self->get_text;
1489 1553
1490 if ($sym == 8) { 1554 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1567 $self->emit ('escape');
1504 } elsif ($uni) { 1568 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1506 } 1570 }
1507 1571
1508 $self->_set_text ($text); 1572 $self->_set_text ($text);
1509 $self->update; 1573 $self->update;
1574 $self->check_size;
1510} 1575}
1511 1576
1512sub focus_in { 1577sub focus_in {
1513 my ($self) = @_; 1578 my ($self) = @_;
1514 1579
… …
1643 my $class = shift; 1708 my $class = shift;
1644 1709
1645 $class->SUPER::new ( 1710 $class->SUPER::new (
1646 padding => 4, 1711 padding => 4,
1647 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1648 bg => [1, 1, 1, 0.2],
1649 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1650 can_hover => 1, 1714 can_hover => 1,
1651 align => 0, 1715 align => 0,
1652 valign => 0, 1716 valign => 0,
1653 can_events => 1, 1717 can_events => 1,
… …
1701 1765
1702 $class->SUPER::new ( 1766 $class->SUPER::new (
1703 padding => 2, 1767 padding => 2,
1704 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1705 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],
1706 state => 0, 1772 state => 0,
1707 can_hover => 1, 1773 can_hover => 1,
1708 @_ 1774 @_
1709 ) 1775 )
1710} 1776}
… …
1734 1800
1735 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;
1736 1802
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 1804
1805 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806
1739 glEnable GL_TEXTURE_2D; 1807 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 1808 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 1809 glDisable GL_TEXTURE_2D;
1746} 1810}
1747 1811
1748############################################################################# 1812#############################################################################
1749 1813
… …
1996 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1997 2061
1998sub new { 2062sub new {
1999 my $class = shift; 2063 my $class = shift;
2000 2064
2001 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
2002 2066
2003 # TODO: 0-width page 2067 # TODO: 0-width page
2004 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
2005 # TODO: calculations are off 2069 # TODO: calculations are off
2006 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2007 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2008 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],
2009 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
2010 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2011 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2012 vertical => 0, 2078 vertical => 0,
2013 can_hover => 1, 2079 can_hover => 1,
2014 inner_pad => 5, 2080 inner_pad => 0.02,
2015 @_ 2081 @_
2016 ); 2082 );
2017 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
2018 $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 }
2019} 2119}
2020 2120
2021sub size_request { 2121sub size_request {
2022 my ($self) = @_; 2122 my ($self) = @_;
2023 2123
… …
2036 2136
2037sub mouse_motion { 2137sub mouse_motion {
2038 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
2039 2139
2040 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
2041 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2157 my ($value, $lo, $hi, $page) = @{$self->{range}};
2042 2158
2043 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2159 my $inner_w = 1 - 2 * $self->{inner_pad};
2044 2160
2045 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2046 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2047 2162
2048 $x -= $inner_pad_px; # substract the padding 2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2049 $x = $x * ($hi - $lo) / $inner_w + $lo; 2164 $value = $self->{scale} * ($value - $lo);
2050 $x = $lo if $x < $lo;
2051 $x = $hi - $page if $x > $hi - $page;
2052 $self->{range}[0] = $x;
2053 2165
2054 $self->emit (changed => $x); 2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2055 $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;
2056 } 2173 });
2057}
2058 2174
2059# the inner_* stuff is for generating a padding for the slider handle, 2175 $self->SUPER::update;
2060# so that the handle doesn't leave the texture. This calculation isn't 100%
2061# correct propably, but it does the job for now
2062sub _calc_inner_pad_px {
2063 my ($self, $w) = @_;
2064 ($w / 100) * $self->{inner_pad} # % to pixels
2065} 2176}
2066 2177
2067sub _draw { 2178sub _draw {
2068 my ($self) = @_; 2179 my ($self) = @_;
2069 2180
2070 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
2071 2182
2072 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
2073 2184
2074 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
2075 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
2076 2187
2188 glTranslate 1, 0, 0;
2077 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
2078 glTranslate 0, -$self->{w}, 0;
2079
2080 ($w, $h) = ($h, $w);
2081 } 2190 }
2082 2191
2083 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085 2194
2086 my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088 $hi = $value + 1 if $lo == $hi;
2089
2090 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093 $page = int $page * $inner_w / ($hi - $lo);
2094 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096 $w -= $page;
2097 $page &= ~1;
2098 glTranslate $page * 0.5, 0, 0;
2099 $page ||= 2;
2100
2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104 glEnable GL_TEXTURE_2D; 2195 glEnable GL_TEXTURE_2D;
2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106 2197
2107 # draw background 2198 # draw background
2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109 2200
2110 # draw handle 2201 # draw handle
2111 $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);
2112 2203
2113 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2114} 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 (@_) }
2115 2247
2116############################################################################# 2248#############################################################################
2117 2249
2118package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2119 2251
… …
2149 2281
2150 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2151 $self->reflow; 2283 $self->reflow;
2152} 2284}
2153 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
2154sub text_height { 2298sub text_height {
2155 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2156 2300
2157 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2158 2302
2159 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2160 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2161 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2162 2306
2163 ($layout->size)[1] 2307 ($layout->size)[1]
2164} 2308}
2165 2309
… …
2168 2312
2169 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2170 $self->update; 2314 $self->update;
2171} 2315}
2172 2316
2173sub size_allocate {
2174 my ($self, $w, $h) = @_;
2175
2176 $self->SUPER::size_allocate ($w, $h);
2177
2178 $self->{layout}->set_font ($self->{font}) if $self->{font};
2179 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2180 $self->{layout}->set_width ($self->{children}[0]{w});
2181
2182 $self->reflow;
2183}
2184
2185sub add_paragraph { 2317sub add_paragraph {
2186 my ($self, $color, $text) = @_; 2318 my ($self, $color, $text, $indent) = @_;
2187 2319
2188 #TODO: intelligently "reformat" paragraph 2320 #TODO: intelligently "reformat" paragraph
2189 2321
2322 for my $line (split /\n/, $text) {
2190 my $height = $self->text_height ($text); 2323 my $height = $self->text_height ($line);
2191
2192 $self->{height} += $height; 2324 $self->{height} += $height;
2193
2194 push @{$self->{par}}, [$height, $color, $text]; 2325 push @{$self->{par}}, [$height, $color, $indent, $line];
2326 }
2195 2327
2196 $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}];
2197 $self->{children}[1]->update; 2329 $self->{children}[1]->update;
2198} 2330}
2199 2331
… …
2204 2336
2205 return unless $self->{h} > 0; 2337 return unless $self->{h} > 0;
2206 2338
2207 delete $self->{texture}; 2339 delete $self->{texture};
2208 2340
2209 $ROOT->on_refresh ($self, sub { 2341 $ROOT->on_post_alloc ($self, sub {
2210 if (delete $self->{need_reflow}) { 2342 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2343 my $height = 0;
2212 2344
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2214 for @{$self->{par}}; 2346 for @{$self->{par}};
2215 2347
2216 $self->{height} = $height; 2348 $self->{height} = $height;
2217 2349
2218 $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;
2219 2352
2220 delete $self->{texture}; 2353 delete $self->{texture};
2221 } 2354 }
2222 2355
2223 $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 {
2224 glClearColor 0, 0, 0, 0; 2357 glClearColor 0.5, 0.5, 0.5, 0;
2225 glClear GL_COLOR_BUFFER_BIT; 2358 glClear GL_COLOR_BUFFER_BIT;
2226
2227 glEnable GL_TEXTURE_2D;
2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229 2359
2230 my $top = int $self->{children}[1]{range}[0]; 2360 my $top = int $self->{children}[1]{range}[0];
2231 2361
2232 my $y0 = $top; 2362 my $y0 = $top;
2233 my $y1 = $top + $self->{h}; 2363 my $y1 = $top + $self->{h};
… …
2236 2366
2237 my $layout = $self->{layout}; 2367 my $layout = $self->{layout};
2238 2368
2239 $layout->set_font ($self->{font}) if $self->{font}; 2369 $layout->set_font ($self->{font}) if $self->{font};
2240 2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2241 for my $par (@{$self->{par}}) { 2374 for my $par (@{$self->{par}}) {
2242 my $h = $par->[0]; 2375 my $h = $par->[0];
2243 2376
2244 if ($y0 < $y + $h && $y < $y1) { 2377 if ($y0 < $y + $h && $y < $y1) {
2245 $layout->set_foreground (@{ $par->[1] }); 2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2246 $layout->set_markup ($par->[2]); 2380 $layout->set_markup ($par->[3]);
2247 2381
2248 my ($W, $H) = $layout->size; 2382 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2249 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;
2250 } 2386 }
2251 2387
2252 $y += $h; 2388 $y += $h;
2253 } 2389 }
2254 2390
2255 glDisable GL_TEXTURE_2D; 2391 glDisable GL_BLEND;
2256 }; 2392 };
2257 }); 2393 });
2258} 2394}
2259 2395
2260sub _draw { 2396sub _draw {
2261 my ($self) = @_; 2397 my ($self) = @_;
2262 2398
2263 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2265 glColor 1, 1, 1, 1; 2401 glColor 1, 1, 1, 1;
2266 $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});
2267 glDisable GL_TEXTURE_2D; 2403 glDisable GL_TEXTURE_2D;
2268 2404
2269 $self->{children}[1]->draw; 2405 $self->{children}[1]->draw;
2270 2406
2271} 2407}
… …
2369} 2505}
2370 2506
2371sub set_tooltip_from { 2507sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2508 my ($self, $widget) = @_;
2373 2509
2374 $self->{label} = new CFClient::UI::Label 2510 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2511 markup => $widget->{tooltip},
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2513 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2514 fg => [0, 0, 0, 1],
2515 ellipsise => 0,
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2516 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2517 );
2381 $self->add ($self->{label});
2382} 2518}
2383 2519
2384sub size_request { 2520sub size_request {
2385 my ($self) = @_; 2521 my ($self) = @_;
2386 2522
… …
2396} 2532}
2397 2533
2398sub _draw { 2534sub _draw {
2399 my ($self) = @_; 2535 my ($self) = @_;
2400 2536
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2537 glTranslate 0.375, 0.375;
2403 2538
2404 my ($w, $h) = @$self{qw(w h)}; 2539 my ($w, $h) = @$self{qw(w h)};
2405 2540
2406 glColor 1, 0.8, 0.4; 2541 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2552 glVertex 0 , $h;
2418 glVertex $w, $h; 2553 glVertex $w, $h;
2419 glVertex $w, 0; 2554 glVertex $w, 0;
2420 glEnd; 2555 glEnd;
2421 2556
2422 glPopMatrix; 2557 glTranslate 2 - 0.375, 2 - 0.375;
2423
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2558 $self->SUPER::_draw;
2426} 2559}
2427 2560
2428############################################################################# 2561#############################################################################
2429 2562
… …
2434use CFClient::OpenGL; 2567use CFClient::OpenGL;
2435 2568
2436sub new { 2569sub new {
2437 my $class = shift; 2570 my $class = shift;
2438 2571
2439 $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2440 aspect => 1, 2573 aspect => 1,
2441 @_, 2574 @_,
2442 ) 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
2443} 2592}
2444 2593
2445sub size_request { 2594sub size_request {
2446 (32, 8) 2595 (32, 8)
2447} 2596}
2448 2597
2598sub update {
2599 my ($self) = @_;
2600
2601 return unless $self->{visible};
2602
2603 $self->SUPER::update;
2604}
2605
2449sub _draw { 2606sub _draw {
2450 my ($self) = @_; 2607 my ($self) = @_;
2451 2608
2452 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
2453 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2454 2621
2455 # TODO animation
2456 if ($tex) { 2622 if ($tex) {
2457 glEnable GL_TEXTURE_2D; 2623 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2625 glColor 1, 1, 1, 1;
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2462 } 2628 }
2463} 2629}
2464 2630
2631sub DESTROY {
2632 my ($self) = @_;
2633
2634 $self->{timer}->cancel
2635 if $self->{timer};
2636
2637 $self->SUPER::DESTROY;
2638}
2639
2465############################################################################# 2640#############################################################################
2466 2641
2467package CFClient::UI::InventoryItem; 2642package CFClient::UI::InventoryItem;
2468 2643
2469our @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}
2470 2671
2471sub new { 2672sub new {
2472 my $class = shift; 2673 my $class = shift;
2473 2674
2474 my %args = @_; 2675 my %args = @_;
2475 2676
2476 my $item = delete $args{item}; 2677 my $item = delete $args{item};
2477 2678
2478 my $desc = $item->{nrof} < 2 2679 my $desc = _item_to_desc ($item);
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482 2680
2483 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2484 can_hover => 1, 2682 can_hover => 1,
2485 can_events => 1, 2683 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc) 2684 tooltip => ((CFClient::UI::Label::escape $desc)
2487 . "\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>"),
2488 connect_button_down => sub { 2686 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_; 2687 my ($self, $ev, $x, $y) = @_;
2490 2688
2491 # 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");
2492 if ($ev->{button} == 1) { 2698 } elsif ($ev->{button} == 1) {
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2699 $::CONN->send ("examine $item->{tag}");
2494 } elsif ($ev->{button} == 2) { 2700 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}"); 2701 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) { 2702 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new ( 2703 my @menu_items = (
2498 items => [
2499 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2505 ["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}) }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2507 ], 2716 ),
2508 )->popup ($ev); 2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2509 } 2720 }
2510 2721
2511 1 2722 1
2512 }, 2723 },
2513 %args 2724 %args
2514 ); 2725 );
2726
2515 2727
2516 $self->add (new CFClient::UI::Face 2728 $self->add (new CFClient::UI::Face
2517 can_events => 0, 2729 can_events => 0,
2518 face => $item->{face}, 2730 face => $item->{face},
2519 anim => $item->{anim}, 2731 anim => $item->{anim},
2520 animspeed => $item->{animspeed}, 2732 animspeed => $item->{animspeed},
2521 ); 2733 );
2522 2734
2523 $self->add (new CFClient::UI::Label 2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2524 can_events => 0, 2736
2525 text => $desc, 2737 $self->{item} = $item;
2526 ); 2738
2739 $self->update_item;
2527 2740
2528 $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);
2529} 2750}
2530 2751
2531############################################################################# 2752#############################################################################
2532 2753
2533package CFClient::UI::Inventory; 2754package CFClient::UI::Inventory;
… …
2536 2757
2537sub new { 2758sub new {
2538 my $class = shift; 2759 my $class = shift;
2539 2760
2540 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2541 scrolled => (new CFClient::UI::VBox), 2762 scrolled => (new CFClient::UI::Table),
2542 @_, 2763 @_,
2543 ); 2764 );
2544 2765
2545 $self 2766 $self
2546} 2767}
… …
2549 my ($self, $items) = @_; 2770 my ($self, $items) = @_;
2550 2771
2551 $self->{scrolled}->clear; 2772 $self->{scrolled}->clear;
2552 return unless $items; 2773 return unless $items;
2553 2774
2554 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;
2555 2779
2556 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2557 2781
2558 for my $item (@items) { 2782 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2 2783 $item->{item} = $item;
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $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);
2564 } 2793 }
2565 2794
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567} 2796}
2568 2797
… …
2647 2876
2648package CFClient::UI::Statusbox; 2877package CFClient::UI::Statusbox;
2649 2878
2650our @ISA = CFClient::UI::VBox::; 2879our @ISA = CFClient::UI::VBox::;
2651 2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2652sub reorder { 2890sub reorder {
2653 my ($self) = @_; 2891 my ($self) = @_;
2654 my $NOW = time; 2892 my $NOW = time;
2655 2893
2656 while (my ($k, $v) = each %{ $self->{item} }) { 2894 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2895 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 2896 }
2659 2897
2660 my @widgets; 2898 my @widgets;
2661 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
2662 my $count = 10 + 1; 2905 my $count = 10 + 1;
2663 for my $item (@items) { 2906 for my $item (@items) {
2664 last unless --$count; 2907 last unless --$count;
2665 2908
2666 push @widgets, $item->{label} ||= do { 2909 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 2910 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 2911 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text};
2914
2669 for ($short) { 2915 for ($short) {
2670 s/^\s+//; 2916 s/^\s+//;
2671 s/\012.*//s; 2917 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 } 2918 }
2675 2919
2676 new CFClient::UI::Label 2920 new CFClient::UI::Label
2677 markup => $short, 2921 markup => $short,
2678 tooltip => delete $item->{tooltip}, 2922 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 2923 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 2924 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 2925 fontsize => $item->{fontsize} || $self->{fontsize},
2682 color => delete $item->{color}, 2926 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg},
2683 can_events => 1, 2928 can_events => 1,
2684 can_hover => 1, 2929 can_hover => 1
2685 }; 2930 };
2686 } 2931 }
2687 2932
2688 $self->clear; 2933 $self->clear;
2689 $self->SUPER::add (@widgets); 2934 $self->SUPER::add (reverse @widgets);
2690} 2935}
2691 2936
2692sub add { 2937sub add {
2693 my ($self, $text, %arg) = @_; 2938 my ($self, $text, %arg) = @_;
2694 2939
2695 my $item = { 2940 $text =~ s/^\s+//;
2696 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},
2697 text => $text, 2960 text => $text,
2698 timeout => 60, 2961 timeout => $timeout,
2699 tooltip => $text, 2962 tooltip => $text,
2700 fontsize => 0.8,
2701 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,
2702 %arg, 2966 %arg,
2967 };
2703 }; 2968 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 2969
2710 $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;
2711} 2981}
2712 2982
2713############################################################################# 2983#############################################################################
2714 2984
2715package CFClient::UI::Root; 2985package CFClient::UI::Root;
… …
2747} 3017}
2748 3018
2749sub size_allocate { 3019sub size_allocate {
2750 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h) = @_;
2751 3021
2752 my $old_w = $self->{old_w}; 3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2753 my $old_h = $self->{old_h}; 3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2754 3024
2755 if ($old_w && $old_h) { 3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2756 for my $child ($self->children) { 3026 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767 3027
2768 for my $child ($self->children) { 3028 for my $child ($self->children) {
2769 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)};
2770 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
2771 $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;
2772 $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
2773 $child->configure ($X, $Y, $W, $H); 3040 $child->configure ($X, $Y, $W, $H);
2774 } 3041 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 3042}
2779 3043
2780sub coord2local { 3044sub coord2local {
2781 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2782 3046
… …
2795 $self->check_size; 3059 $self->check_size;
2796 $::WANT_REFRESH++; 3060 $::WANT_REFRESH++;
2797} 3061}
2798 3062
2799sub add { 3063sub add {
2800 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2801 3065
3066 for my $child (@children) {
3067 $child->{toplevel} = 1;
3068
2802 # integerise window positions 3069 # integerise window positions
2803 $child->{x} = int $child->{x}; 3070 $child->{x} = int $child->{x};
2804 $child->{y} = int $child->{y}; 3071 $child->{y} = int $child->{y};
3072 }
2805 3073
2806 $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 }
2807} 3093}
2808 3094
2809sub on_refresh { 3095sub on_refresh {
2810 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2811 3097
2812 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2813} 3099}
2814 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2815sub draw { 3107sub draw {
2816 my ($self) = @_; 3108 my ($self) = @_;
3109
3110 while ($self->{refresh_hook}) {
3111 $_->()
3112 for values %{delete $self->{refresh_hook}};
3113 }
2817 3114
2818 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
2819 my @queue = ([], []); 3116 my @queue = ([], []);
2820 3117
2821 for (;;) { 3118 for (;;) {
… …
2829 3126
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3127 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)} 3128 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request; 3129 : $widget->size_request;
2833 3130
3131 if (delete $widget->{force_alloc}
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3132 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2835 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#
2836 3134
2837 $widget->{req_w} = $w; 3135 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h; 3136 $widget->{req_h} = $h;
2839 3137
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3138 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2841 3139
2842 $widget->{parent}->check_size 3140 $widget->{parent}->check_size
2843 if $widget->{parent}; 3141 if $widget->{parent};
2844 } 3142 }
2845 } 3143 }
… …
2857 $widget->size_allocate ($w, $h); 3155 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h); 3156 $widget->emit (size_allocate => $w, $h);
2859 } 3157 }
2860 } 3158 }
2861 3159
2862 while ($self->{refresh_hook}) { 3160 while ($self->{post_alloc_hook}) {
2863 $_->() 3161 $_->()
2864 for values %{delete $self->{refresh_hook}}; 3162 for values %{delete $self->{post_alloc_hook}};
2865 } 3163 }
2866 3164
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3165 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 3167 glClear GL_COLOR_BUFFER_BIT;
2870 3168
2871 glMatrixMode GL_PROJECTION; 3169 glMatrixMode GL_PROJECTION;
2872 glLoadIdentity; 3170 glLoadIdentity;
2873 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2874 glMatrixMode GL_MODELVIEW; 3172 glMatrixMode GL_MODELVIEW;
2875 glLoadIdentity; 3173 glLoadIdentity;
2876 3174
2877 $self->_draw; 3175 $self->_draw;
2878} 3176}
… …
2880############################################################################# 3178#############################################################################
2881 3179
2882package CFClient::UI; 3180package CFClient::UI;
2883 3181
2884$ROOT = new CFClient::UI::Root; 3182$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip; 3183$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886 3184
28871 31851
2888 3186

Diff Legend

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