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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.222 by root, Mon May 22 03:59:51 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $i; 137 $_ = $i;
138 }
139}
140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
135 } 169 }
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
… …
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
… …
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
179} 214}
180 215
… …
240 275
241sub size_allocate { 276sub size_allocate {
242 # nothing to be done 277 # nothing to be done
243} 278}
244 279
280sub reconfigure {
281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
245sub children { 287sub children {
246}
247
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 288}
259 289
260sub set_max_size { 290sub set_max_size {
261 my ($self, $w, $h) = @_; 291 my ($self, $w, $h) = @_;
262 292
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 293 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 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 }
265} 306}
266 307
267# translate global coordinates to local coordinate system 308# translate global coordinates to local coordinate system
268sub coord2local { 309sub coord2local {
269 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
… …
355 glVertex $self->{w}, 0; 396 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 397 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 398 glVertex 0 , $self->{h};
358 glEnd; 399 glEnd;
359 glPopMatrix; 400 glPopMatrix;
360 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;
361 } 402 }
362} 403}
363 404
364sub _draw { 405sub _draw {
365 my ($self) = @_; 406 my ($self) = @_;
… …
382sub set_parent { 423sub set_parent {
383 my ($self, $parent) = @_; 424 my ($self, $parent) = @_;
384 425
385 Scalar::Util::weaken ($self->{parent} = $parent); 426 Scalar::Util::weaken ($self->{parent} = $parent);
386 427
428 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 429 $self->check_size
388 unless exists $self->{req_w}; 430 unless exists $self->{req_w};
431
432 $self->show;
389} 433}
390 434
391sub check_size { 435sub check_size {
392 my ($self) = @_; 436 my ($self, $forced) = @_;
393 437
438 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 440}
396 441
397sub update { 442sub update {
398 my ($self) = @_; 443 my ($self) = @_;
… …
414} 459}
415 460
416sub DESTROY { 461sub DESTROY {
417 my ($self) = @_; 462 my ($self) = @_;
418 463
464 delete $WIDGET{$self+0};
419 #$self->deactivate; 465 #$self->deactivate;
420} 466}
421 467
422############################################################################# 468#############################################################################
423 469
… …
432 my $class = shift; 478 my $class = shift;
433 479
434 # range [value, low, high, page] 480 # range [value, low, high, page]
435 481
436 $class->SUPER::new ( 482 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 483 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 484 #active_bg => [1, 1, 1, 0.5],
439 @_ 485 @_
440 ) 486 )
441} 487}
442 488
443sub _draw { 489sub _draw {
444 my ($self) = @_; 490 my ($self) = @_;
445 491
492 my $color = $FOCUS == $self && $self->{active_bg}
493 ? $self->{active_bg}
494 : $self->{bg};
495
496 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 497 my ($w, $h) = @$self{qw(w h)};
447 498
448 glEnable GL_BLEND; 499 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 501 glColor @$color;
451 502
452 glBegin GL_QUADS; 503 glBegin GL_QUADS;
453 glVertex 0 , 0; 504 glVertex 0 , 0;
454 glVertex 0 , $h; 505 glVertex 0 , $h;
455 glVertex $w, $h; 506 glVertex $w, $h;
456 glVertex $w, 0; 507 glVertex $w, 0;
457 glEnd; 508 glEnd;
458 509
459 glDisable GL_BLEND; 510 glDisable GL_BLEND;
511 }
460} 512}
461 513
462############################################################################# 514#############################################################################
463 515
464package CFClient::UI::Empty; 516package CFClient::UI::Empty;
… …
508 $self->{children} = [ 560 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 561 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 562 @{$self->{children}}, @widgets
511 ]; 563 ];
512 564
513 $self->check_size; 565 $self->check_size (1);
514 $self->update; 566 $self->update;
515} 567}
516 568
517sub children { 569sub children {
518 @{ $_[0]{children} } 570 @{ $_[0]{children} }
… …
625} 677}
626 678
627sub update { 679sub update {
628 my ($self) = @_; 680 my ($self) = @_;
629 681
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 682 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 683 $self->SUPER::update;
632} 684}
633 685
634sub size_allocate { 686sub size_allocate {
635 my ($self, $w, $h) = @_; 687 my ($self, $w, $h) = @_;
… …
648 $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 {
649 glClearColor 0, 0, 0, 0; 701 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 702 glClear GL_COLOR_BUFFER_BIT;
651 703
652 $self->_render; 704 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 705 };
661} 706}
662 707
663sub _draw { 708sub _draw {
664 my ($self) = @_; 709 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 711 my ($w, $h) = ($self->w, $self->h);
667 712
668 my $tex = $self->{texture} 713 my $tex = $self->{texture}
669 or return; 714 or return;
670 715
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 716 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 718 glColor 1, 1, 1, 1;
676 719
677 $tex->draw_quad (0, 0, $w, $h); 720 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 721
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 722 glDisable GL_TEXTURE_2D;
681} 723}
682 724
683############################################################################# 725#############################################################################
684 726
… …
764 $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}));
765 }, 807 },
766 ; 808 ;
767 809
768 $self = $class->SUPER::new ( 810 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 811 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 812 slider => $slider,
771 @_, 813 @_,
772 ); 814 );
773 815
774 $self->{vp}->add ($self->{scrolled}); 816 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 818 $self->add ($self->{slider});
777 819
778 $self 820 $self
779} 821}
780 822
781#TODO# update range on size_allocate depeneing on child 823#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 824# update viewport offset on scroll
783 825
784############################################################################# 826#############################################################################
785 827
786package CFClient::UI::Frame; 828package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 832use CFClient::OpenGL;
791 833
792sub new { 834sub new {
793 my $class = shift; 835 my $class = shift;
794 836
795 my $self = $class->SUPER::new ( 837 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 838 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 839 @_,
800 ); 840 )
801
802 $self
803} 841}
804 842
805sub _draw { 843sub _draw {
806 my ($self) = @_; 844 my ($self) = @_;
807 845
808 my ($w, $h) = ($self->{w}, $self->{h}); 846 if ($self->{bg}) {
847 my ($w, $h) = @$self{qw(w h)};
809 848
810 glEnable GL_BLEND; 849 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 850 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 851 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 852
815# glBegin GL_QUADS; 853 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 854 glVertex 0 , 0;
818# glVertex 0 , $h; 855 glVertex 0 , $h;
819# glVertex $w, $h; 856 glVertex $w, $h;
820# glVertex $w, 0; 857 glVertex $w, 0;
821# glEnd; 858 glEnd;
822 859
823
824 $self->child->draw;
825 glDisable GL_BLEND; 860 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 861 }
862
863 $self->SUPER::_draw;
827} 864}
828 865
829############################################################################# 866#############################################################################
830 867
831package CFClient::UI::FancyFrame; 868package CFClient::UI::FancyFrame;
… …
845 882
846 my $self = $class->SUPER::new ( 883 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 884 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 885 border_bg => [1, 1, 1, 1],
849 border => 0.6, 886 border => 0.6,
887 toplevel => 1,
850 can_events => 1, 888 can_events => 1,
851 @_ 889 @_
852 ); 890 );
853 891
854 $self->{title} &&= new CFClient::UI::Label 892 $self->{title} &&= new CFClient::UI::Label
… …
879 my ($self, $w, $h) = @_; 917 my ($self, $w, $h) = @_;
880 918
881 $h -= List::Util::max 0, $self->border * 2; 919 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 920 $w -= List::Util::max 0, $self->border * 2;
883 921
884 $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)
885 if $self->{title}; 923 if $self->{title};
886 924
887 $self->child->configure ($self->border, $self->border, $w, $h); 925 $self->child->configure ($self->border, $self->border, $w, $h);
888} 926}
889 927
… …
947 my ($self) = @_; 985 my ($self) = @_;
948 986
949 my ($w, $h ) = ($self->{w}, $self->{h}); 987 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 989
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 990 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 992
957 my $border = $self->border; 993 my $border = $self->border;
958 994
959 glColor @{ $self->{border_bg} }; 995 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 996 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1000
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1002 my $bg = $tex[0];
967 1003
968 # TODO: repeat texture not scale 1004 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 1008 glColor @{ $self->{bg} };
973 1009
974 $bg->{s} = $rep_x; 1010 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1011 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1012 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 }
978 1015
979 glDisable GL_TEXTURE_2D; 1016 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1017
983 $self->{title}->draw if $self->{title}; 1018 $self->{title}->draw if $self->{title};
984 1019
985 $self->child->draw; 1020 $self->child->draw;
986} 1021}
… …
1253 1288
1254############################################################################# 1289#############################################################################
1255 1290
1256package CFClient::UI::Label; 1291package CFClient::UI::Label;
1257 1292
1258our @ISA = CFClient::UI::Base::; 1293our @ISA = CFClient::UI::DrawBG::;
1259 1294
1260use CFClient::OpenGL; 1295use CFClient::OpenGL;
1261 1296
1262sub new { 1297sub new {
1263 my ($class, %arg) = @_; 1298 my ($class, %arg) = @_;
1264 1299
1265 my $self = $class->SUPER::new ( 1300 my $self = $class->SUPER::new (
1266 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1302 #bg => none
1303 #active_bg => none
1267 #font => default_font 1304 #font => default_font
1305 #text => initial text
1306 #markup => initial narkup
1307 #max_w => maximum pixel width
1308 ellipsise => 3, # end
1309 layout => (new CFClient::Layout),
1268 fontsize => 1, 1310 fontsize => 1,
1269 text => "",
1270 align => -1, 1311 align => -1,
1271 valign => -1, 1312 valign => -1,
1272 padding => 2, 1313 padding => 2,
1273 layout => new CFClient::Layout,
1274 can_events => 0, 1314 can_events => 0,
1275 %arg 1315 %arg
1276 ); 1316 );
1277 1317
1278 if (exists $self->{template}) { 1318 if (exists $self->{template}) {
1279 my $layout = new CFClient::Layout; 1319 my $layout = new CFClient::Layout;
1280 $layout->set_text (delete $self->{template}); 1320 $layout->set_text (delete $self->{template});
1281 $self->{template} = $layout; 1321 $self->{template} = $layout;
1282 } 1322 }
1283 1323
1284 $self->set_text (delete $self->{text}) if exists $self->{text}; 1324 if (exists $self->{markup}) {
1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1325 $self->set_markup (delete $self->{markup});
1326 } else {
1327 $self->set_text (delete $self->{text});
1328 }
1286 1329
1287 $self 1330 $self
1288} 1331}
1289 1332
1290sub escape { 1333sub escape($) {
1291 local $_ = $_[1]; 1334 local $_ = $_[0];
1292 1335
1293 s/&/&amp;/g; 1336 s/&/&amp;/g;
1294 s/>/&gt;/g; 1337 s/>/&gt;/g;
1295 s/</&lt;/g; 1338 s/</&lt;/g;
1296 1339
1297 $_[1] 1340 $_
1298} 1341}
1299 1342
1300sub update { 1343sub update {
1301 my ($self) = @_; 1344 my ($self) = @_;
1302 1345
… …
1308 my ($self, $text) = @_; 1351 my ($self, $text) = @_;
1309 1352
1310 return if $self->{text} eq "T$text"; 1353 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text"; 1354 $self->{text} = "T$text";
1312 1355
1356 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313 $self->{layout}->set_text ($text); 1357 $self->{layout}->set_text ($text);
1314 1358
1315 $self->update; 1359 $self->update;
1316 $self->check_size; 1360 $self->check_size;
1317} 1361}
… …
1320 my ($self, $markup) = @_; 1364 my ($self, $markup) = @_;
1321 1365
1322 return if $self->{text} eq "M$markup"; 1366 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup"; 1367 $self->{text} = "M$markup";
1324 1368
1369 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370
1371 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1372 $self->{layout}->set_markup ($markup);
1326 1373
1327 $self->update; 1374 $self->update;
1328 $self->check_size; 1375 $self->check_size;
1329} 1376}
… …
1331sub size_request { 1378sub size_request {
1332 my ($self) = @_; 1379 my ($self) = @_;
1333 1380
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1381 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $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});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1386
1338 my ($w, $h) = $self->{layout}->size; 1387 my ($w, $h) = $self->{layout}->size;
1339 1388
1340 if (exists $self->{template}) { 1389 if (exists $self->{template}) {
… …
1370} 1419}
1371 1420
1372sub _draw { 1421sub _draw {
1373 my ($self) = @_; 1422 my ($self) = @_;
1374 1423
1424 $self->SUPER::_draw; # draw background, if applicable
1425
1375 my $tex = $self->{texture} ||= do { 1426 my $tex = $self->{texture} ||= do {
1427 $self->{layout}->set_foreground (@{$self->{fg}});
1376 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1428 $self->{layout}->set_font ($self->{font}) if $self->{font};
1377 $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});
1378 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433
1379 new_from_layout CFClient::Texture $self->{layout} 1434 my $tex = new_from_layout CFClient::Texture $self->{layout};
1435
1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1438 : ($self->{w} - $tex->{w}) * 0.5);
1439
1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1442 : ($self->{h} - $tex->{h}) * 0.5);
1443
1444 $tex
1380 }; 1445 };
1381 1446
1382 glEnable GL_BLEND;
1383 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384 glEnable GL_TEXTURE_2D; 1447 glEnable GL_TEXTURE_2D;
1385 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386 1449
1450 if ($tex->{format} == GL_ALPHA) {
1387 glColor @{$self->{fg}}; 1451 glColor @{$self->{fg}};
1388
1389 $self->{ox} = int (
1390 $self->{align} < 0 ? $self->{padding}
1391 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392 : ($self->{w} - $tex->{w}) * 0.5
1393 );
1394
1395 $self->{oy} = int (
1396 $self->{valign} < 0 ? $self->{padding}
1397 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398 : ($self->{h} - $tex->{h}) * 0.5
1399 );
1400
1401 $tex->draw_quad ($self->{ox}, $self->{oy}); 1452 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1453 } else {
1454 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1455 }
1402 1456
1403 glDisable GL_TEXTURE_2D; 1457 glDisable GL_TEXTURE_2D;
1404 glDisable GL_BLEND;
1405} 1458}
1406 1459
1407############################################################################# 1460#############################################################################
1408 1461
1409package CFClient::UI::EntryBase; 1462package CFClient::UI::EntryBase;
… …
1444 $self->{layout}->set_text ("$text "); 1497 $self->{layout}->set_text ("$text ");
1445 1498
1446 $self->emit (changed => $self->{text}); 1499 $self->emit (changed => $self->{text});
1447} 1500}
1448 1501
1449sub get_text {
1450 $_[0]{text}
1451}
1452
1453sub size_request {
1454 my ($self) = @_;
1455
1456 my ($w, $h) = $self->SUPER::size_request;
1457
1458 ($w + 1, $h) # add 1 for cursor
1459}
1460
1461sub size_allocate {
1462 my ($self, $w, $h) = @_;
1463
1464 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465}
1466
1467sub set_text { 1502sub set_text {
1468 my ($self, $text) = @_; 1503 my ($self, $text) = @_;
1469 1504
1470 $self->{cursor} = length $text; 1505 $self->{cursor} = length $text;
1471 $self->_set_text ($text); 1506 $self->_set_text ($text);
1472 $self->update; 1507 $self->update;
1508 $self->check_size;
1509}
1510
1511sub get_text {
1512 $_[0]{text}
1513}
1514
1515sub size_request {
1516 my ($self) = @_;
1517
1518 my ($w, $h) = $self->SUPER::size_request;
1519
1520 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473} 1527}
1474 1528
1475sub key_down { 1529sub key_down {
1476 my ($self, $ev) = @_; 1530 my ($self, $ev) = @_;
1477 1531
… …
1479 my $sym = $ev->{sym}; 1533 my $sym = $ev->{sym};
1480 my $uni = $ev->{unicode}; 1534 my $uni = $ev->{unicode};
1481 1535
1482 my $text = $self->get_text; 1536 my $text = $self->get_text;
1483 1537
1484 if ($sym == 8) { 1538 if ($uni == 8) {
1485 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1539 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486 } elsif ($sym == 127) { 1540 } elsif ($uni == 127) {
1487 substr $text, $self->{cursor}, 1, ""; 1541 substr $text, $self->{cursor}, 1, "";
1488 } elsif ($sym == CFClient::SDLK_LEFT) { 1542 } elsif ($sym == CFClient::SDLK_LEFT) {
1489 --$self->{cursor} if $self->{cursor}; 1543 --$self->{cursor} if $self->{cursor};
1490 } elsif ($sym == CFClient::SDLK_RIGHT) { 1544 } elsif ($sym == CFClient::SDLK_RIGHT) {
1491 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1545 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1492 } elsif ($sym == CFClient::SDLK_HOME) { 1546 } elsif ($sym == CFClient::SDLK_HOME) {
1493 $self->{cursor} = 0; 1547 $self->{cursor} = 0;
1494 } elsif ($sym == CFClient::SDLK_END) { 1548 } elsif ($sym == CFClient::SDLK_END) {
1495 $self->{cursor} = length $text; 1549 $self->{cursor} = length $text;
1496 } elsif ($sym == 27) { 1550 } elsif ($uni == 27) {
1497 $self->emit ('escape'); 1551 $self->emit ('escape');
1498 } elsif ($uni) { 1552 } elsif ($uni) {
1499 substr $text, $self->{cursor}++, 0, chr $uni; 1553 substr $text, $self->{cursor}++, 0, chr $uni;
1500 } 1554 }
1501 1555
1502 $self->_set_text ($text); 1556 $self->_set_text ($text);
1503 $self->update; 1557 $self->update;
1558 $self->check_size;
1504} 1559}
1505 1560
1506sub focus_in { 1561sub focus_in {
1507 my ($self) = @_; 1562 my ($self) = @_;
1508 1563
… …
1637 my $class = shift; 1692 my $class = shift;
1638 1693
1639 $class->SUPER::new ( 1694 $class->SUPER::new (
1640 padding => 4, 1695 padding => 4,
1641 fg => [1, 1, 1], 1696 fg => [1, 1, 1],
1642 bg => [1, 1, 1, 0.2],
1643 active_fg => [0, 0, 1], 1697 active_fg => [0, 0, 1],
1644 can_hover => 1, 1698 can_hover => 1,
1645 align => 0, 1699 align => 0,
1646 valign => 0, 1700 valign => 0,
1647 can_events => 1, 1701 can_events => 1,
… …
1665 1719
1666 if ($GRAB == $self) { 1720 if ($GRAB == $self) {
1667 $self->{fg} = $self->{active_fg}; 1721 $self->{fg} = $self->{active_fg};
1668 } 1722 }
1669 1723
1670 glEnable GL_BLEND;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672 glEnable GL_TEXTURE_2D; 1724 glEnable GL_TEXTURE_2D;
1673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1725 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674 glColor 0, 0, 0, 1; 1726 glColor 0, 0, 0, 1;
1675 1727
1676 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1728 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677 1729
1678 glDisable GL_TEXTURE_2D; 1730 glDisable GL_TEXTURE_2D;
1679 glDisable GL_BLEND;
1680 1731
1681 $self->SUPER::_draw; 1732 $self->SUPER::_draw;
1682} 1733}
1683 1734
1684############################################################################# 1735#############################################################################
… …
1698 1749
1699 $class->SUPER::new ( 1750 $class->SUPER::new (
1700 padding => 2, 1751 padding => 2,
1701 fg => [1, 1, 1], 1752 fg => [1, 1, 1],
1702 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],
1703 state => 0, 1756 state => 0,
1704 can_hover => 1, 1757 can_hover => 1,
1705 @_ 1758 @_
1706 ) 1759 )
1707} 1760}
… …
1731 1784
1732 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;
1733 1786
1734 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735 1788
1736 glEnable GL_BLEND; 1789 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790
1737 glEnable GL_TEXTURE_2D; 1791 glEnable GL_TEXTURE_2D;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740 my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742 $tex->draw_quad (0, 0, $s, $s); 1792 $tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744 glDisable GL_TEXTURE_2D; 1793 glDisable GL_TEXTURE_2D;
1745 glDisable GL_BLEND;
1746} 1794}
1747 1795
1748############################################################################# 1796#############################################################################
1749 1797
1750package CFClient::UI::Image; 1798package CFClient::UI::Image;
… …
1793 glTranslate 0, -$self->{w}, 0; 1841 glTranslate 0, -$self->{w}, 0;
1794 1842
1795 ($w, $h) = ($h, $w); 1843 ($w, $h) = ($h, $w);
1796 } 1844 }
1797 1845
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 1846 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1847 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 1848
1803 $tex->draw_quad (0, 0, $w, $h); 1849 $tex->draw_quad_alpha (0, 0, $w, $h);
1804 1850
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 1851 glDisable GL_TEXTURE_2D;
1807} 1852}
1808 1853
1809############################################################################# 1854#############################################################################
1810 1855
… …
1999 qw(s1_slider.png s1_slider_bg.png); 2044 qw(s1_slider.png s1_slider_bg.png);
2000 2045
2001sub new { 2046sub new {
2002 my $class = shift; 2047 my $class = shift;
2003 2048
2004 # range [value, low, high, page] 2049 # range [value, low, high, page, unit]
2005 2050
2006 # TODO: 0-width page 2051 # TODO: 0-width page
2007 # TODO: req_w/h are wrong with vertical 2052 # TODO: req_w/h are wrong with vertical
2008 # TODO: calculations are off 2053 # TODO: calculations are off
2009 my $self = $class->SUPER::new ( 2054 my $self = $class->SUPER::new (
2010 fg => [1, 1, 1], 2055 fg => [1, 1, 1],
2011 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],
2012 range => [0, 0, 100, 10], 2059 range => [0, 0, 100, 10],
2013 req_w => $::WIDTH / 80, 2060 req_w => $::WIDTH / 80,
2014 req_h => $::WIDTH / 80, 2061 req_h => $::WIDTH / 80,
2015 vertical => 0, 2062 vertical => 0,
2016 can_hover => 1, 2063 can_hover => 1,
2017 inner_pad => 5, 2064 inner_pad => 0.02,
2018 @_ 2065 @_
2019 ); 2066 );
2020 2067
2068 $self->set_value ($self->{range}[0]);
2069 $self->update;
2070
2021 $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 }
2022} 2095}
2023 2096
2024sub size_request { 2097sub size_request {
2025 my ($self) = @_; 2098 my ($self) = @_;
2026 2099
… …
2039 2112
2040sub mouse_motion { 2113sub mouse_motion {
2041 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
2042 2115
2043 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
2044 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2133 my ($value, $lo, $hi, $page) = @{$self->{range}};
2045 2134
2046 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2135 my $inner_w = 1 - 2 * $self->{inner_pad};
2047 2136
2048 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2137 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2049 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2050 2138
2051 $x -= $inner_pad_px; # substract the padding 2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2052 $x = $x * ($hi - $lo) / $inner_w + $lo; 2140 $value = $self->{scale} * ($value - $lo);
2053 $x = $lo if $x < $lo;
2054 $x = $hi - $page if $x > $hi - $page;
2055 $self->{range}[0] = $x;
2056 2141
2057 $self->emit (changed => $x); 2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2058 $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;
2059 } 2149 });
2060}
2061 2150
2062# the inner_* stuff is for generating a padding for the slider handle, 2151 $self->SUPER::update;
2063# so that the handle doesn't leave the texture. This calculation isn't 100%
2064# correct propably, but it does the job for now
2065sub _calc_inner_pad_px {
2066 my ($self, $w) = @_;
2067 ($w / 100) * $self->{inner_pad} # % to pixels
2068} 2152}
2069 2153
2070sub _draw { 2154sub _draw {
2071 my ($self) = @_; 2155 my ($self) = @_;
2072 2156
2073 $self->SUPER::_draw (); 2157 $self->SUPER::_draw ();
2074 2158
2075 my ($w, $h) = @$self{qw(w h)}; 2159 glScale $self->{w}, $self->{h};
2076 2160
2077 if ($self->{vertical}) { 2161 if ($self->{vertical}) {
2078 # draw a vertical slider like a rotated horizontal slider 2162 # draw a vertical slider like a rotated horizontal slider
2079 2163
2164 glTranslate 1, 0, 0;
2080 glRotate 90, 0, 0, 1; 2165 glRotate 90, 0, 0, 1;
2081 glTranslate 0, -$self->{w}, 0;
2082
2083 ($w, $h) = ($h, $w);
2084 } 2166 }
2085 2167
2086 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2168 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2169 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088 2170
2089 my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091 $hi = $value + 1 if $lo == $hi;
2092
2093 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096 $page = int $page * $inner_w / ($hi - $lo);
2097 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099 $w -= $page;
2100 $page &= ~1;
2101 glTranslate $page * 0.5, 0, 0;
2102 $page ||= 2;
2103
2104 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107 glEnable GL_BLEND;
2108 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109 glEnable GL_TEXTURE_2D; 2171 glEnable GL_TEXTURE_2D;
2110 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2172 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111 2173
2112 # draw background 2174 # draw background
2113 $tex[1]->draw_quad (0, 0, $w, $h); 2175 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114 2176
2115 # draw handle 2177 # draw handle
2116 $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);
2117 2179
2118 glDisable GL_BLEND;
2119 glDisable GL_TEXTURE_2D; 2180 glDisable GL_TEXTURE_2D;
2120} 2181}
2121 2182
2122############################################################################# 2183#############################################################################
2123 2184
… …
2134 fontsize => 1, 2195 fontsize => 1,
2135 can_events => 0, 2196 can_events => 0,
2136 #font => default_font 2197 #font => default_font
2137 @_, 2198 @_,
2138 2199
2139 layout => (new CFClient::Layout), 2200 layout => (new CFClient::Layout 1),
2140 par => [], 2201 par => [],
2141 height => 0, 2202 height => 0,
2142 children => [ 2203 children => [
2143 (new CFClient::UI::Empty expand => 1), 2204 (new CFClient::UI::Empty expand => 1),
2144 (new CFClient::UI::Slider vertical => 1), 2205 (new CFClient::UI::Slider vertical => 1),
… …
2155 2216
2156 $self->{fontsize} = $fontsize; 2217 $self->{fontsize} = $fontsize;
2157 $self->reflow; 2218 $self->reflow;
2158} 2219}
2159 2220
2160sub text_height {
2161 my ($self, $text) = @_;
2162
2163 my $layout = $self->{layout};
2164
2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166 $layout->set_width ($self->{children}[0]{w});
2167 $layout->set_text ($text);
2168
2169 ($layout->size)[1]
2170}
2171
2172sub reflow {
2173 my ($self) = @_;
2174
2175 $self->{need_reflow}++;
2176 $self->update;
2177}
2178
2179sub size_allocate { 2221sub size_allocate {
2180 my ($self, $w, $h) = @_; 2222 my ($self, $w, $h) = @_;
2181 2223
2182 $self->SUPER::size_allocate ($w, $h); 2224 $self->SUPER::size_allocate ($w, $h);
2183 2225
… …
2186 $self->{layout}->set_width ($self->{children}[0]{w}); 2228 $self->{layout}->set_width ($self->{children}[0]{w});
2187 2229
2188 $self->reflow; 2230 $self->reflow;
2189} 2231}
2190 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
2191sub add_paragraph { 2252sub add_paragraph {
2192 my ($self, $color, $text) = @_; 2253 my ($self, $color, $text, $indent) = @_;
2193 2254
2194 #TODO: intelligently "reformat" paragraph 2255 #TODO: intelligently "reformat" paragraph
2195 2256
2257 for my $line (split /\n/, $text) {
2196 my $height = $self->text_height ($text); 2258 my $height = $self->text_height ($line);
2197
2198 $self->{height} += $height; 2259 $self->{height} += $height;
2199
2200 push @{$self->{par}}, [$height, $color, $text]; 2260 push @{$self->{par}}, [$height, $color, $indent, $line];
2261 }
2201 2262
2202 $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}];
2203 $self->{children}[1]->update; 2264 $self->{children}[1]->update;
2204} 2265}
2205 2266
… …
2210 2271
2211 return unless $self->{h} > 0; 2272 return unless $self->{h} > 0;
2212 2273
2213 delete $self->{texture}; 2274 delete $self->{texture};
2214 2275
2215 $ROOT->on_refresh ($self, sub { 2276 $ROOT->on_post_alloc ($self, sub {
2216 if (delete $self->{need_reflow}) { 2277 if (delete $self->{need_reflow}) {
2217 my $height = 0; 2278 my $height = 0;
2218 2279
2219 $height += $_->[0] = $self->text_height ($_->[2]) 2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2220 for @{$self->{par}}; 2281 for @{$self->{par}};
2221 2282
2222 $self->{height} = $height; 2283 $self->{height} = $height;
2223 2284
2224 $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;
2225 2287
2226 delete $self->{texture}; 2288 delete $self->{texture};
2227 } 2289 }
2228 2290
2229 $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 {
2230 glClearColor 0, 0, 0, 0; 2292 glClearColor 0.5, 0.5, 0.5, 0;
2231 glClear GL_COLOR_BUFFER_BIT; 2293 glClear GL_COLOR_BUFFER_BIT;
2232
2233 glEnable GL_BLEND;
2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2235 glEnable GL_TEXTURE_2D;
2236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237 2294
2238 my $top = int $self->{children}[1]{range}[0]; 2295 my $top = int $self->{children}[1]{range}[0];
2239 2296
2240 my $y0 = $top; 2297 my $y0 = $top;
2241 my $y1 = $top + $self->{h}; 2298 my $y1 = $top + $self->{h};
… …
2244 2301
2245 my $layout = $self->{layout}; 2302 my $layout = $self->{layout};
2246 2303
2247 $layout->set_font ($self->{font}) if $self->{font}; 2304 $layout->set_font ($self->{font}) if $self->{font};
2248 2305
2306 glEnable GL_BLEND;
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308
2249 for my $par (@{$self->{par}}) { 2309 for my $par (@{$self->{par}}) {
2250 my $h = $par->[0]; 2310 my $h = $par->[0];
2251 2311
2252 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]);
2253 $layout->set_text ($par->[2]); 2315 $layout->set_markup ($par->[3]);
2254 2316
2255 glColor @{ $par->[1] }; 2317 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256 my ($W, $H) = $layout->size; 2318
2257 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;
2258 } 2321 }
2259 2322
2260 $y += $h; 2323 $y += $h;
2261 } 2324 }
2262 2325
2263 glDisable GL_TEXTURE_2D;
2264 glDisable GL_BLEND; 2326 glDisable GL_BLEND;
2265 }; 2327 };
2266 }); 2328 });
2267} 2329}
2268 2330
2269sub _draw { 2331sub _draw {
2270 my ($self) = @_; 2332 my ($self) = @_;
2271 2333
2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274 glEnable GL_TEXTURE_2D; 2334 glEnable GL_TEXTURE_2D;
2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1; 2336 glColor 1, 1, 1, 1;
2277 $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});
2278 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
2279 glDisable GL_BLEND;
2280 2339
2281 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2282 2341
2283} 2342}
2284 2343
… …
2378 @_, 2437 @_,
2379 can_events => 0, 2438 can_events => 0,
2380 ) 2439 )
2381} 2440}
2382 2441
2383sub set_markup { 2442sub set_tooltip_from {
2384 my ($self, $text) = @_; 2443 my ($self, $widget) = @_;
2385 2444
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2445 $self->add (new CFClient::UI::Label
2387 $self->{label}->set_markup ($text); 2446 markup => $widget->{tooltip},
2388 $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 );
2389} 2453}
2390 2454
2391sub size_request { 2455sub size_request {
2392 my ($self) = @_; 2456 my ($self) = @_;
2393
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395 2457
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2458 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397 2459
2398 ($w + 4, $h + 4) 2460 ($w + 4, $h + 4)
2399} 2461}
… …
2405} 2467}
2406 2468
2407sub _draw { 2469sub _draw {
2408 my ($self) = @_; 2470 my ($self) = @_;
2409 2471
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375; 2472 glTranslate 0.375, 0.375;
2412 2473
2413 my ($w, $h) = @$self{qw(w h)}; 2474 my ($w, $h) = @$self{qw(w h)};
2414 2475
2415 glColor 1, 0.8, 0.4; 2476 glColor 1, 0.8, 0.4;
… …
2426 glVertex 0 , $h; 2487 glVertex 0 , $h;
2427 glVertex $w, $h; 2488 glVertex $w, $h;
2428 glVertex $w, 0; 2489 glVertex $w, 0;
2429 glEnd; 2490 glEnd;
2430 2491
2431 glPopMatrix; 2492 glTranslate 2 - 0.375, 2 - 0.375;
2432
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw; 2493 $self->SUPER::_draw;
2435} 2494}
2436 2495
2437############################################################################# 2496#############################################################################
2438 2497
… …
2443use CFClient::OpenGL; 2502use CFClient::OpenGL;
2444 2503
2445sub new { 2504sub new {
2446 my $class = shift; 2505 my $class = shift;
2447 2506
2448 $class->SUPER::new ( 2507 my $self = $class->SUPER::new (
2449 aspect => 1, 2508 aspect => 1,
2450 @_, 2509 @_,
2451 ) 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
2452} 2527}
2453 2528
2454sub size_request { 2529sub size_request {
2455 (32, 8) 2530 (32, 8)
2456} 2531}
2457 2532
2533sub update {
2534 my ($self) = @_;
2535
2536 return unless $self->{visible};
2537
2538 $self->SUPER::update;
2539}
2540
2458sub _draw { 2541sub _draw {
2459 my ($self) = @_; 2542 my ($self) = @_;
2460 2543
2461 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
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2555 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463 2556
2464 # TODO animation
2465 if ($tex) { 2557 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D; 2558 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2559 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2560 glColor 1, 1, 1, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2561 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2562 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 } 2563 }
2564}
2565
2566sub DESTROY {
2567 my ($self) = @_;
2568
2569 $self->{timer}->cancel
2570 if $self->{timer};
2571
2572 $self->SUPER::DESTROY;
2475} 2573}
2476 2574
2477############################################################################# 2575#############################################################################
2478 2576
2479package CFClient::UI::InventoryItem; 2577package CFClient::UI::InventoryItem;
2480 2578
2481our @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}
2482 2606
2483sub new { 2607sub new {
2484 my $class = shift; 2608 my $class = shift;
2485 2609
2486 my %args = @_; 2610 my %args = @_;
2487 2611
2488 my $item = delete $args{item}; 2612 my $item = delete $args{item};
2489 2613
2490 my $desc = $item->{nrof} < 2 2614 my $desc = _item_to_desc ($item);
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494 2615
2495 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2496 can_hover => 1, 2617 can_hover => 1,
2497 can_events => 1, 2618 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc) 2619 tooltip => ((CFClient::UI::Label::escape $desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub { 2621 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_; 2622 my ($self, $ev, $x, $y) = @_;
2502 2623
2503 # 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 :(
2504 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
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2632 $::CONN->send ("move $targ $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) { 2633 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}"); 2634 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) { 2635 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new ( 2636 my @menu_items = (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2517 ["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}) }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2519 ], 2649 ),
2520 )->popup ($ev); 2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2521 } 2653 }
2522 2654
2523 1 2655 1
2524 }, 2656 },
2525 %args 2657 %args
2526 ); 2658 );
2659
2527 2660
2528 $self->add (new CFClient::UI::Face 2661 $self->add (new CFClient::UI::Face
2529 can_events => 0, 2662 can_events => 0,
2530 face => $item->{face}, 2663 face => $item->{face},
2531 anim => $item->{anim}, 2664 anim => $item->{anim},
2532 animspeed => $item->{animspeed}, 2665 animspeed => $item->{animspeed},
2533 ); 2666 );
2534 2667
2535 $self->add (new CFClient::UI::Label 2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2536 can_events => 0, 2669
2537 text => $desc, 2670 $self->{item} = $item;
2538 ); 2671
2672 $self->update_item;
2539 2673
2540 $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);
2541} 2683}
2542 2684
2543############################################################################# 2685#############################################################################
2544 2686
2545package CFClient::UI::Inventory; 2687package CFClient::UI::Inventory;
… …
2561 my ($self, $items) = @_; 2703 my ($self, $items) = @_;
2562 2704
2563 $self->{scrolled}->clear; 2705 $self->{scrolled}->clear;
2564 return unless $items; 2706 return unless $items;
2565 2707
2566 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;
2567 2712
2568 $self->{real_items} = \@items; 2713 $self->{real_items} = \@items;
2569 2714
2570 for my $item (@items) { 2715 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2
2572 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}";
2574
2575 $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 ();
2576 } 2718 }
2719
2720 $self->{scrolled}->add (@items);
2577 2721
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2579} 2723}
2580 2724
2581sub size_request { 2725sub size_request {
… …
2655 } 2799 }
2656} 2800}
2657 2801
2658############################################################################# 2802#############################################################################
2659 2803
2804package CFClient::UI::Statusbox;
2805
2806our @ISA = CFClient::UI::VBox::;
2807
2808sub new {
2809 my $class = shift;
2810
2811 $class->SUPER::new (
2812 fontsize => 0.8,
2813 @_,
2814 )
2815}
2816
2817sub reorder {
2818 my ($self) = @_;
2819 my $NOW = time;
2820
2821 while (my ($k, $v) = each %{ $self->{item} }) {
2822 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2823 }
2824
2825 my @widgets;
2826
2827 my @items = sort {
2828 $a->{pri} <=> $b->{pri}
2829 or $b->{id} <=> $a->{id}
2830 } values %{ $self->{item} };
2831
2832 my $count = 10 + 1;
2833 for my $item (@items) {
2834 last unless --$count;
2835
2836 push @widgets, $item->{label} ||= do {
2837 # TODO: doesn't handle markup well (read as: at all)
2838 my $short = $item->{count} > 1
2839 ? "<b>$item->{count} ×</b> $item->{text}"
2840 : $item->{text};
2841
2842 for ($short) {
2843 s/^\s+//;
2844 s/\s+/ /g;
2845 }
2846
2847 new CFClient::UI::Label
2848 markup => $short,
2849 tooltip => $item->{tooltip},
2850 tooltip_font => $::FONT_PROP,
2851 tooltip_width => 0.67,
2852 fontsize => $item->{fontsize} || $self->{fontsize},
2853 max_w => $::WIDTH * 0.44,
2854 fg => $item->{fg},
2855 can_events => 1,
2856 can_hover => 1
2857 };
2858 }
2859
2860 $self->clear;
2861 $self->SUPER::add (reverse @widgets);
2862}
2863
2864sub add {
2865 my ($self, $text, %arg) = @_;
2866
2867 $text =~ s/^\s+//;
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},
2887 text => $text,
2888 timeout => $timeout,
2889 tooltip => $text,
2890 fg => [0.8, 0.8, 0.8, 0.8],
2891 pri => 0,
2892 count => 1,
2893 %arg,
2894 };
2895 }
2896
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;
2908}
2909
2910#############################################################################
2911
2660package CFClient::UI::Root; 2912package CFClient::UI::Root;
2661 2913
2662our @ISA = CFClient::UI::Container::; 2914our @ISA = CFClient::UI::Container::;
2663 2915
2664use CFClient::OpenGL; 2916use CFClient::OpenGL;
… …
2692} 2944}
2693 2945
2694sub size_allocate { 2946sub size_allocate {
2695 my ($self, $w, $h) = @_; 2947 my ($self, $w, $h) = @_;
2696 2948
2697 my $old_w = $self->{old_w}; 2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2698 my $old_h = $self->{old_h}; 2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2699 2951
2700 if ($old_w && $old_h) { 2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2701 for my $child ($self->children) { 2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712 2954
2713 for my $child ($self->children) { 2955 for my $child ($self->children) {
2714 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)};
2715 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
2716 $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;
2717 $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
2718 $child->configure ($X, $Y, $W, $H); 2967 $child->configure ($X, $Y, $W, $H);
2719 } 2968 }
2720
2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723} 2969}
2724 2970
2725sub coord2local { 2971sub coord2local {
2726 my ($self, $x, $y) = @_; 2972 my ($self, $x, $y) = @_;
2727 2973
… …
2740 $self->check_size; 2986 $self->check_size;
2741 $::WANT_REFRESH++; 2987 $::WANT_REFRESH++;
2742} 2988}
2743 2989
2744sub add { 2990sub add {
2745 my ($self, $child) = @_; 2991 my ($self, @children) = @_;
2746 2992
2993 for my $child (@children) {
2994 $child->{toplevel} = 1;
2995
2747 # integerise window positions 2996 # integerise window positions
2748 $child->{x} = int $child->{x}; 2997 $child->{x} = int $child->{x};
2749 $child->{y} = int $child->{y}; 2998 $child->{y} = int $child->{y};
2999 }
2750 3000
2751 $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 }
2752} 3020}
2753 3021
2754sub on_refresh { 3022sub on_refresh {
2755 my ($self, $id, $cb) = @_; 3023 my ($self, $id, $cb) = @_;
2756 3024
2757 $self->{refresh_hook}{$id} = $cb; 3025 $self->{refresh_hook}{$id} = $cb;
2758} 3026}
2759 3027
3028sub on_post_alloc {
3029 my ($self, $id, $cb) = @_;
3030
3031 $self->{post_alloc_hook}{$id} = $cb;
3032}
3033
2760sub draw { 3034sub draw {
2761 my ($self) = @_; 3035 my ($self) = @_;
3036
3037 while ($self->{refresh_hook}) {
3038 $_->()
3039 for values %{delete $self->{refresh_hook}};
3040 }
2762 3041
2763 if ($self->{check_size}) { 3042 if ($self->{check_size}) {
2764 my @queue = ([], []); 3043 my @queue = ([], []);
2765 3044
2766 for (;;) { 3045 for (;;) {
… …
2774 3053
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)} 3055 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request; 3056 : $widget->size_request;
2778 3057
3058 if (delete $widget->{force_alloc}
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780 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#
2781 3061
2782 $widget->{req_w} = $w; 3062 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h; 3063 $widget->{req_h} = $h;
2784 3064
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786 3066
2787 $widget->{parent}->check_size 3067 $widget->{parent}->check_size
2788 if $widget->{parent}; 3068 if $widget->{parent};
2789 } 3069 }
2790 } 3070 }
… …
2802 $widget->size_allocate ($w, $h); 3082 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h); 3083 $widget->emit (size_allocate => $w, $h);
2804 } 3084 }
2805 } 3085 }
2806 3086
2807 while ($self->{refresh_hook}) { 3087 while ($self->{post_alloc_hook}) {
2808 $_->() 3088 $_->()
2809 for values %{delete $self->{refresh_hook}}; 3089 for values %{delete $self->{post_alloc_hook}};
2810 } 3090 }
2811 3091
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3092 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT; 3094 glClear GL_COLOR_BUFFER_BIT;
2815 3095
2816 glMatrixMode GL_PROJECTION; 3096 glMatrixMode GL_PROJECTION;
2817 glLoadIdentity; 3097 glLoadIdentity;
2818 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819 glMatrixMode GL_MODELVIEW; 3099 glMatrixMode GL_MODELVIEW;
2820 glLoadIdentity; 3100 glLoadIdentity;
2821 3101
2822 $self->_draw; 3102 $self->_draw;
2823} 3103}
… …
2825############################################################################# 3105#############################################################################
2826 3106
2827package CFClient::UI; 3107package CFClient::UI;
2828 3108
2829$ROOT = new CFClient::UI::Root; 3109$ROOT = new CFClient::UI::Root;
2830$TOOLTIP = new CFClient::UI::Tooltip; 3110$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831 3111
28321 31121
2833 3113

Diff Legend

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