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

Diff Legend

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