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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.218 by root, Sat May 20 15:37:27 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
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
135 } 161 }
136} 162}
137 163
138############################################################################# 164#############################################################################
139 165
… …
158 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
160 } 186 }
161 } 187 }
162 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
163 $self 191 $self
164} 192}
165 193
166sub destroy { 194sub destroy {
167 my ($self) = @_; 195 my ($self) = @_;
… …
240 268
241sub size_allocate { 269sub size_allocate {
242 # nothing to be done 270 # nothing to be done
243} 271}
244 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
245sub children { 280sub 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 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258} 281}
259 282
260sub set_max_size { 283sub set_max_size {
261 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
262 285
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
288}
289
290sub set_tooltip {
291 my ($self, $tooltip) = @_;
292
293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
265} 299}
266 300
267# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
268sub coord2local { 302sub coord2local {
269 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
… …
355 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
358 glEnd; 392 glEnd;
359 glPopMatrix; 393 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 395 }
362} 396}
363 397
364sub _draw { 398sub _draw {
365 my ($self) = @_; 399 my ($self) = @_;
… …
380} 414}
381 415
382sub set_parent { 416sub set_parent {
383 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
384 418
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
387} 424}
388 425
389sub check_size { 426sub check_size {
390 my ($self) = @_; 427 my ($self, $forced) = @_;
391 428
429 $self->{force_alloc} = 1 if $forced;
392 $CFClient::UI::ROOT->{check_size}{$self} = $self; 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393} 431}
394 432
395sub update { 433sub update {
396 my ($self) = @_; 434 my ($self) = @_;
… …
412} 450}
413 451
414sub DESTROY { 452sub DESTROY {
415 my ($self) = @_; 453 my ($self) = @_;
416 454
455 delete $WIDGET{$self+0};
417 #$self->deactivate; 456 #$self->deactivate;
418} 457}
419 458
420############################################################################# 459#############################################################################
421 460
… …
430 my $class = shift; 469 my $class = shift;
431 470
432 # range [value, low, high, page] 471 # range [value, low, high, page]
433 472
434 $class->SUPER::new ( 473 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
437 @_ 476 @_
438 ) 477 )
439} 478}
440 479
441sub _draw { 480sub _draw {
442 my ($self) = @_; 481 my ($self) = @_;
443 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
445 489
446 glEnable GL_BLEND; 490 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
449 493
450 glBegin GL_QUADS; 494 glBegin GL_QUADS;
451 glVertex 0 , 0; 495 glVertex 0 , 0;
452 glVertex 0 , $h; 496 glVertex 0 , $h;
453 glVertex $w, $h; 497 glVertex $w, $h;
454 glVertex $w, 0; 498 glVertex $w, 0;
455 glEnd; 499 glEnd;
456 500
457 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
458} 503}
459 504
460############################################################################# 505#############################################################################
461 506
462package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
506 $self->{children} = [ 551 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 553 @{$self->{children}}, @widgets
509 ]; 554 ];
510 555
511 $_->check_size 556 $self->check_size (1);
512 for @widgets;
513
514 $self->update; 557 $self->update;
515} 558}
516 559
517sub children { 560sub children {
518 @{ $_[0]{children} } 561 @{ $_[0]{children} }
… …
625} 668}
626 669
627sub update { 670sub update {
628 my ($self) = @_; 671 my ($self) = @_;
629 672
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 674 $self->SUPER::update;
632} 675}
633 676
634sub size_allocate { 677sub size_allocate {
635 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
… …
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
651 694
652 $self->_render; 695 $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 }; 696 };
661} 697}
662 698
663sub _draw { 699sub _draw {
664 my ($self) = @_; 700 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 702 my ($w, $h) = ($self->w, $self->h);
667 703
668 my $tex = $self->{texture} 704 my $tex = $self->{texture}
669 or return; 705 or return;
670 706
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
676 710
677 $tex->draw_quad (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 712
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
681} 714}
682 715
683############################################################################# 716#############################################################################
684 717
… …
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 }, 798 },
766 ; 799 ;
767 800
768 $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 802 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 803 slider => $slider,
771 @_, 804 @_,
772 ); 805 );
773 806
774 $self->{vp}->add ($self->{scrolled}); 807 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 809 $self->add ($self->{slider});
777 810
778 $self 811 $self
779} 812}
780 813
781#TODO# update range on size_allocate depeneing on child 814#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 815# update viewport offset on scroll
783 816
784############################################################################# 817#############################################################################
785 818
786package CFClient::UI::Frame; 819package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 823use CFClient::OpenGL;
791 824
792sub new { 825sub new {
793 my $class = shift; 826 my $class = shift;
794 827
795 my $self = $class->SUPER::new ( 828 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 829 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 830 @_,
800 ); 831 )
801
802 $self
803} 832}
804 833
805sub _draw { 834sub _draw {
806 my ($self) = @_; 835 my ($self) = @_;
807 836
808 my ($w, $h) = ($self->{w}, $self->{h}); 837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
809 839
810 glEnable GL_BLEND; 840 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 842 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 843
815# glBegin GL_QUADS; 844 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 845 glVertex 0 , 0;
818# glVertex 0 , $h; 846 glVertex 0 , $h;
819# glVertex $w, $h; 847 glVertex $w, $h;
820# glVertex $w, 0; 848 glVertex $w, 0;
821# glEnd; 849 glEnd;
822 850
823
824 $self->child->draw;
825 glDisable GL_BLEND; 851 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 852 }
853
854 $self->SUPER::_draw;
827} 855}
828 856
829############################################################################# 857#############################################################################
830 858
831package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
… …
845 873
846 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
849 border => 0.6, 877 border => 0.6,
878 toplevel => 1,
850 can_events => 1, 879 can_events => 1,
851 @_ 880 @_
852 ); 881 );
853 882
854 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
… …
879 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
880 909
881 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
883 912
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 914 if $self->{title};
886 915
887 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
888} 917}
889 918
… …
947 my ($self) = @_; 976 my ($self) = @_;
948 977
949 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 980
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 983
957 my $border = $self->border; 984 my $border = $self->border;
958 985
959 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 991
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 993 my $bg = $tex[0];
967 994
968 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
973 1000
974 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
978 1006
979 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1008
983 $self->{title}->draw if $self->{title}; 1009 $self->{title}->draw if $self->{title};
984 1010
985 $self->child->draw; 1011 $self->child->draw;
986} 1012}
… …
1213} 1239}
1214 1240
1215sub size_allocate { 1241sub size_allocate {
1216 my ($self, $w, $h) = @_; 1242 my ($self, $w, $h) = @_;
1217 1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1218 my $children = $self->{children}; 1246 my $children = $self->{children};
1219 1247
1220 my @h = map $_->{req_h}, @$children; 1248 my @h = map $_->{req_h}, @$children;
1221 1249
1222 my $req_h = List::Util::sum @h; 1250 my $req_h = List::Util::sum @h;
… …
1251 1279
1252############################################################################# 1280#############################################################################
1253 1281
1254package CFClient::UI::Label; 1282package CFClient::UI::Label;
1255 1283
1256our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1257 1285
1258use CFClient::OpenGL; 1286use CFClient::OpenGL;
1259 1287
1260sub new { 1288sub new {
1261 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1262 1290
1263 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1265 #font => default_font 1295 #font => default_font
1296 #text => initial text
1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1300 layout => (new CFClient::Layout),
1266 fontsize => 1, 1301 fontsize => 1,
1267 text => "",
1268 align => -1, 1302 align => -1,
1269 valign => -1, 1303 valign => -1,
1270 padding => 2, 1304 padding => 2,
1271 layout => new CFClient::Layout,
1272 can_events => 0, 1305 can_events => 0,
1273 %arg 1306 %arg
1274 ); 1307 );
1275 1308
1276 if (exists $self->{template}) { 1309 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1310 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1311 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1312 $self->{template} = $layout;
1280 } 1313 }
1281 1314
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1315 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1316 $self->set_markup (delete $self->{markup});
1317 } else {
1318 $self->set_text (delete $self->{text});
1319 }
1284 1320
1285 $self 1321 $self
1286} 1322}
1287 1323
1288sub escape { 1324sub escape($) {
1289 local $_ = $_[1]; 1325 local $_ = $_[0];
1290 1326
1291 s/&/&amp;/g; 1327 s/&/&amp;/g;
1292 s/>/&gt;/g; 1328 s/>/&gt;/g;
1293 s/</&lt;/g; 1329 s/</&lt;/g;
1294 1330
1295 $_[1] 1331 $_
1296} 1332}
1297 1333
1298sub update { 1334sub update {
1299 my ($self) = @_; 1335 my ($self) = @_;
1300 1336
… …
1306 my ($self, $text) = @_; 1342 my ($self, $text) = @_;
1307 1343
1308 return if $self->{text} eq "T$text"; 1344 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1345 $self->{text} = "T$text";
1310 1346
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1348 $self->{layout}->set_text ($text);
1312 1349
1313 $self->update; 1350 $self->update;
1314 $self->check_size; 1351 $self->check_size;
1315} 1352}
… …
1318 my ($self, $markup) = @_; 1355 my ($self, $markup) = @_;
1319 1356
1320 return if $self->{text} eq "M$markup"; 1357 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1358 $self->{text} = "M$markup";
1322 1359
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1363 $self->{layout}->set_markup ($markup);
1324 1364
1325 $self->update; 1365 $self->update;
1326 $self->check_size; 1366 $self->check_size;
1327} 1367}
… …
1329sub size_request { 1369sub size_request {
1330 my ($self) = @_; 1370 my ($self) = @_;
1331 1371
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1377
1336 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1337 1379
1338 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1368} 1410}
1369 1411
1370sub _draw { 1412sub _draw {
1371 my ($self) = @_; 1413 my ($self) = @_;
1372 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1373 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424
1377 new_from_layout CFClient::Texture $self->{layout} 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1378 }; 1436 };
1379 1437
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1440
1441 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1442 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 }
1400 1447
1401 glDisable GL_TEXTURE_2D; 1448 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1449}
1404 1450
1405############################################################################# 1451#############################################################################
1406 1452
1407package CFClient::UI::EntryBase; 1453package CFClient::UI::EntryBase;
… …
1442 $self->{layout}->set_text ("$text "); 1488 $self->{layout}->set_text ("$text ");
1443 1489
1444 $self->emit (changed => $self->{text}); 1490 $self->emit (changed => $self->{text});
1445} 1491}
1446 1492
1447sub get_text {
1448 $_[0]{text}
1449}
1450
1451sub size_request {
1452 my ($self) = @_;
1453
1454 my ($w, $h) = $self->SUPER::size_request;
1455
1456 ($w + 1, $h) # add 1 for cursor
1457}
1458
1459sub size_allocate {
1460 my ($self, $w, $h) = @_;
1461
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463}
1464
1465sub set_text { 1493sub set_text {
1466 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1467 1495
1468 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1469 $self->_set_text ($text); 1497 $self->_set_text ($text);
1470 $self->update; 1498 $self->update;
1499 $self->check_size;
1500}
1501
1502sub get_text {
1503 $_[0]{text}
1504}
1505
1506sub size_request {
1507 my ($self) = @_;
1508
1509 my ($w, $h) = $self->SUPER::size_request;
1510
1511 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1471} 1518}
1472 1519
1473sub key_down { 1520sub key_down {
1474 my ($self, $ev) = @_; 1521 my ($self, $ev) = @_;
1475 1522
… …
1477 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1479 1526
1480 my $text = $self->get_text; 1527 my $text = $self->get_text;
1481 1528
1482 if ($sym == 8) { 1529 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1542 $self->emit ('escape');
1496 } elsif ($uni) { 1543 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1545 }
1499 1546
1500 $self->_set_text ($text); 1547 $self->_set_text ($text);
1501 $self->update; 1548 $self->update;
1549 $self->check_size;
1502} 1550}
1503 1551
1504sub focus_in { 1552sub focus_in {
1505 my ($self) = @_; 1553 my ($self) = @_;
1506 1554
… …
1635 my $class = shift; 1683 my $class = shift;
1636 1684
1637 $class->SUPER::new ( 1685 $class->SUPER::new (
1638 padding => 4, 1686 padding => 4,
1639 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1642 can_hover => 1, 1689 can_hover => 1,
1643 align => 0, 1690 align => 0,
1644 valign => 0, 1691 valign => 0,
1645 can_events => 1, 1692 can_events => 1,
… …
1663 1710
1664 if ($GRAB == $self) { 1711 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1712 $self->{fg} = $self->{active_fg};
1666 } 1713 }
1667 1714
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1715 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1717 glColor 0, 0, 0, 1;
1673 1718
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1720
1676 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1722
1679 $self->SUPER::_draw; 1723 $self->SUPER::_draw;
1680} 1724}
1681 1725
1682############################################################################# 1726#############################################################################
… …
1696 1740
1697 $class->SUPER::new ( 1741 $class->SUPER::new (
1698 padding => 2, 1742 padding => 2,
1699 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 1747 state => 0,
1702 can_hover => 1, 1748 can_hover => 1,
1703 @_ 1749 @_
1704 ) 1750 )
1705} 1751}
… …
1729 1775
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1731 1777
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1779
1734 glEnable GL_BLEND; 1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1735 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1784 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1785}
1745 1786
1746############################################################################# 1787#############################################################################
1747 1788
1748package CFClient::UI::Image; 1789package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1832 glTranslate 0, -$self->{w}, 0;
1792 1833
1793 ($w, $h) = ($h, $w); 1834 ($w, $h) = ($h, $w);
1794 } 1835 }
1795 1836
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1839
1801 $tex->draw_quad (0, 0, $w, $h); 1840 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1841
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1842 glDisable GL_TEXTURE_2D;
1805} 1843}
1806 1844
1807############################################################################# 1845#############################################################################
1808 1846
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1998 2036
1999sub new { 2037sub new {
2000 my $class = shift; 2038 my $class = shift;
2001 2039
2002 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
2003 2041
2004 # TODO: 0-width page 2042 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2044 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2011 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2013 vertical => 0, 2053 vertical => 0,
2014 can_hover => 1, 2054 can_hover => 1,
2015 inner_pad => 5, 2055 inner_pad => 0.02,
2016 @_ 2056 @_
2017 ); 2057 );
2018 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
2019 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
2020} 2086}
2021 2087
2022sub size_request { 2088sub size_request {
2023 my ($self) = @_; 2089 my ($self) = @_;
2024 2090
… …
2037 2103
2038sub mouse_motion { 2104sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2040 2106
2041 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2043 2125
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2045 2127
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2048 2129
2049 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2132
2055 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2056 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
2057 } 2140 });
2058}
2059 2141
2060# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2143}
2067 2144
2068sub _draw { 2145sub _draw {
2069 my ($self) = @_; 2146 my ($self) = @_;
2070 2147
2071 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2072 2149
2073 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2074 2151
2075 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2077 2154
2155 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2157 }
2083 2158
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2161
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2164
2110 # draw background 2165 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2167
2113 # draw handle 2168 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2170
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2118} 2172}
2119 2173
2120############################################################################# 2174#############################################################################
2121 2175
… …
2132 fontsize => 1, 2186 fontsize => 1,
2133 can_events => 0, 2187 can_events => 0,
2134 #font => default_font 2188 #font => default_font
2135 @_, 2189 @_,
2136 2190
2137 layout => (new CFClient::Layout), 2191 layout => (new CFClient::Layout 1),
2138 par => [], 2192 par => [],
2139 height => 0, 2193 height => 0,
2140 children => [ 2194 children => [
2141 (new CFClient::UI::Empty expand => 1), 2195 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2196 (new CFClient::UI::Slider vertical => 1),
… …
2160 2214
2161 my $layout = $self->{layout}; 2215 my $layout = $self->{layout};
2162 2216
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w}); 2218 $layout->set_width ($self->{children}[0]{w});
2165 $layout->set_text ($text); 2219 $layout->set_markup ($text);
2166 2220
2167 ($layout->size)[1] 2221 ($layout->size)[1]
2168} 2222}
2169 2223
2170sub reflow { 2224sub reflow {
… …
2208 2262
2209 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2210 2264
2211 delete $self->{texture}; 2265 delete $self->{texture};
2212 2266
2213 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2214 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2269 my $height = 0;
2216 2270
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2218 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
2223 2277
2224 delete $self->{texture}; 2278 delete $self->{texture};
2225 } 2279 }
2226 2280
2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2228 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2230 2284
2231 glEnable GL_BLEND;
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235 2287
2236 my $top = int $self->{children}[1]{range}[0]; 2288 my $top = int $self->{children}[1]{range}[0];
2237 2289
… …
2246 2298
2247 for my $par (@{$self->{par}}) { 2299 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2300 my $h = $par->[0];
2249 2301
2250 if ($y0 < $y + $h && $y < $y1) { 2302 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2251 $layout->set_text ($par->[2]); 2304 $layout->set_markup ($par->[2]);
2252 2305
2253 glColor @{ $par->[1] };
2254 my ($W, $H) = $layout->size; 2306 my ($W, $H) = $layout->size;
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2256 } 2308 }
2257 2309
2258 $y += $h; 2310 $y += $h;
2259 } 2311 }
2260 2312
2261 glDisable GL_TEXTURE_2D; 2313 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND;
2263 }; 2314 };
2264 }); 2315 });
2265} 2316}
2266 2317
2267sub _draw { 2318sub _draw {
2268 my ($self) = @_; 2319 my ($self) = @_;
2269 2320
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2326
2279 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2280 2328
2281} 2329}
2282 2330
… …
2376 @_, 2424 @_,
2377 can_events => 0, 2425 can_events => 0,
2378 ) 2426 )
2379} 2427}
2380 2428
2381sub set_markup { 2429sub set_tooltip_from {
2382 my ($self, $text) = @_; 2430 my ($self, $widget) = @_;
2383 2431
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2432 $self->add (new CFClient::UI::Label
2385 $self->{label}->set_markup ($text); 2433 markup => $widget->{tooltip},
2386 $self->add ($self->{label}); 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8,
2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 );
2387} 2440}
2388 2441
2389sub size_request { 2442sub size_request {
2390 my ($self) = @_; 2443 my ($self) = @_;
2391
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393 2444
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2446
2396 ($w + 4, $h + 4) 2447 ($w + 4, $h + 4)
2397} 2448}
… …
2403} 2454}
2404 2455
2405sub _draw { 2456sub _draw {
2406 my ($self) = @_; 2457 my ($self) = @_;
2407 2458
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2459 glTranslate 0.375, 0.375;
2410 2460
2411 my ($w, $h) = @$self{qw(w h)}; 2461 my ($w, $h) = @$self{qw(w h)};
2412 2462
2413 glColor 1, 0.8, 0.4; 2463 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2474 glVertex 0 , $h;
2425 glVertex $w, $h; 2475 glVertex $w, $h;
2426 glVertex $w, 0; 2476 glVertex $w, 0;
2427 glEnd; 2477 glEnd;
2428 2478
2429 glPopMatrix; 2479 glTranslate 2 - 0.375, 2 - 0.375;
2430
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2480 $self->SUPER::_draw;
2433} 2481}
2434 2482
2435############################################################################# 2483#############################################################################
2436 2484
… …
2441use CFClient::OpenGL; 2489use CFClient::OpenGL;
2442 2490
2443sub new { 2491sub new {
2444 my $class = shift; 2492 my $class = shift;
2445 2493
2446 $class->SUPER::new ( 2494 my $self = $class->SUPER::new (
2447 aspect => 1, 2495 aspect => 1,
2448 @_, 2496 @_,
2449 ) 2497 );
2498
2499 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self);
2501
2502 $self->{timer} = Event->timer (
2503 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2504 hard => 1,
2505 interval => $self->{animspeed},
2506 cb => sub {
2507 ++$widget->{frame};
2508 $widget->update;
2509 },
2510 );
2511 }
2512
2513 $self
2450} 2514}
2451 2515
2452sub size_request { 2516sub size_request {
2453 (32, 8) 2517 (32, 8)
2454} 2518}
2455 2519
2456sub _draw { 2520sub _draw {
2457 my ($self) = @_; 2521 my ($self) = @_;
2458 2522
2459 return unless $::CONN;#d# manage and cache textures differently 2523 return unless $::CONN;#d# manage and cache textures differently
2524
2525 my $face;
2526
2527 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}];
2529
2530 $face = $anim->[ $self->{frame} % @$anim ]
2531 if $anim && @$anim;
2532 }
2533
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 2535
2462 # TODO animation
2463 if ($tex) { 2536 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2537 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2539 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2541 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2542 }
2543}
2544
2545sub DESTROY {
2546 my ($self) = @_;
2547
2548 $self->{timer}->cancel
2549 if $self->{timer};
2550
2551 $self->SUPER::DESTROY;
2473} 2552}
2474 2553
2475############################################################################# 2554#############################################################################
2476 2555
2477package CFClient::UI::InventoryItem; 2556package CFClient::UI::InventoryItem;
2478 2557
2479our @ISA = CFClient::UI::HBox::; 2558our @ISA = CFClient::UI::HBox::;
2559
2560sub _item_to_desc {
2561 my ($item) = @_;
2562
2563 my $desc =
2564 $item->{nrof} < 2
2565 ? $item->{name}
2566 : "$item->{nrof} × $item->{name_pl}";
2567
2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2569 and $desc .= " (open)";
2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2571 and $desc .= " (applied)";
2572 $item->{flags} & Crossfire::Protocol::F_UNPAID
2573 and $desc .= " (unpaid)";
2574 $item->{flags} & Crossfire::Protocol::F_MAGIC
2575 and $desc .= " (magic)";
2576 $item->{flags} & Crossfire::Protocol::F_CURSED
2577 and $desc .= " (cursed)";
2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2579 and $desc .= " (damned)";
2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2581 and $desc .= " *";
2582
2583 $desc
2584}
2480 2585
2481sub new { 2586sub new {
2482 my $class = shift; 2587 my $class = shift;
2483 2588
2484 my %args = @_; 2589 my %args = @_;
2485 2590
2486 my $item = $args{item}; 2591 my $item = delete $args{item};
2487 2592
2488 my $desc = $item->{nrof} < 2 2593 my $desc = _item_to_desc ($item);
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492 2594
2493 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
2494 can_hover => 1, 2596 can_hover => 1,
2495 can_events => 1, 2597 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc) 2598 tooltip => ((CFClient::UI::Label::escape $desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub { 2600 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_; 2601 my ($self, $ev, $x, $y) = @_;
2500 2602
2501 # todo: maybe put examine on 1? but should just be a tooltip :( 2603 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) { 2604 if ($ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag};
2606
2607 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT;
2609 }
2610
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2611 $::CONN->send ("move $targ $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) { 2612 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}"); 2613 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) { 2614 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new ( 2615 my @menu_items = (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2617 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 (
2620 $item->{flags} & Crossfire::Protocol::F_LOCKED
2621 ? (
2622 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2623 )
2624 : (
2625 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2626 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2627 )
2517 ], 2628 ),
2518 )->popup ($ev); 2629 );
2630
2631 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2519 } 2632 }
2520 2633
2521 1 2634 1
2522 }, 2635 },
2523 %args 2636 %args
2524 ); 2637 );
2638
2639
2525 $self->add(new CFClient::UI::Face 2640 $self->add (new CFClient::UI::Face
2526 can_events => 0, 2641 can_events => 0,
2527 face => $item->{face}, 2642 face => $item->{face},
2528 anim => $item->{anim}, 2643 anim => $item->{anim},
2529 animspeed => $item->{animspeed}); 2644 animspeed => $item->{animspeed},
2530 $self->add(new CFClient::UI::Label 2645 );
2531 can_events => 0, 2646
2532 text => $desc); 2647 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2648
2649 $self->{item} = $item;
2650
2651 $self->update_item;
2533 2652
2534 $self 2653 $self
2654}
2655
2656sub update_item {
2657 my ($self) = @_;
2658
2659 my $desc = _item_to_desc ($self->{item});
2660
2661 $self->{name_lbl}->set_text ($desc);
2535} 2662}
2536 2663
2537############################################################################# 2664#############################################################################
2538 2665
2539package CFClient::UI::Inventory; 2666package CFClient::UI::Inventory;
… …
2555 my ($self, $items) = @_; 2682 my ($self, $items) = @_;
2556 2683
2557 $self->{scrolled}->clear; 2684 $self->{scrolled}->clear;
2558 return unless $items; 2685 return unless $items;
2559 2686
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2687 my @items = sort {
2688 ($a->{type} <=> $b->{type})
2689 or ($a->{name} cmp $b->{name})
2690 } @$items;
2561 2691
2562 $self->{real_items} = \@items; 2692 $self->{real_items} = \@items;
2563 2693
2564 for my $item (@items) { 2694 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2695 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2696 $item->update_item ();
2570 } 2697 }
2698
2699 $self->{scrolled}->add (@items);
2571 2700
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2701# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573} 2702}
2574 2703
2575sub size_request { 2704sub size_request {
… …
2649 } 2778 }
2650} 2779}
2651 2780
2652############################################################################# 2781#############################################################################
2653 2782
2783package CFClient::UI::Statusbox;
2784
2785our @ISA = CFClient::UI::VBox::;
2786
2787sub new {
2788 my $class = shift;
2789
2790 $class->SUPER::new (
2791 fontsize => 0.8,
2792 @_,
2793 )
2794}
2795
2796sub reorder {
2797 my ($self) = @_;
2798 my $NOW = time;
2799
2800 while (my ($k, $v) = each %{ $self->{item} }) {
2801 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2802 }
2803
2804 my @widgets;
2805
2806 my @items = sort {
2807 $a->{pri} <=> $b->{pri}
2808 or $b->{id} <=> $a->{id}
2809 } values %{ $self->{item} };
2810
2811 my $count = 10 + 1;
2812 for my $item (@items) {
2813 last unless --$count;
2814
2815 push @widgets, $item->{label} ||= do {
2816 # TODO: doesn't handle markup well (read as: at all)
2817 my $short = $item->{count} > 1
2818 ? "<b>$item->{count} ×</b> $item->{text}"
2819 : $item->{text};
2820
2821 for ($short) {
2822 s/^\s+//;
2823 s/\s+/ /g;
2824 }
2825
2826 new CFClient::UI::Label
2827 markup => $short,
2828 tooltip => $item->{tooltip},
2829 tooltip_font => $::FONT_PROP,
2830 tooltip_width => 0.67,
2831 fontsize => $item->{fontsize} || $self->{fontsize},
2832 max_w => $::WIDTH * 0.44,
2833 fg => $item->{fg},
2834 can_events => 1,
2835 can_hover => 1
2836 };
2837 }
2838
2839 $self->clear;
2840 $self->SUPER::add (reverse @widgets);
2841}
2842
2843sub add {
2844 my ($self, $text, %arg) = @_;
2845
2846 $text =~ s/^\s+//;
2847 $text =~ s/\s+$//;
2848
2849 my $timeout = time + ((delete $arg{timeout}) || 60);
2850
2851 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2852
2853 if (my $item = $self->{item}{$group}) {
2854 if ($item->{text} eq $text) {
2855 $item->{count}++;
2856 } else {
2857 $item->{count} = 1;
2858 $item->{text} = $item->{tooltip} = $text;
2859 }
2860 $item->{id} = ++$self->{id};
2861 $item->{timeout} = $timeout;
2862 delete $item->{label};
2863 } else {
2864 $self->{item}{$group} = {
2865 id => ++$self->{id},
2866 text => $text,
2867 timeout => $timeout,
2868 tooltip => $text,
2869 fg => [0.8, 0.8, 0.8, 0.8],
2870 pri => 0,
2871 count => 1,
2872 %arg,
2873 };
2874 }
2875
2876 $self->reorder;
2877}
2878
2879sub reconfigure {
2880 my ($self) = @_;
2881
2882 delete $_->{label}
2883 for values %{ $self->{item} || {} };
2884
2885 $self->reorder;
2886 $self->SUPER::reconfigure;
2887}
2888
2889#############################################################################
2890
2654package CFClient::UI::Root; 2891package CFClient::UI::Root;
2655 2892
2656our @ISA = CFClient::UI::Container::; 2893our @ISA = CFClient::UI::Container::;
2657 2894
2658use CFClient::OpenGL; 2895use CFClient::OpenGL;
… …
2686} 2923}
2687 2924
2688sub size_allocate { 2925sub size_allocate {
2689 my ($self, $w, $h) = @_; 2926 my ($self, $w, $h) = @_;
2690 2927
2691 my $old_w = $self->{old_w}; 2928 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2692 my $old_h = $self->{old_h}; 2929 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2693 2930
2694 if ($old_w && $old_h) { 2931 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2695 for my $child ($self->children) { 2932 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706 2933
2707 for my $child ($self->children) { 2934 for my $child ($self->children) {
2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2935 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709 2936
2937 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2938 if exists $child->{req_x};
2939
2940 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2941 if exists $child->{req_y};
2942
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2943 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2944 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2945
2712 $child->configure ($X, $Y, $W, $H); 2946 $child->configure ($X, $Y, $W, $H);
2713 } 2947 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717} 2948}
2718 2949
2719sub coord2local { 2950sub coord2local {
2720 my ($self, $x, $y) = @_; 2951 my ($self, $x, $y) = @_;
2721 2952
… …
2734 $self->check_size; 2965 $self->check_size;
2735 $::WANT_REFRESH++; 2966 $::WANT_REFRESH++;
2736} 2967}
2737 2968
2738sub add { 2969sub add {
2739 my ($self, $child) = @_; 2970 my ($self, @children) = @_;
2740 2971
2972 for my $child (@children) {
2973 $child->{toplevel} = 1;
2974
2741 # integerise window positions 2975 # integerise window positions
2742 $child->{x} = int $child->{x}; 2976 $child->{x} = int $child->{x};
2743 $child->{y} = int $child->{y}; 2977 $child->{y} = int $child->{y};
2978 }
2744 2979
2745 $self->SUPER::add ($child); 2980 $self->SUPER::add (@children);
2746} 2981}
2747 2982
2748sub on_refresh { 2983sub on_refresh {
2749 my ($self, $id, $cb) = @_; 2984 my ($self, $id, $cb) = @_;
2750 2985
2751 $self->{refresh_hook}{$id} = $cb; 2986 $self->{refresh_hook}{$id} = $cb;
2752} 2987}
2753 2988
2989sub on_post_alloc {
2990 my ($self, $id, $cb) = @_;
2991
2992 $self->{post_alloc_hook}{$id} = $cb;
2993}
2994
2754sub draw { 2995sub draw {
2755 my ($self) = @_; 2996 my ($self) = @_;
2997
2998 while ($self->{refresh_hook}) {
2999 $_->()
3000 for values %{delete $self->{refresh_hook}};
3001 }
2756 3002
2757 if ($self->{check_size}) { 3003 if ($self->{check_size}) {
2758 my @queue = ([], []); 3004 my @queue = ([], []);
2759 3005
2760 for (;;) { 3006 for (;;) {
… …
2768 3014
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3015 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)} 3016 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request; 3017 : $widget->size_request;
2772 3018
3019 if (delete $widget->{force_alloc}
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3020 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3021 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3022
2774 $widget->{req_w} = $w; 3023 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h; 3024 $widget->{req_h} = $h;
2776 3025
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3026 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2778 3027
2779 $widget->{parent}->check_size 3028 $widget->{parent}->check_size
2780 if $widget->{parent}; 3029 if $widget->{parent};
2781 } 3030 }
2782 } 3031 }
2783 } 3032 }
2784 3033
2785 while ($self->{size_alloc}) { 3034 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) { 3035 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_; 3036 my ($widget, $w, $h) = @$_;
3037
3038 $w = 0 if $w < 0;
3039 $h = 0 if $h < 0;
2788 3040
2789 $widget->{w} = $w; 3041 $widget->{w} = $w;
2790 $widget->{h} = $h; 3042 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h); 3043 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h); 3044 $widget->emit (size_allocate => $w, $h);
2793 } 3045 }
2794 } 3046 }
2795 3047
2796 while ($self->{refresh_hook}) { 3048 while ($self->{post_alloc_hook}) {
2797 $_->() 3049 $_->()
2798 for values %{delete $self->{refresh_hook}}; 3050 for values %{delete $self->{post_alloc_hook}};
2799 } 3051 }
2800 3052
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3053 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3054 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 3055 glClear GL_COLOR_BUFFER_BIT;
… …
2814############################################################################# 3066#############################################################################
2815 3067
2816package CFClient::UI; 3068package CFClient::UI;
2817 3069
2818$ROOT = new CFClient::UI::Root; 3070$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip; 3071$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820 3072
28211 30731
2822 3074

Diff Legend

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