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.222 by root, Mon May 22 03:59:51 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);
180} 214}
181 215
… …
241 275
242sub size_allocate { 276sub size_allocate {
243 # nothing to be done 277 # nothing to be done
244} 278}
245 279
280sub reconfigure {
281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
246sub children { 287sub 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} 288}
260 289
261sub set_max_size { 290sub set_max_size {
262 my ($self, $w, $h) = @_; 291 my ($self, $w, $h) = @_;
263 292
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 293 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 294 delete $self->{max_h}; $self->{max_h} = $h if $h;
295}
296
297sub set_tooltip {
298 my ($self, $tooltip) = @_;
299
300 $self->{tooltip} = $tooltip;
301
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner};
304 CFClient::UI::check_tooltip;
305 }
266} 306}
267 307
268# translate global coordinates to local coordinate system 308# translate global coordinates to local coordinate system
269sub coord2local { 309sub coord2local {
270 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
… …
356 glVertex $self->{w}, 0; 396 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 397 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 398 glVertex 0 , $self->{h};
359 glEnd; 399 glEnd;
360 glPopMatrix; 400 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 401 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 402 }
363} 403}
364 404
365sub _draw { 405sub _draw {
366 my ($self) = @_; 406 my ($self) = @_;
… …
383sub set_parent { 423sub set_parent {
384 my ($self, $parent) = @_; 424 my ($self, $parent) = @_;
385 425
386 Scalar::Util::weaken ($self->{parent} = $parent); 426 Scalar::Util::weaken ($self->{parent} = $parent);
387 427
428 # TODO: req_w _does_change after ->reconfigure
388 $self->check_size 429 $self->check_size
389 unless exists $self->{req_w}; 430 unless exists $self->{req_w};
431
432 $self->show;
390} 433}
391 434
392sub check_size { 435sub check_size {
393 my ($self) = @_; 436 my ($self, $forced) = @_;
394 437
438 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 440}
397 441
398sub update { 442sub update {
399 my ($self) = @_; 443 my ($self) = @_;
… …
415} 459}
416 460
417sub DESTROY { 461sub DESTROY {
418 my ($self) = @_; 462 my ($self) = @_;
419 463
464 delete $WIDGET{$self+0};
420 #$self->deactivate; 465 #$self->deactivate;
421} 466}
422 467
423############################################################################# 468#############################################################################
424 469
… …
433 my $class = shift; 478 my $class = shift;
434 479
435 # range [value, low, high, page] 480 # range [value, low, high, page]
436 481
437 $class->SUPER::new ( 482 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 483 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 484 #active_bg => [1, 1, 1, 0.5],
440 @_ 485 @_
441 ) 486 )
442} 487}
443 488
444sub _draw { 489sub _draw {
445 my ($self) = @_; 490 my ($self) = @_;
446 491
492 my $color = $FOCUS == $self && $self->{active_bg}
493 ? $self->{active_bg}
494 : $self->{bg};
495
496 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 497 my ($w, $h) = @$self{qw(w h)};
448 498
449 glEnable GL_BLEND; 499 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 501 glColor @$color;
452 502
453 glBegin GL_QUADS; 503 glBegin GL_QUADS;
454 glVertex 0 , 0; 504 glVertex 0 , 0;
455 glVertex 0 , $h; 505 glVertex 0 , $h;
456 glVertex $w, $h; 506 glVertex $w, $h;
457 glVertex $w, 0; 507 glVertex $w, 0;
458 glEnd; 508 glEnd;
459 509
460 glDisable GL_BLEND; 510 glDisable GL_BLEND;
511 }
461} 512}
462 513
463############################################################################# 514#############################################################################
464 515
465package CFClient::UI::Empty; 516package CFClient::UI::Empty;
… …
509 $self->{children} = [ 560 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 561 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 562 @{$self->{children}}, @widgets
512 ]; 563 ];
513 564
514 $self->check_size; 565 $self->check_size (1);
515 $self->update; 566 $self->update;
516} 567}
517 568
518sub children { 569sub children {
519 @{ $_[0]{children} } 570 @{ $_[0]{children} }
… …
626} 677}
627 678
628sub update { 679sub update {
629 my ($self) = @_; 680 my ($self) = @_;
630 681
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 682 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 683 $self->SUPER::update;
633} 684}
634 685
635sub size_allocate { 686sub size_allocate {
636 my ($self, $w, $h) = @_; 687 my ($self, $w, $h) = @_;
… …
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 700 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 701 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 702 glClear GL_COLOR_BUFFER_BIT;
652 703
653 $self->_render; 704 $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 }; 705 };
662} 706}
663 707
664sub _draw { 708sub _draw {
665 my ($self) = @_; 709 my ($self) = @_;
… …
669 my $tex = $self->{texture} 713 my $tex = $self->{texture}
670 or return; 714 or return;
671 715
672 glEnable GL_TEXTURE_2D; 716 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 718 glColor 1, 1, 1, 1;
675 719
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 720 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677 721
678 glDisable GL_TEXTURE_2D; 722 glDisable GL_TEXTURE_2D;
679} 723}
… …
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 }, 807 },
764 ; 808 ;
765 809
766 $self = $class->SUPER::new ( 810 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 811 vp => (new CFClient::UI::ViewPort expand => 1),
768 slider => $slider, 812 slider => $slider,
769 @_, 813 @_,
770 ); 814 );
771 815
772 $self->{vp}->add ($self->{scrolled}); 816 $self->{vp}->add ($self->{scrolled});
… …
774 $self->add ($self->{slider}); 818 $self->add ($self->{slider});
775 819
776 $self 820 $self
777} 821}
778 822
779#TODO# update range on size_allocate depeneing on child 823#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 824# update viewport offset on scroll
781 825
782############################################################################# 826#############################################################################
783 827
784package CFClient::UI::Frame; 828package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 832use CFClient::OpenGL;
789 833
790sub new { 834sub new {
791 my $class = shift; 835 my $class = shift;
792 836
793 my $self = $class->SUPER::new ( 837 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 838 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 839 @_,
798 ); 840 )
799
800 $self
801} 841}
802 842
803sub _draw { 843sub _draw {
804 my ($self) = @_; 844 my ($self) = @_;
805 845
806 my ($w, $h) = ($self->{w}, $self->{h}); 846 if ($self->{bg}) {
847 my ($w, $h) = @$self{qw(w h)};
807 848
808 glEnable GL_BLEND; 849 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 850 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 851 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 852
813# glBegin GL_QUADS; 853 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 854 glVertex 0 , 0;
816# glVertex 0 , $h; 855 glVertex 0 , $h;
817# glVertex $w, $h; 856 glVertex $w, $h;
818# glVertex $w, 0; 857 glVertex $w, 0;
819# glEnd; 858 glEnd;
820 859
821
822 $self->child->draw;
823 glDisable GL_BLEND; 860 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 861 }
862
863 $self->SUPER::_draw;
825} 864}
826 865
827############################################################################# 866#############################################################################
828 867
829package CFClient::UI::FancyFrame; 868package CFClient::UI::FancyFrame;
… …
843 882
844 my $self = $class->SUPER::new ( 883 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 884 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 885 border_bg => [1, 1, 1, 1],
847 border => 0.6, 886 border => 0.6,
887 toplevel => 1,
848 can_events => 1, 888 can_events => 1,
849 @_ 889 @_
850 ); 890 );
851 891
852 $self->{title} &&= new CFClient::UI::Label 892 $self->{title} &&= new CFClient::UI::Label
… …
877 my ($self, $w, $h) = @_; 917 my ($self, $w, $h) = @_;
878 918
879 $h -= List::Util::max 0, $self->border * 2; 919 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 920 $w -= List::Util::max 0, $self->border * 2;
881 921
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 923 if $self->{title};
884 924
885 $self->child->configure ($self->border, $self->border, $w, $h); 925 $self->child->configure ($self->border, $self->border, $w, $h);
886} 926}
887 927
… …
945 my ($self) = @_; 985 my ($self) = @_;
946 986
947 my ($w, $h ) = ($self->{w}, $self->{h}); 987 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 989
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 990 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 992
955 my $border = $self->border; 993 my $border = $self->border;
956 994
957 glColor @{ $self->{border_bg} }; 995 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 996 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1000
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1002 my $bg = $tex[0];
965 1003
966 # TODO: repeat texture not scale 1004 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 1008 glColor @{ $self->{bg} };
971 1009
972 $bg->{s} = $rep_x; 1010 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1011 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1012 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 }
976 1015
977 glDisable GL_TEXTURE_2D; 1016 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1017
981 $self->{title}->draw if $self->{title}; 1018 $self->{title}->draw if $self->{title};
982 1019
983 $self->child->draw; 1020 $self->child->draw;
984} 1021}
… …
1251 1288
1252############################################################################# 1289#############################################################################
1253 1290
1254package CFClient::UI::Label; 1291package CFClient::UI::Label;
1255 1292
1256our @ISA = CFClient::UI::Base::; 1293our @ISA = CFClient::UI::DrawBG::;
1257 1294
1258use CFClient::OpenGL; 1295use CFClient::OpenGL;
1259 1296
1260sub new { 1297sub new {
1261 my ($class, %arg) = @_; 1298 my ($class, %arg) = @_;
1262 1299
1263 my $self = $class->SUPER::new ( 1300 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1302 #bg => none
1303 #active_bg => none
1265 #font => default_font 1304 #font => default_font
1266 #text => initial text 1305 #text => initial text
1267 #markup => initial narkup 1306 #markup => initial narkup
1307 #max_w => maximum pixel width
1308 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1309 layout => (new CFClient::Layout),
1269 fontsize => 1, 1310 fontsize => 1,
1270 align => -1, 1311 align => -1,
1271 valign => -1, 1312 valign => -1,
1272 padding => 2, 1313 padding => 2,
… …
1287 } 1328 }
1288 1329
1289 $self 1330 $self
1290} 1331}
1291 1332
1292sub escape { 1333sub escape($) {
1293 local $_ = $_[1]; 1334 local $_ = $_[0];
1294 1335
1295 s/&/&amp;/g; 1336 s/&/&amp;/g;
1296 s/>/&gt;/g; 1337 s/>/&gt;/g;
1297 s/</&lt;/g; 1338 s/</&lt;/g;
1298 1339
1299 $_[1] 1340 $_
1300} 1341}
1301 1342
1302sub update { 1343sub update {
1303 my ($self) = @_; 1344 my ($self) = @_;
1304 1345
… …
1337sub size_request { 1378sub size_request {
1338 my ($self) = @_; 1379 my ($self) = @_;
1339 1380
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1381 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1382 $self->{layout}->set_width ($self->{max_w} || -1);
1383 $self->{layout}->set_ellipsise ($self->{ellipsise});
1384 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1386
1344 my ($w, $h) = $self->{layout}->size; 1387 my ($w, $h) = $self->{layout}->size;
1345 1388
1346 if (exists $self->{template}) { 1389 if (exists $self->{template}) {
… …
1376} 1419}
1377 1420
1378sub _draw { 1421sub _draw {
1379 my ($self) = @_; 1422 my ($self) = @_;
1380 1423
1424 $self->SUPER::_draw; # draw background, if applicable
1425
1381 my $tex = $self->{texture} ||= do { 1426 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1427 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1428 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1429 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1433
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1434 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1435
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1438 : ($self->{w} - $tex->{w}) * 0.5);
1392 1439
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1442 : ($self->{h} - $tex->{h}) * 0.5);
1396 1443
1397 $tex 1444 $tex
1398 }; 1445 };
1399 1446
1400 glEnable GL_TEXTURE_2D; 1447 glEnable GL_TEXTURE_2D;
… …
1455sub set_text { 1502sub set_text {
1456 my ($self, $text) = @_; 1503 my ($self, $text) = @_;
1457 1504
1458 $self->{cursor} = length $text; 1505 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1506 $self->_set_text ($text);
1507 $self->update;
1460 $self->check_size; 1508 $self->check_size;
1461 $self->update;
1462} 1509}
1463 1510
1464sub get_text { 1511sub get_text {
1465 $_[0]{text} 1512 $_[0]{text}
1466} 1513}
… …
1486 my $sym = $ev->{sym}; 1533 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1534 my $uni = $ev->{unicode};
1488 1535
1489 my $text = $self->get_text; 1536 my $text = $self->get_text;
1490 1537
1491 if ($sym == 8) { 1538 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1539 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1540 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1541 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1542 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1543 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1544 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1545 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1546 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1547 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1548 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1549 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1550 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1551 $self->emit ('escape');
1505 } elsif ($uni) { 1552 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1553 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1554 }
1508 1555
1509 $self->_set_text ($text); 1556 $self->_set_text ($text);
1510 $self->update; 1557 $self->update;
1558 $self->check_size;
1511} 1559}
1512 1560
1513sub focus_in { 1561sub focus_in {
1514 my ($self) = @_; 1562 my ($self) = @_;
1515 1563
… …
1644 my $class = shift; 1692 my $class = shift;
1645 1693
1646 $class->SUPER::new ( 1694 $class->SUPER::new (
1647 padding => 4, 1695 padding => 4,
1648 fg => [1, 1, 1], 1696 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1697 active_fg => [0, 0, 1],
1651 can_hover => 1, 1698 can_hover => 1,
1652 align => 0, 1699 align => 0,
1653 valign => 0, 1700 valign => 0,
1654 can_events => 1, 1701 can_events => 1,
… …
1672 1719
1673 if ($GRAB == $self) { 1720 if ($GRAB == $self) {
1674 $self->{fg} = $self->{active_fg}; 1721 $self->{fg} = $self->{active_fg};
1675 } 1722 }
1676 1723
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D; 1724 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1725 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681 glColor 0, 0, 0, 1; 1726 glColor 0, 0, 0, 1;
1682 1727
1683 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1728 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684 1729
1685 glDisable GL_TEXTURE_2D; 1730 glDisable GL_TEXTURE_2D;
1686 glDisable GL_BLEND;
1687 1731
1688 $self->SUPER::_draw; 1732 $self->SUPER::_draw;
1689} 1733}
1690 1734
1691############################################################################# 1735#############################################################################
… …
1705 1749
1706 $class->SUPER::new ( 1750 $class->SUPER::new (
1707 padding => 2, 1751 padding => 2,
1708 fg => [1, 1, 1], 1752 fg => [1, 1, 1],
1709 active_fg => [1, 1, 0], 1753 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5],
1710 state => 0, 1756 state => 0,
1711 can_hover => 1, 1757 can_hover => 1,
1712 @_ 1758 @_
1713 ) 1759 )
1714} 1760}
… …
1738 1784
1739 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1785 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1740 1786
1741 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742 1788
1743 glEnable GL_BLEND; 1789 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790
1744 glEnable GL_TEXTURE_2D; 1791 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); 1792 $tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751 glDisable GL_TEXTURE_2D; 1793 glDisable GL_TEXTURE_2D;
1752 glDisable GL_BLEND;
1753} 1794}
1754 1795
1755############################################################################# 1796#############################################################################
1756 1797
1757package CFClient::UI::Image; 1798package CFClient::UI::Image;
… …
1800 glTranslate 0, -$self->{w}, 0; 1841 glTranslate 0, -$self->{w}, 0;
1801 1842
1802 ($w, $h) = ($h, $w); 1843 ($w, $h) = ($h, $w);
1803 } 1844 }
1804 1845
1805 glEnable GL_BLEND;
1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807 glEnable GL_TEXTURE_2D; 1846 glEnable GL_TEXTURE_2D;
1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809 1848
1810 $tex->draw_quad (0, 0, $w, $h); 1849 $tex->draw_quad_alpha (0, 0, $w, $h);
1811 1850
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D; 1851 glDisable GL_TEXTURE_2D;
1814} 1852}
1815 1853
1816############################################################################# 1854#############################################################################
1817 1855
… …
2006 qw(s1_slider.png s1_slider_bg.png); 2044 qw(s1_slider.png s1_slider_bg.png);
2007 2045
2008sub new { 2046sub new {
2009 my $class = shift; 2047 my $class = shift;
2010 2048
2011 # range [value, low, high, page] 2049 # range [value, low, high, page, unit]
2012 2050
2013 # TODO: 0-width page 2051 # TODO: 0-width page
2014 # TODO: req_w/h are wrong with vertical 2052 # TODO: req_w/h are wrong with vertical
2015 # TODO: calculations are off 2053 # TODO: calculations are off
2016 my $self = $class->SUPER::new ( 2054 my $self = $class->SUPER::new (
2017 fg => [1, 1, 1], 2055 fg => [1, 1, 1],
2018 active_fg => [0, 0, 0], 2056 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5],
2019 range => [0, 0, 100, 10], 2059 range => [0, 0, 100, 10],
2020 req_w => $::WIDTH / 80, 2060 req_w => $::WIDTH / 80,
2021 req_h => $::WIDTH / 80, 2061 req_h => $::WIDTH / 80,
2022 vertical => 0, 2062 vertical => 0,
2023 can_hover => 1, 2063 can_hover => 1,
2024 inner_pad => 5, 2064 inner_pad => 0.02,
2025 @_ 2065 @_
2026 ); 2066 );
2027 2067
2068 $self->set_value ($self->{range}[0]);
2069 $self->update;
2070
2028 $self 2071 $self
2072}
2073
2074sub set_value {
2075 my ($self, $value) = @_;
2076
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078
2079 $hi = $lo + 1 if $hi <= $lo;
2080
2081 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi;
2083
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit;
2086
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090
2091 if ($value != $old_value) {
2092 $self->emit (changed => $value);
2093 $self->update;
2094 }
2029} 2095}
2030 2096
2031sub size_request { 2097sub size_request {
2032 my ($self) = @_; 2098 my ($self) = @_;
2033 2099
… …
2046 2112
2047sub mouse_motion { 2113sub mouse_motion {
2048 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
2049 2115
2050 if ($GRAB == $self) { 2116 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118
2119 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2122
2123 $self->set_value ($x * ($hi - $lo) + $lo);
2124 }
2125}
2126
2127sub update {
2128 my ($self) = @_;
2129
2130 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131 $self->set_value ($self->{range}[0]);
2132
2051 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2133 my ($value, $lo, $hi, $page) = @{$self->{range}};
2052 2134
2053 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2135 my $inner_w = 1 - 2 * $self->{inner_pad};
2054 2136
2055 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2137 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2056 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2057 2138
2058 $x -= $inner_pad_px; # substract the padding 2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2059 $x = $x * ($hi - $lo) / $inner_w + $lo; 2140 $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 2141
2064 $self->emit (changed => $x); 2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2065 $self->update; 2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value;
2148 $self->{knob_w} = $page;
2066 } 2149 });
2067}
2068 2150
2069# the inner_* stuff is for generating a padding for the slider handle, 2151 $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} 2152}
2076 2153
2077sub _draw { 2154sub _draw {
2078 my ($self) = @_; 2155 my ($self) = @_;
2079 2156
2080 $self->SUPER::_draw (); 2157 $self->SUPER::_draw ();
2081 2158
2082 my ($w, $h) = @$self{qw(w h)}; 2159 glScale $self->{w}, $self->{h};
2083 2160
2084 if ($self->{vertical}) { 2161 if ($self->{vertical}) {
2085 # draw a vertical slider like a rotated horizontal slider 2162 # draw a vertical slider like a rotated horizontal slider
2086 2163
2164 glTranslate 1, 0, 0;
2087 glRotate 90, 0, 0, 1; 2165 glRotate 90, 0, 0, 1;
2088 glTranslate 0, -$self->{w}, 0;
2089
2090 ($w, $h) = ($h, $w);
2091 } 2166 }
2092 2167
2093 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2168 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2169 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095 2170
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; 2171 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2172 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2173
2119 # draw background 2174 # draw background
2120 $tex[1]->draw_quad (0, 0, $w, $h); 2175 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121 2176
2122 # draw handle 2177 # draw handle
2123 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2178 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124 2179
2125 glDisable GL_BLEND;
2126 glDisable GL_TEXTURE_2D; 2180 glDisable GL_TEXTURE_2D;
2127} 2181}
2128 2182
2129############################################################################# 2183#############################################################################
2130 2184
… …
2141 fontsize => 1, 2195 fontsize => 1,
2142 can_events => 0, 2196 can_events => 0,
2143 #font => default_font 2197 #font => default_font
2144 @_, 2198 @_,
2145 2199
2146 layout => (new CFClient::Layout), 2200 layout => (new CFClient::Layout 1),
2147 par => [], 2201 par => [],
2148 height => 0, 2202 height => 0,
2149 children => [ 2203 children => [
2150 (new CFClient::UI::Empty expand => 1), 2204 (new CFClient::UI::Empty expand => 1),
2151 (new CFClient::UI::Slider vertical => 1), 2205 (new CFClient::UI::Slider vertical => 1),
… …
2162 2216
2163 $self->{fontsize} = $fontsize; 2217 $self->{fontsize} = $fontsize;
2164 $self->reflow; 2218 $self->reflow;
2165} 2219}
2166 2220
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 { 2221sub size_allocate {
2187 my ($self, $w, $h) = @_; 2222 my ($self, $w, $h) = @_;
2188 2223
2189 $self->SUPER::size_allocate ($w, $h); 2224 $self->SUPER::size_allocate ($w, $h);
2190 2225
… …
2193 $self->{layout}->set_width ($self->{children}[0]{w}); 2228 $self->{layout}->set_width ($self->{children}[0]{w});
2194 2229
2195 $self->reflow; 2230 $self->reflow;
2196} 2231}
2197 2232
2233sub text_height {
2234 my ($self, $text, $indent) = @_;
2235
2236 my $layout = $self->{layout};
2237
2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239 $layout->set_width ($self->{children}[0]{w} - $indent);
2240 $layout->set_markup ($text);
2241
2242 ($layout->size)[1]
2243}
2244
2245sub reflow {
2246 my ($self) = @_;
2247
2248 $self->{need_reflow}++;
2249 $self->update;
2250}
2251
2198sub add_paragraph { 2252sub add_paragraph {
2199 my ($self, $color, $text) = @_; 2253 my ($self, $color, $text, $indent) = @_;
2200 2254
2201 #TODO: intelligently "reformat" paragraph 2255 #TODO: intelligently "reformat" paragraph
2202 2256
2257 for my $line (split /\n/, $text) {
2203 my $height = $self->text_height ($text); 2258 my $height = $self->text_height ($line);
2204
2205 $self->{height} += $height; 2259 $self->{height} += $height;
2206
2207 push @{$self->{par}}, [$height, $color, $text]; 2260 push @{$self->{par}}, [$height, $color, $indent, $line];
2261 }
2208 2262
2209 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2263 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2210 $self->{children}[1]->update; 2264 $self->{children}[1]->update;
2211} 2265}
2212 2266
… …
2217 2271
2218 return unless $self->{h} > 0; 2272 return unless $self->{h} > 0;
2219 2273
2220 delete $self->{texture}; 2274 delete $self->{texture};
2221 2275
2222 $ROOT->on_refresh ($self, sub { 2276 $ROOT->on_post_alloc ($self, sub {
2223 if (delete $self->{need_reflow}) { 2277 if (delete $self->{need_reflow}) {
2224 my $height = 0; 2278 my $height = 0;
2225 2279
2226 $height += $_->[0] = $self->text_height ($_->[2]) 2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2227 for @{$self->{par}}; 2281 for @{$self->{par}};
2228 2282
2229 $self->{height} = $height; 2283 $self->{height} = $height;
2230 2284
2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2286 $self->{children}[1]->update;
2232 2287
2233 delete $self->{texture}; 2288 delete $self->{texture};
2234 } 2289 }
2235 2290
2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2291 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2237 glClearColor 0, 0, 0, 0; 2292 glClearColor 0.5, 0.5, 0.5, 0;
2238 glClear GL_COLOR_BUFFER_BIT; 2293 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 2294
2245 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2246 2296
2247 my $y0 = $top; 2297 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2298 my $y1 = $top + $self->{h};
… …
2251 2301
2252 my $layout = $self->{layout}; 2302 my $layout = $self->{layout};
2253 2303
2254 $layout->set_font ($self->{font}) if $self->{font}; 2304 $layout->set_font ($self->{font}) if $self->{font};
2255 2305
2306 glEnable GL_BLEND;
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308
2256 for my $par (@{$self->{par}}) { 2309 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2310 my $h = $par->[0];
2258 2311
2259 if ($y0 < $y + $h && $y < $y1) { 2312 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] });
2314 $layout->set_width ($self->{w} - $par->[2]);
2260 $layout->set_text ($par->[2]); 2315 $layout->set_markup ($par->[3]);
2261 2316
2262 glColor @{ $par->[1] }; 2317 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263 my ($W, $H) = $layout->size; 2318
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2319 glRasterPos $par->[2], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2321 }
2266 2322
2267 $y += $h; 2323 $y += $h;
2268 } 2324 }
2269 2325
2270 glDisable GL_TEXTURE_2D;
2271 glDisable GL_BLEND; 2326 glDisable GL_BLEND;
2272 }; 2327 };
2273 }); 2328 });
2274} 2329}
2275 2330
2276sub _draw { 2331sub _draw {
2277 my ($self) = @_; 2332 my ($self) = @_;
2278 2333
2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281 glEnable GL_TEXTURE_2D; 2334 glEnable GL_TEXTURE_2D;
2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1; 2336 glColor 1, 1, 1, 1;
2284 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2337 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
2286 glDisable GL_BLEND;
2287 2339
2288 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2289 2341
2290} 2342}
2291 2343
… …
2385 @_, 2437 @_,
2386 can_events => 0, 2438 can_events => 0,
2387 ) 2439 )
2388} 2440}
2389 2441
2390sub set_markup { 2442sub set_tooltip_from {
2391 my ($self, $text) = @_; 2443 my ($self, $widget) = @_;
2392 2444
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2445 $self->add (new CFClient::UI::Label
2394 $self->{label}->set_markup ($text); 2446 markup => $widget->{tooltip},
2395 $self->add ($self->{label}); 2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448 fontsize => 0.8,
2449 fg => [0, 0, 0, 1],
2450 ellipsise => 0,
2451 font => ($widget->{tooltip_font} || $::FONT_PROP),
2452 );
2396} 2453}
2397 2454
2398sub size_request { 2455sub size_request {
2399 my ($self) = @_; 2456 my ($self) = @_;
2400
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402 2457
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2458 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404 2459
2405 ($w + 4, $h + 4) 2460 ($w + 4, $h + 4)
2406} 2461}
… …
2412} 2467}
2413 2468
2414sub _draw { 2469sub _draw {
2415 my ($self) = @_; 2470 my ($self) = @_;
2416 2471
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375; 2472 glTranslate 0.375, 0.375;
2419 2473
2420 my ($w, $h) = @$self{qw(w h)}; 2474 my ($w, $h) = @$self{qw(w h)};
2421 2475
2422 glColor 1, 0.8, 0.4; 2476 glColor 1, 0.8, 0.4;
… …
2433 glVertex 0 , $h; 2487 glVertex 0 , $h;
2434 glVertex $w, $h; 2488 glVertex $w, $h;
2435 glVertex $w, 0; 2489 glVertex $w, 0;
2436 glEnd; 2490 glEnd;
2437 2491
2438 glPopMatrix; 2492 glTranslate 2 - 0.375, 2 - 0.375;
2439
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw; 2493 $self->SUPER::_draw;
2442} 2494}
2443 2495
2444############################################################################# 2496#############################################################################
2445 2497
… …
2450use CFClient::OpenGL; 2502use CFClient::OpenGL;
2451 2503
2452sub new { 2504sub new {
2453 my $class = shift; 2505 my $class = shift;
2454 2506
2455 $class->SUPER::new ( 2507 my $self = $class->SUPER::new (
2456 aspect => 1, 2508 aspect => 1,
2457 @_, 2509 @_,
2458 ) 2510 );
2511
2512 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self);
2514
2515 $self->{timer} = Event->timer (
2516 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2517 hard => 1,
2518 interval => $self->{animspeed},
2519 cb => sub {
2520 ++$widget->{frame};
2521 $widget->update;
2522 },
2523 );
2524 }
2525
2526 $self
2459} 2527}
2460 2528
2461sub size_request { 2529sub size_request {
2462 (32, 8) 2530 (32, 8)
2463} 2531}
2464 2532
2533sub update {
2534 my ($self) = @_;
2535
2536 return unless $self->{visible};
2537
2538 $self->SUPER::update;
2539}
2540
2465sub _draw { 2541sub _draw {
2466 my ($self) = @_; 2542 my ($self) = @_;
2467 2543
2468 return unless $::CONN;#d# manage and cache textures differently 2544 return unless $::CONN;#d# manage and cache textures differently
2545
2546 my $face;
2547
2548 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}];
2550
2551 $face = $anim->[ $self->{frame} % @$anim ]
2552 if $anim && @$anim;
2553 }
2554
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2555 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2556
2471 # TODO animation
2472 if ($tex) { 2557 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2558 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2559 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2560 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2561 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2562 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2563 }
2564}
2565
2566sub DESTROY {
2567 my ($self) = @_;
2568
2569 $self->{timer}->cancel
2570 if $self->{timer};
2571
2572 $self->SUPER::DESTROY;
2482} 2573}
2483 2574
2484############################################################################# 2575#############################################################################
2485 2576
2486package CFClient::UI::InventoryItem; 2577package CFClient::UI::InventoryItem;
2487 2578
2488our @ISA = CFClient::UI::HBox::; 2579our @ISA = CFClient::UI::HBox::;
2580
2581sub _item_to_desc {
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2489 2606
2490sub new { 2607sub new {
2491 my $class = shift; 2608 my $class = shift;
2492 2609
2493 my %args = @_; 2610 my %args = @_;
2494 2611
2495 my $item = delete $args{item}; 2612 my $item = delete $args{item};
2496 2613
2497 my $desc = $item->{nrof} < 2 2614 my $desc = _item_to_desc ($item);
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501 2615
2502 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2503 can_hover => 1, 2617 can_hover => 1,
2504 can_events => 1, 2618 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc) 2619 tooltip => ((CFClient::UI::Label::escape $desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub { 2621 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_; 2622 my ($self, $ev, $x, $y) = @_;
2509 2623
2510 # todo: maybe put examine on 1? but should just be a tooltip :( 2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) { 2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2632 $::CONN->send ("move $targ $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) { 2633 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}"); 2634 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) { 2635 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new ( 2636 my @menu_items = (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2637 ["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}") }], 2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2526 ], 2649 ),
2527 )->popup ($ev); 2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2528 } 2653 }
2529 2654
2530 1 2655 1
2531 }, 2656 },
2532 %args 2657 %args
2533 ); 2658 );
2659
2534 2660
2535 $self->add (new CFClient::UI::Face 2661 $self->add (new CFClient::UI::Face
2536 can_events => 0, 2662 can_events => 0,
2537 face => $item->{face}, 2663 face => $item->{face},
2538 anim => $item->{anim}, 2664 anim => $item->{anim},
2539 animspeed => $item->{animspeed}, 2665 animspeed => $item->{animspeed},
2540 ); 2666 );
2541 2667
2542 $self->add (new CFClient::UI::Label 2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2543 can_events => 0, 2669
2544 text => $desc, 2670 $self->{item} = $item;
2545 ); 2671
2672 $self->update_item;
2546 2673
2547 $self 2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2548} 2683}
2549 2684
2550############################################################################# 2685#############################################################################
2551 2686
2552package CFClient::UI::Inventory; 2687package CFClient::UI::Inventory;
… …
2568 my ($self, $items) = @_; 2703 my ($self, $items) = @_;
2569 2704
2570 $self->{scrolled}->clear; 2705 $self->{scrolled}->clear;
2571 return unless $items; 2706 return unless $items;
2572 2707
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2708 my @items = sort {
2709 ($a->{type} <=> $b->{type})
2710 or ($a->{name} cmp $b->{name})
2711 } @$items;
2574 2712
2575 $self->{real_items} = \@items; 2713 $self->{real_items} = \@items;
2576 2714
2577 for my $item (@items) { 2715 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2583 } 2718 }
2719
2720 $self->{scrolled}->add (@items);
2584 2721
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586} 2723}
2587 2724
2588sub size_request { 2725sub size_request {
… …
2666 2803
2667package CFClient::UI::Statusbox; 2804package CFClient::UI::Statusbox;
2668 2805
2669our @ISA = CFClient::UI::VBox::; 2806our @ISA = CFClient::UI::VBox::;
2670 2807
2808sub new {
2809 my $class = shift;
2810
2811 $class->SUPER::new (
2812 fontsize => 0.8,
2813 @_,
2814 )
2815}
2816
2671sub reorder { 2817sub reorder {
2672 my ($self) = @_; 2818 my ($self) = @_;
2673 my $NOW = time; 2819 my $NOW = time;
2674 2820
2675 while (my ($k, $v) = each %{ $self->{item} }) { 2821 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2822 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 } 2823 }
2678 2824
2679 my @widgets; 2825 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2826
2827 my @items = sort {
2828 $a->{pri} <=> $b->{pri}
2829 or $b->{id} <=> $a->{id}
2830 } values %{ $self->{item} };
2831
2681 my $count = 10 + 1; 2832 my $count = 10 + 1;
2682 for my $item (@items) { 2833 for my $item (@items) {
2683 last unless --$count; 2834 last unless --$count;
2684 2835
2685 push @widgets, $item->{label} ||= do { 2836 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all) 2837 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text}; 2838 my $short = $item->{count} > 1
2839 ? "<b>$item->{count} ×</b> $item->{text}"
2840 : $item->{text};
2841
2688 for ($short) { 2842 for ($short) {
2689 s/^\s+//; 2843 s/^\s+//;
2690 s/\012.*//s; 2844 s/\s+/ /g;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 } 2845 }
2694 2846
2695 new CFClient::UI::Label 2847 new CFClient::UI::Label
2696 markup => $short, 2848 markup => $short,
2697 tooltip => delete $item->{tooltip}, 2849 tooltip => $item->{tooltip},
2698 fontsize => delete $item->{fontsize}, 2850 tooltip_font => $::FONT_PROP,
2699 color => delete $item->{color}, 2851 tooltip_width => 0.67,
2852 fontsize => $item->{fontsize} || $self->{fontsize},
2853 max_w => $::WIDTH * 0.44,
2854 fg => $item->{fg},
2700 can_events => 1, 2855 can_events => 1,
2701 can_hover => 1, 2856 can_hover => 1
2702 }; 2857 };
2703 } 2858 }
2704 2859
2705 $self->clear; 2860 $self->clear;
2706 $self->SUPER::add (@widgets); 2861 $self->SUPER::add (reverse @widgets);
2707} 2862}
2708 2863
2709sub add { 2864sub add {
2710 my ($self, $text, %arg) = @_; 2865 my ($self, $text, %arg) = @_;
2711 2866
2712 my $item = { 2867 $text =~ s/^\s+//;
2713 time => time, 2868 $text =~ s/\s+$//;
2869
2870 my $timeout = time + ((delete $arg{timeout}) || 60);
2871
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873
2874 if (my $item = $self->{item}{$group}) {
2875 if ($item->{text} eq $text) {
2876 $item->{count}++;
2877 } else {
2878 $item->{count} = 1;
2879 $item->{text} = $item->{tooltip} = $text;
2880 }
2881 $item->{id} = ++$self->{id};
2882 $item->{timeout} = $timeout;
2883 delete $item->{label};
2884 } else {
2885 $self->{item}{$group} = {
2886 id => ++$self->{id},
2714 text => $text, 2887 text => $text,
2715 timeout => 60, 2888 timeout => $timeout,
2716 tooltip => $text, 2889 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8], 2890 fg => [0.8, 0.8, 0.8, 0.8],
2891 pri => 0,
2892 count => 1,
2719 %arg, 2893 %arg,
2894 };
2720 }; 2895 }
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726 2896
2727 $self->reorder; 2897 $self->reorder;
2898}
2899
2900sub reconfigure {
2901 my ($self) = @_;
2902
2903 delete $_->{label}
2904 for values %{ $self->{item} || {} };
2905
2906 $self->reorder;
2907 $self->SUPER::reconfigure;
2728} 2908}
2729 2909
2730############################################################################# 2910#############################################################################
2731 2911
2732package CFClient::UI::Root; 2912package CFClient::UI::Root;
… …
2764} 2944}
2765 2945
2766sub size_allocate { 2946sub size_allocate {
2767 my ($self, $w, $h) = @_; 2947 my ($self, $w, $h) = @_;
2768 2948
2769 my $old_w = $self->{old_w}; 2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2770 my $old_h = $self->{old_h}; 2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2771 2951
2772 if ($old_w && $old_h) { 2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2773 for my $child ($self->children) { 2953 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 2954
2785 for my $child ($self->children) { 2955 for my $child ($self->children) {
2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787 2957
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2959 if exists $child->{req_x};
2960
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2962 if exists $child->{req_y};
2963
2788 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2964 $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; 2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966
2790 $child->configure ($X, $Y, $W, $H); 2967 $child->configure ($X, $Y, $W, $H);
2791 } 2968 }
2792
2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795} 2969}
2796 2970
2797sub coord2local { 2971sub coord2local {
2798 my ($self, $x, $y) = @_; 2972 my ($self, $x, $y) = @_;
2799 2973
… …
2812 $self->check_size; 2986 $self->check_size;
2813 $::WANT_REFRESH++; 2987 $::WANT_REFRESH++;
2814} 2988}
2815 2989
2816sub add { 2990sub add {
2817 my ($self, $child) = @_; 2991 my ($self, @children) = @_;
2818 2992
2993 for my $child (@children) {
2994 $child->{toplevel} = 1;
2995
2819 # integerise window positions 2996 # integerise window positions
2820 $child->{x} = int $child->{x}; 2997 $child->{x} = int $child->{x};
2821 $child->{y} = int $child->{y}; 2998 $child->{y} = int $child->{y};
2999 }
2822 3000
2823 $self->SUPER::add ($child); 3001 $self->SUPER::add (@children);
3002
3003 while (@children) {
3004 my $w = pop @children;
3005 push @children, $w->children;
3006 $w->{visible} = 1;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 }
2824} 3020}
2825 3021
2826sub on_refresh { 3022sub on_refresh {
2827 my ($self, $id, $cb) = @_; 3023 my ($self, $id, $cb) = @_;
2828 3024
2829 $self->{refresh_hook}{$id} = $cb; 3025 $self->{refresh_hook}{$id} = $cb;
2830} 3026}
2831 3027
3028sub on_post_alloc {
3029 my ($self, $id, $cb) = @_;
3030
3031 $self->{post_alloc_hook}{$id} = $cb;
3032}
3033
2832sub draw { 3034sub draw {
2833 my ($self) = @_; 3035 my ($self) = @_;
3036
3037 while ($self->{refresh_hook}) {
3038 $_->()
3039 for values %{delete $self->{refresh_hook}};
3040 }
2834 3041
2835 if ($self->{check_size}) { 3042 if ($self->{check_size}) {
2836 my @queue = ([], []); 3043 my @queue = ([], []);
2837 3044
2838 for (;;) { 3045 for (;;) {
… …
2846 3053
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)} 3055 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request; 3056 : $widget->size_request;
2850 3057
3058 if (delete $widget->{force_alloc}
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3060 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853 3061
2854 $widget->{req_w} = $w; 3062 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h; 3063 $widget->{req_h} = $h;
2856 3064
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2858 3066
2859 $widget->{parent}->check_size 3067 $widget->{parent}->check_size
2860 if $widget->{parent}; 3068 if $widget->{parent};
2861 } 3069 }
2862 } 3070 }
… …
2874 $widget->size_allocate ($w, $h); 3082 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h); 3083 $widget->emit (size_allocate => $w, $h);
2876 } 3084 }
2877 } 3085 }
2878 3086
2879 while ($self->{refresh_hook}) { 3087 while ($self->{post_alloc_hook}) {
2880 $_->() 3088 $_->()
2881 for values %{delete $self->{refresh_hook}}; 3089 for values %{delete $self->{post_alloc_hook}};
2882 } 3090 }
2883 3091
2884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3092 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886 glClear GL_COLOR_BUFFER_BIT; 3094 glClear GL_COLOR_BUFFER_BIT;
2887 3095
2888 glMatrixMode GL_PROJECTION; 3096 glMatrixMode GL_PROJECTION;
2889 glLoadIdentity; 3097 glLoadIdentity;
2890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891 glMatrixMode GL_MODELVIEW; 3099 glMatrixMode GL_MODELVIEW;
2892 glLoadIdentity; 3100 glLoadIdentity;
2893 3101
2894 $self->_draw; 3102 $self->_draw;
2895} 3103}
… …
2897############################################################################# 3105#############################################################################
2898 3106
2899package CFClient::UI; 3107package CFClient::UI;
2900 3108
2901$ROOT = new CFClient::UI::Root; 3109$ROOT = new CFClient::UI::Root;
2902$TOOLTIP = new CFClient::UI::Tooltip; 3110$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2903 3111
29041 31121
2905 3113

Diff Legend

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