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

Diff Legend

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