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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.220 by root, Mon May 22 03:28:55 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
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 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $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) = @_;
… …
382sub set_parent { 424sub set_parent {
383 my ($self, $parent) = @_; 425 my ($self, $parent) = @_;
384 426
385 Scalar::Util::weaken ($self->{parent} = $parent); 427 Scalar::Util::weaken ($self->{parent} = $parent);
386 428
429 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 430 $self->check_size
388 unless exists $self->{req_w}; 431 unless exists $self->{req_w};
389} 432}
390 433
391sub check_size { 434sub check_size {
392 my ($self) = @_; 435 my ($self, $forced) = @_;
393 436
437 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 439}
396 440
397sub update { 441sub update {
398 my ($self) = @_; 442 my ($self) = @_;
… …
414} 458}
415 459
416sub DESTROY { 460sub DESTROY {
417 my ($self) = @_; 461 my ($self) = @_;
418 462
463 delete $WIDGET{$self+0};
419 #$self->deactivate; 464 #$self->deactivate;
420} 465}
421 466
422############################################################################# 467#############################################################################
423 468
… …
432 my $class = shift; 477 my $class = shift;
433 478
434 # range [value, low, high, page] 479 # range [value, low, high, page]
435 480
436 $class->SUPER::new ( 481 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 482 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 483 #active_bg => [1, 1, 1, 0.5],
439 @_ 484 @_
440 ) 485 )
441} 486}
442 487
443sub _draw { 488sub _draw {
444 my ($self) = @_; 489 my ($self) = @_;
445 490
491 my $color = $FOCUS == $self && $self->{active_bg}
492 ? $self->{active_bg}
493 : $self->{bg};
494
495 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 496 my ($w, $h) = @$self{qw(w h)};
447 497
448 glEnable GL_BLEND; 498 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 500 glColor @$color;
451 501
452 glBegin GL_QUADS; 502 glBegin GL_QUADS;
453 glVertex 0 , 0; 503 glVertex 0 , 0;
454 glVertex 0 , $h; 504 glVertex 0 , $h;
455 glVertex $w, $h; 505 glVertex $w, $h;
456 glVertex $w, 0; 506 glVertex $w, 0;
457 glEnd; 507 glEnd;
458 508
459 glDisable GL_BLEND; 509 glDisable GL_BLEND;
510 }
460} 511}
461 512
462############################################################################# 513#############################################################################
463 514
464package CFClient::UI::Empty; 515package CFClient::UI::Empty;
… …
508 $self->{children} = [ 559 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 560 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 561 @{$self->{children}}, @widgets
511 ]; 562 ];
512 563
513 $self->check_size; 564 $self->check_size (1);
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) = @_;
… …
668 my $tex = $self->{texture} 712 my $tex = $self->{texture}
669 or return; 713 or return;
670 714
671 glEnable GL_TEXTURE_2D; 715 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673 glColor 0, 0, 0, 1; 717 glColor 1, 1, 1, 1;
674 718
675 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
676 720
677 glDisable GL_TEXTURE_2D; 721 glDisable GL_TEXTURE_2D;
678} 722}
… …
761 $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}));
762 }, 806 },
763 ; 807 ;
764 808
765 $self = $class->SUPER::new ( 809 $self = $class->SUPER::new (
766 vp => (new CFClient::UI::ViewPort), 810 vp => (new CFClient::UI::ViewPort expand => 1),
767 slider => $slider, 811 slider => $slider,
768 @_, 812 @_,
769 ); 813 );
770 814
771 $self->{vp}->add ($self->{scrolled}); 815 $self->{vp}->add ($self->{scrolled});
… …
773 $self->add ($self->{slider}); 817 $self->add ($self->{slider});
774 818
775 $self 819 $self
776} 820}
777 821
778#TODO# update range on size_allocate depeneing on child 822#TODO# update range on size_allocate depending on child
779# update viewport offset on scroll 823# update viewport offset on scroll
780 824
781############################################################################# 825#############################################################################
782 826
783package CFClient::UI::Frame; 827package CFClient::UI::Frame;
… …
787use CFClient::OpenGL; 831use CFClient::OpenGL;
788 832
789sub new { 833sub new {
790 my $class = shift; 834 my $class = shift;
791 835
792 my $self = $class->SUPER::new ( 836 $class->SUPER::new (
793 bg => [1, 1, 1, 1], 837 bg => undef,
794 border_bg => [1, 1, 1, 1],
795 border => 0.8,
796 @_ 838 @_,
797 ); 839 )
798
799 $self
800} 840}
801 841
802sub _draw { 842sub _draw {
803 my ($self) = @_; 843 my ($self) = @_;
804 844
805 my ($w, $h) = ($self->{w}, $self->{h}); 845 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)};
806 847
807 glEnable GL_BLEND; 848 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 850 glColor @{ $self->{bg} };
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811 851
812# glBegin GL_QUADS; 852 glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0; 853 glVertex 0 , 0;
815# glVertex 0 , $h; 854 glVertex 0 , $h;
816# glVertex $w, $h; 855 glVertex $w, $h;
817# glVertex $w, 0; 856 glVertex $w, 0;
818# glEnd; 857 glEnd;
819 858
820
821 $self->child->draw;
822 glDisable GL_BLEND; 859 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D; 860 }
861
862 $self->SUPER::_draw;
824} 863}
825 864
826############################################################################# 865#############################################################################
827 866
828package CFClient::UI::FancyFrame; 867package CFClient::UI::FancyFrame;
… …
842 881
843 my $self = $class->SUPER::new ( 882 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1], 883 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1], 884 border_bg => [1, 1, 1, 1],
846 border => 0.6, 885 border => 0.6,
886 toplevel => 1,
847 can_events => 1, 887 can_events => 1,
848 @_ 888 @_
849 ); 889 );
850 890
851 $self->{title} &&= new CFClient::UI::Label 891 $self->{title} &&= new CFClient::UI::Label
… …
876 my ($self, $w, $h) = @_; 916 my ($self, $w, $h) = @_;
877 917
878 $h -= List::Util::max 0, $self->border * 2; 918 $h -= List::Util::max 0, $self->border * 2;
879 $w -= List::Util::max 0, $self->border * 2; 919 $w -= List::Util::max 0, $self->border * 2;
880 920
881 $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)
882 if $self->{title}; 922 if $self->{title};
883 923
884 $self->child->configure ($self->border, $self->border, $w, $h); 924 $self->child->configure ($self->border, $self->border, $w, $h);
885} 925}
886 926
… …
944 my ($self) = @_; 984 my ($self) = @_;
945 985
946 my ($w, $h ) = ($self->{w}, $self->{h}); 986 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
948 988
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 989 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 991
954 my $border = $self->border; 992 my $border = $self->border;
955 993
956 glColor @{ $self->{border_bg} }; 994 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 995 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
961 999
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 1001 my $bg = $tex[0];
964 1002
965 # TODO: repeat texture not scale 1003 # TODO: repeat texture not scale
… …
969 glColor @{ $self->{bg} }; 1007 glColor @{ $self->{bg} };
970 1008
971 $bg->{s} = $rep_x; 1009 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y; 1010 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1; 1011 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 }
975 1014
976 glDisable GL_TEXTURE_2D; 1015 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 1016
980 $self->{title}->draw if $self->{title}; 1017 $self->{title}->draw if $self->{title};
981 1018
982 $self->child->draw; 1019 $self->child->draw;
983} 1020}
… …
1250 1287
1251############################################################################# 1288#############################################################################
1252 1289
1253package CFClient::UI::Label; 1290package CFClient::UI::Label;
1254 1291
1255our @ISA = CFClient::UI::Base::; 1292our @ISA = CFClient::UI::DrawBG::;
1256 1293
1257use CFClient::OpenGL; 1294use CFClient::OpenGL;
1258 1295
1259sub new { 1296sub new {
1260 my ($class, %arg) = @_; 1297 my ($class, %arg) = @_;
1261 1298
1262 my $self = $class->SUPER::new ( 1299 my $self = $class->SUPER::new (
1263 fg => [1, 1, 1], 1300 fg => [1, 1, 1],
1301 #bg => none
1302 #active_bg => none
1264 #font => default_font 1303 #font => default_font
1265 #text => initial text 1304 #text => initial text
1266 #markup => initial narkup 1305 #markup => initial narkup
1306 #max_w => maximum pixel width
1307 ellipsise => 3, # end
1267 layout => (new CFClient::Layout), 1308 layout => (new CFClient::Layout),
1268 fontsize => 1, 1309 fontsize => 1,
1269 align => -1, 1310 align => -1,
1270 valign => -1, 1311 valign => -1,
1271 padding => 2, 1312 padding => 2,
… …
1286 } 1327 }
1287 1328
1288 $self 1329 $self
1289} 1330}
1290 1331
1291sub escape { 1332sub escape($) {
1292 local $_ = $_[1]; 1333 local $_ = $_[0];
1293 1334
1294 s/&/&amp;/g; 1335 s/&/&amp;/g;
1295 s/>/&gt;/g; 1336 s/>/&gt;/g;
1296 s/</&lt;/g; 1337 s/</&lt;/g;
1297 1338
1298 $_[1] 1339 $_
1299} 1340}
1300 1341
1301sub update { 1342sub update {
1302 my ($self) = @_; 1343 my ($self) = @_;
1303 1344
… …
1336sub size_request { 1377sub size_request {
1337 my ($self) = @_; 1378 my ($self) = @_;
1338 1379
1339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1380 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $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});
1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342 1385
1343 my ($w, $h) = $self->{layout}->size; 1386 my ($w, $h) = $self->{layout}->size;
1344 1387
1345 if (exists $self->{template}) { 1388 if (exists $self->{template}) {
… …
1375} 1418}
1376 1419
1377sub _draw { 1420sub _draw {
1378 my ($self) = @_; 1421 my ($self) = @_;
1379 1422
1423 $self->SUPER::_draw; # draw background, if applicable
1424
1380 my $tex = $self->{texture} ||= do { 1425 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}}); 1426 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1427 $self->{layout}->set_font ($self->{font}) if $self->{font};
1383 $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});
1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1432
1386 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1433 my $tex = new_from_layout CFClient::Texture $self->{layout};
1387 1434
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5; 1437 : ($self->{w} - $tex->{w}) * 0.5);
1391 1438
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394 : ($self->{h} - $tex->{h}) * 0.5; 1441 : ($self->{h} - $tex->{h}) * 0.5);
1395 1442
1396 $tex 1443 $tex
1397 }; 1444 };
1398 1445
1399 glEnable GL_TEXTURE_2D; 1446 glEnable GL_TEXTURE_2D;
… …
1454sub set_text { 1501sub set_text {
1455 my ($self, $text) = @_; 1502 my ($self, $text) = @_;
1456 1503
1457 $self->{cursor} = length $text; 1504 $self->{cursor} = length $text;
1458 $self->_set_text ($text); 1505 $self->_set_text ($text);
1506 $self->update;
1459 $self->check_size; 1507 $self->check_size;
1460 $self->update;
1461} 1508}
1462 1509
1463sub get_text { 1510sub get_text {
1464 $_[0]{text} 1511 $_[0]{text}
1465} 1512}
… …
1485 my $sym = $ev->{sym}; 1532 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1533 my $uni = $ev->{unicode};
1487 1534
1488 my $text = $self->get_text; 1535 my $text = $self->get_text;
1489 1536
1490 if ($sym == 8) { 1537 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1538 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1539 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1540 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1541 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1542 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1543 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1544 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1545 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1546 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1547 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1548 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1549 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1550 $self->emit ('escape');
1504 } elsif ($uni) { 1551 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1552 substr $text, $self->{cursor}++, 0, chr $uni;
1506 } 1553 }
1507 1554
1508 $self->_set_text ($text); 1555 $self->_set_text ($text);
1509 $self->update; 1556 $self->update;
1557 $self->check_size;
1510} 1558}
1511 1559
1512sub focus_in { 1560sub focus_in {
1513 my ($self) = @_; 1561 my ($self) = @_;
1514 1562
… …
1643 my $class = shift; 1691 my $class = shift;
1644 1692
1645 $class->SUPER::new ( 1693 $class->SUPER::new (
1646 padding => 4, 1694 padding => 4,
1647 fg => [1, 1, 1], 1695 fg => [1, 1, 1],
1648 bg => [1, 1, 1, 0.2],
1649 active_fg => [0, 0, 1], 1696 active_fg => [0, 0, 1],
1650 can_hover => 1, 1697 can_hover => 1,
1651 align => 0, 1698 align => 0,
1652 valign => 0, 1699 valign => 0,
1653 can_events => 1, 1700 can_events => 1,
… …
1701 1748
1702 $class->SUPER::new ( 1749 $class->SUPER::new (
1703 padding => 2, 1750 padding => 2,
1704 fg => [1, 1, 1], 1751 fg => [1, 1, 1],
1705 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],
1706 state => 0, 1755 state => 0,
1707 can_hover => 1, 1756 can_hover => 1,
1708 @_ 1757 @_
1709 ) 1758 )
1710} 1759}
… …
1734 1783
1735 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;
1736 1785
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 1787
1788 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789
1739 glEnable GL_TEXTURE_2D; 1790 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 1791 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 1792 glDisable GL_TEXTURE_2D;
1746} 1793}
1747 1794
1748############################################################################# 1795#############################################################################
1749 1796
… …
1996 qw(s1_slider.png s1_slider_bg.png); 2043 qw(s1_slider.png s1_slider_bg.png);
1997 2044
1998sub new { 2045sub new {
1999 my $class = shift; 2046 my $class = shift;
2000 2047
2001 # range [value, low, high, page] 2048 # range [value, low, high, page, unit]
2002 2049
2003 # TODO: 0-width page 2050 # TODO: 0-width page
2004 # TODO: req_w/h are wrong with vertical 2051 # TODO: req_w/h are wrong with vertical
2005 # TODO: calculations are off 2052 # TODO: calculations are off
2006 my $self = $class->SUPER::new ( 2053 my $self = $class->SUPER::new (
2007 fg => [1, 1, 1], 2054 fg => [1, 1, 1],
2008 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],
2009 range => [0, 0, 100, 10], 2058 range => [0, 0, 100, 10],
2010 req_w => $::WIDTH / 80, 2059 req_w => $::WIDTH / 80,
2011 req_h => $::WIDTH / 80, 2060 req_h => $::WIDTH / 80,
2012 vertical => 0, 2061 vertical => 0,
2013 can_hover => 1, 2062 can_hover => 1,
2014 inner_pad => 5, 2063 inner_pad => 0.02,
2015 @_ 2064 @_
2016 ); 2065 );
2017 2066
2067 $self->set_value ($self->{range}[0]);
2068 $self->update;
2069
2018 $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 }
2019} 2094}
2020 2095
2021sub size_request { 2096sub size_request {
2022 my ($self) = @_; 2097 my ($self) = @_;
2023 2098
… …
2036 2111
2037sub mouse_motion { 2112sub mouse_motion {
2038 my ($self, $ev, $x, $y) = @_; 2113 my ($self, $ev, $x, $y) = @_;
2039 2114
2040 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
2041 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2132 my ($value, $lo, $hi, $page) = @{$self->{range}};
2042 2133
2043 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2134 my $inner_w = 1 - 2 * $self->{inner_pad};
2044 2135
2045 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2046 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2047 2137
2048 $x -= $inner_pad_px; # substract the padding 2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2049 $x = $x * ($hi - $lo) / $inner_w + $lo; 2139 $value = $self->{scale} * ($value - $lo);
2050 $x = $lo if $x < $lo;
2051 $x = $hi - $page if $x > $hi - $page;
2052 $self->{range}[0] = $x;
2053 2140
2054 $self->emit (changed => $x); 2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2055 $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;
2056 } 2148 });
2057}
2058 2149
2059# the inner_* stuff is for generating a padding for the slider handle, 2150 $self->SUPER::update;
2060# so that the handle doesn't leave the texture. This calculation isn't 100%
2061# correct propably, but it does the job for now
2062sub _calc_inner_pad_px {
2063 my ($self, $w) = @_;
2064 ($w / 100) * $self->{inner_pad} # % to pixels
2065} 2151}
2066 2152
2067sub _draw { 2153sub _draw {
2068 my ($self) = @_; 2154 my ($self) = @_;
2069 2155
2070 $self->SUPER::_draw (); 2156 $self->SUPER::_draw ();
2071 2157
2072 my ($w, $h) = @$self{qw(w h)}; 2158 glScale $self->{w}, $self->{h};
2073 2159
2074 if ($self->{vertical}) { 2160 if ($self->{vertical}) {
2075 # draw a vertical slider like a rotated horizontal slider 2161 # draw a vertical slider like a rotated horizontal slider
2076 2162
2163 glTranslate 1, 0, 0;
2077 glRotate 90, 0, 0, 1; 2164 glRotate 90, 0, 0, 1;
2078 glTranslate 0, -$self->{w}, 0;
2079
2080 ($w, $h) = ($h, $w);
2081 } 2165 }
2082 2166
2083 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2167 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2168 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085 2169
2086 my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088 $hi = $value + 1 if $lo == $hi;
2089
2090 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093 $page = int $page * $inner_w / ($hi - $lo);
2094 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096 $w -= $page;
2097 $page &= ~1;
2098 glTranslate $page * 0.5, 0, 0;
2099 $page ||= 2;
2100
2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106 2172
2107 # draw background 2173 # draw background
2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2174 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109 2175
2110 # draw handle 2176 # draw handle
2111 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112 2178
2113 glDisable GL_TEXTURE_2D; 2179 glDisable GL_TEXTURE_2D;
2114} 2180}
2115 2181
2116############################################################################# 2182#############################################################################
… …
2149 2215
2150 $self->{fontsize} = $fontsize; 2216 $self->{fontsize} = $fontsize;
2151 $self->reflow; 2217 $self->reflow;
2152} 2218}
2153 2219
2220sub size_allocate {
2221 my ($self, $w, $h) = @_;
2222
2223 $self->SUPER::size_allocate ($w, $h);
2224
2225 $self->{layout}->set_font ($self->{font}) if $self->{font};
2226 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227 $self->{layout}->set_width ($self->{children}[0]{w});
2228
2229 $self->reflow;
2230}
2231
2154sub text_height { 2232sub text_height {
2155 my ($self, $text) = @_; 2233 my ($self, $text, $indent) = @_;
2156 2234
2157 my $layout = $self->{layout}; 2235 my $layout = $self->{layout};
2158 2236
2159 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2160 $layout->set_width ($self->{children}[0]{w}); 2238 $layout->set_width ($self->{children}[0]{w} - $indent);
2161 $layout->set_markup ($text); 2239 $layout->set_markup ($text);
2162 2240
2163 ($layout->size)[1] 2241 ($layout->size)[1]
2164} 2242}
2165 2243
… …
2168 2246
2169 $self->{need_reflow}++; 2247 $self->{need_reflow}++;
2170 $self->update; 2248 $self->update;
2171} 2249}
2172 2250
2173sub size_allocate {
2174 my ($self, $w, $h) = @_;
2175
2176 $self->SUPER::size_allocate ($w, $h);
2177
2178 $self->{layout}->set_font ($self->{font}) if $self->{font};
2179 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2180 $self->{layout}->set_width ($self->{children}[0]{w});
2181
2182 $self->reflow;
2183}
2184
2185sub add_paragraph { 2251sub add_paragraph {
2186 my ($self, $color, $text) = @_; 2252 my ($self, $color, $text, $indent) = @_;
2187 2253
2188 #TODO: intelligently "reformat" paragraph 2254 #TODO: intelligently "reformat" paragraph
2189 2255
2256 for my $line (split /\n/, $text) {
2190 my $height = $self->text_height ($text); 2257 my $height = $self->text_height ($line);
2191
2192 $self->{height} += $height; 2258 $self->{height} += $height;
2193
2194 push @{$self->{par}}, [$height, $color, $text]; 2259 push @{$self->{par}}, [$height, $color, $indent, $line];
2260 }
2195 2261
2196 $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}];
2197 $self->{children}[1]->update; 2263 $self->{children}[1]->update;
2198} 2264}
2199 2265
… …
2204 2270
2205 return unless $self->{h} > 0; 2271 return unless $self->{h} > 0;
2206 2272
2207 delete $self->{texture}; 2273 delete $self->{texture};
2208 2274
2209 $ROOT->on_refresh ($self, sub { 2275 $ROOT->on_post_alloc ($self, sub {
2210 if (delete $self->{need_reflow}) { 2276 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2277 my $height = 0;
2212 2278
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2214 for @{$self->{par}}; 2280 for @{$self->{par}};
2215 2281
2216 $self->{height} = $height; 2282 $self->{height} = $height;
2217 2283
2218 $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;
2219 2286
2220 delete $self->{texture}; 2287 delete $self->{texture};
2221 } 2288 }
2222 2289
2223 $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 {
2224 glClearColor 0, 0, 0, 0; 2291 glClearColor 0.5, 0.5, 0.5, 0;
2225 glClear GL_COLOR_BUFFER_BIT; 2292 glClear GL_COLOR_BUFFER_BIT;
2226
2227 glEnable GL_TEXTURE_2D;
2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229 2293
2230 my $top = int $self->{children}[1]{range}[0]; 2294 my $top = int $self->{children}[1]{range}[0];
2231 2295
2232 my $y0 = $top; 2296 my $y0 = $top;
2233 my $y1 = $top + $self->{h}; 2297 my $y1 = $top + $self->{h};
… …
2236 2300
2237 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2238 2302
2239 $layout->set_font ($self->{font}) if $self->{font}; 2303 $layout->set_font ($self->{font}) if $self->{font};
2240 2304
2305 glEnable GL_BLEND;
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307
2241 for my $par (@{$self->{par}}) { 2308 for my $par (@{$self->{par}}) {
2242 my $h = $par->[0]; 2309 my $h = $par->[0];
2243 2310
2244 if ($y0 < $y + $h && $y < $y1) { 2311 if ($y0 < $y + $h && $y < $y1) {
2245 $layout->set_foreground (@{ $par->[1] }); 2312 $layout->set_foreground (@{ $par->[1] });
2313 $layout->set_width ($self->{w} - $par->[2]);
2246 $layout->set_markup ($par->[2]); 2314 $layout->set_markup ($par->[3]);
2247 2315
2248 my ($W, $H) = $layout->size; 2316 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2249 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2317
2318 glRasterPos $par->[2], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2250 } 2320 }
2251 2321
2252 $y += $h; 2322 $y += $h;
2253 } 2323 }
2254 2324
2255 glDisable GL_TEXTURE_2D; 2325 glDisable GL_BLEND;
2256 }; 2326 };
2257 }); 2327 });
2258} 2328}
2259 2329
2260sub _draw { 2330sub _draw {
2261 my ($self) = @_; 2331 my ($self) = @_;
2262 2332
2263 glEnable GL_TEXTURE_2D; 2333 glEnable GL_TEXTURE_2D;
2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2265 glColor 1, 1, 1, 1; 2335 glColor 1, 1, 1, 1;
2266 $self->{texture}->draw_quad_alpha_premultiplied (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});
2267 glDisable GL_TEXTURE_2D; 2337 glDisable GL_TEXTURE_2D;
2268 2338
2269 $self->{children}[1]->draw; 2339 $self->{children}[1]->draw;
2270 2340
2271} 2341}
… …
2369} 2439}
2370 2440
2371sub set_tooltip_from { 2441sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2442 my ($self, $widget) = @_;
2373 2443
2374 $self->{label} = new CFClient::UI::Label 2444 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2445 markup => $widget->{tooltip},
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2447 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2448 fg => [0, 0, 0, 1],
2449 ellipsise => 0,
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2450 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2451 );
2381 $self->add ($self->{label});
2382} 2452}
2383 2453
2384sub size_request { 2454sub size_request {
2385 my ($self) = @_; 2455 my ($self) = @_;
2386 2456
… …
2396} 2466}
2397 2467
2398sub _draw { 2468sub _draw {
2399 my ($self) = @_; 2469 my ($self) = @_;
2400 2470
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2471 glTranslate 0.375, 0.375;
2403 2472
2404 my ($w, $h) = @$self{qw(w h)}; 2473 my ($w, $h) = @$self{qw(w h)};
2405 2474
2406 glColor 1, 0.8, 0.4; 2475 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2486 glVertex 0 , $h;
2418 glVertex $w, $h; 2487 glVertex $w, $h;
2419 glVertex $w, 0; 2488 glVertex $w, 0;
2420 glEnd; 2489 glEnd;
2421 2490
2422 glPopMatrix; 2491 glTranslate 2 - 0.375, 2 - 0.375;
2423
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2492 $self->SUPER::_draw;
2426} 2493}
2427 2494
2428############################################################################# 2495#############################################################################
2429 2496
… …
2434use CFClient::OpenGL; 2501use CFClient::OpenGL;
2435 2502
2436sub new { 2503sub new {
2437 my $class = shift; 2504 my $class = shift;
2438 2505
2439 $class->SUPER::new ( 2506 my $self = $class->SUPER::new (
2440 aspect => 1, 2507 aspect => 1,
2441 @_, 2508 @_,
2442 ) 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
2443} 2526}
2444 2527
2445sub size_request { 2528sub size_request {
2446 (32, 8) 2529 (32, 8)
2447} 2530}
2448 2531
2449sub _draw { 2532sub _draw {
2450 my ($self) = @_; 2533 my ($self) = @_;
2451 2534
2452 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
2453 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2454 2547
2455 # TODO animation
2456 if ($tex) { 2548 if ($tex) {
2457 glEnable GL_TEXTURE_2D; 2549 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2551 glColor 1, 1, 1, 1;
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461 glDisable GL_TEXTURE_2D; 2553 glDisable GL_TEXTURE_2D;
2462 } 2554 }
2463} 2555}
2464 2556
2557sub DESTROY {
2558 my ($self) = @_;
2559
2560 $self->{timer}->cancel
2561 if $self->{timer};
2562
2563 $self->SUPER::DESTROY;
2564}
2565
2465############################################################################# 2566#############################################################################
2466 2567
2467package CFClient::UI::InventoryItem; 2568package CFClient::UI::InventoryItem;
2468 2569
2469our @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}
2470 2597
2471sub new { 2598sub new {
2472 my $class = shift; 2599 my $class = shift;
2473 2600
2474 my %args = @_; 2601 my %args = @_;
2475 2602
2476 my $item = delete $args{item}; 2603 my $item = delete $args{item};
2477 2604
2478 my $desc = $item->{nrof} < 2 2605 my $desc = _item_to_desc ($item);
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482 2606
2483 my $self = $class->SUPER::new ( 2607 my $self = $class->SUPER::new (
2484 can_hover => 1, 2608 can_hover => 1,
2485 can_events => 1, 2609 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc) 2610 tooltip => ((CFClient::UI::Label::escape $desc)
2487 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2488 connect_button_down => sub { 2612 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_; 2613 my ($self, $ev, $x, $y) = @_;
2490 2614
2491 # 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 :(
2492 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
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2623 $::CONN->send ("move $targ $item->{tag} 0");
2494 } elsif ($ev->{button} == 2) { 2624 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}"); 2625 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) { 2626 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new ( 2627 my @menu_items = (
2498 items => [
2499 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2505 ["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}) }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2507 ], 2640 ),
2508 )->popup ($ev); 2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2509 } 2644 }
2510 2645
2511 1 2646 1
2512 }, 2647 },
2513 %args 2648 %args
2514 ); 2649 );
2650
2515 2651
2516 $self->add (new CFClient::UI::Face 2652 $self->add (new CFClient::UI::Face
2517 can_events => 0, 2653 can_events => 0,
2518 face => $item->{face}, 2654 face => $item->{face},
2519 anim => $item->{anim}, 2655 anim => $item->{anim},
2520 animspeed => $item->{animspeed}, 2656 animspeed => $item->{animspeed},
2521 ); 2657 );
2522 2658
2523 $self->add (new CFClient::UI::Label 2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2524 can_events => 0, 2660
2525 text => $desc, 2661 $self->{item} = $item;
2526 ); 2662
2663 $self->update_item;
2527 2664
2528 $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);
2529} 2674}
2530 2675
2531############################################################################# 2676#############################################################################
2532 2677
2533package CFClient::UI::Inventory; 2678package CFClient::UI::Inventory;
… …
2549 my ($self, $items) = @_; 2694 my ($self, $items) = @_;
2550 2695
2551 $self->{scrolled}->clear; 2696 $self->{scrolled}->clear;
2552 return unless $items; 2697 return unless $items;
2553 2698
2554 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;
2555 2703
2556 $self->{real_items} = \@items; 2704 $self->{real_items} = \@items;
2557 2705
2558 for my $item (@items) { 2706 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2564 } 2709 }
2710
2711 $self->{scrolled}->add (@items);
2565 2712
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567} 2714}
2568 2715
2569sub size_request { 2716sub size_request {
… …
2647 2794
2648package CFClient::UI::Statusbox; 2795package CFClient::UI::Statusbox;
2649 2796
2650our @ISA = CFClient::UI::VBox::; 2797our @ISA = CFClient::UI::VBox::;
2651 2798
2799sub new {
2800 my $class = shift;
2801
2802 $class->SUPER::new (
2803 fontsize => 0.8,
2804 @_,
2805 )
2806}
2807
2652sub reorder { 2808sub reorder {
2653 my ($self) = @_; 2809 my ($self) = @_;
2654 my $NOW = time; 2810 my $NOW = time;
2655 2811
2656 while (my ($k, $v) = each %{ $self->{item} }) { 2812 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2813 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 2814 }
2659 2815
2660 my @widgets; 2816 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2817
2818 my @items = sort {
2819 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} };
2822
2662 my $count = 10 + 1; 2823 my $count = 10 + 1;
2663 for my $item (@items) { 2824 for my $item (@items) {
2664 last unless --$count; 2825 last unless --$count;
2665 2826
2666 push @widgets, $item->{label} ||= do { 2827 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 2828 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 2829 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text};
2832
2669 for ($short) { 2833 for ($short) {
2670 s/^\s+//; 2834 s/^\s+//;
2671 s/\012.*//s; 2835 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 } 2836 }
2675 2837
2676 new CFClient::UI::Label 2838 new CFClient::UI::Label
2677 markup => $short, 2839 markup => $short,
2678 tooltip => delete $item->{tooltip}, 2840 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 2841 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 2842 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 2843 fontsize => $item->{fontsize} || $self->{fontsize},
2682 color => delete $item->{color}, 2844 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg},
2683 can_events => 1, 2846 can_events => 1,
2684 can_hover => 1, 2847 can_hover => 1
2685 }; 2848 };
2686 } 2849 }
2687 2850
2688 $self->clear; 2851 $self->clear;
2689 $self->SUPER::add (@widgets); 2852 $self->SUPER::add (reverse @widgets);
2690} 2853}
2691 2854
2692sub add { 2855sub add {
2693 my ($self, $text, %arg) = @_; 2856 my ($self, $text, %arg) = @_;
2694 2857
2695 my $item = { 2858 $text =~ s/^\s+//;
2696 time => time, 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},
2697 text => $text, 2878 text => $text,
2698 timeout => 60, 2879 timeout => $timeout,
2699 tooltip => $text, 2880 tooltip => $text,
2700 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8], 2881 fg => [0.8, 0.8, 0.8, 0.8],
2882 pri => 0,
2883 count => 1,
2702 %arg, 2884 %arg,
2885 };
2703 }; 2886 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 2887
2710 $self->reorder; 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;
2711} 2899}
2712 2900
2713############################################################################# 2901#############################################################################
2714 2902
2715package CFClient::UI::Root; 2903package CFClient::UI::Root;
… …
2747} 2935}
2748 2936
2749sub size_allocate { 2937sub size_allocate {
2750 my ($self, $w, $h) = @_; 2938 my ($self, $w, $h) = @_;
2751 2939
2752 my $old_w = $self->{old_w}; 2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2753 my $old_h = $self->{old_h}; 2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2754 2942
2755 if ($old_w && $old_h) { 2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2756 for my $child ($self->children) { 2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767 2945
2768 for my $child ($self->children) { 2946 for my $child ($self->children) {
2769 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)};
2770 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
2771 $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;
2772 $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
2773 $child->configure ($X, $Y, $W, $H); 2958 $child->configure ($X, $Y, $W, $H);
2774 } 2959 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 2960}
2779 2961
2780sub coord2local { 2962sub coord2local {
2781 my ($self, $x, $y) = @_; 2963 my ($self, $x, $y) = @_;
2782 2964
… …
2795 $self->check_size; 2977 $self->check_size;
2796 $::WANT_REFRESH++; 2978 $::WANT_REFRESH++;
2797} 2979}
2798 2980
2799sub add { 2981sub add {
2800 my ($self, $child) = @_; 2982 my ($self, @children) = @_;
2801 2983
2984 for my $child (@children) {
2985 $child->{toplevel} = 1;
2986
2802 # integerise window positions 2987 # integerise window positions
2803 $child->{x} = int $child->{x}; 2988 $child->{x} = int $child->{x};
2804 $child->{y} = int $child->{y}; 2989 $child->{y} = int $child->{y};
2990 }
2805 2991
2806 $self->SUPER::add ($child); 2992 $self->SUPER::add (@children);
2807} 2993}
2808 2994
2809sub on_refresh { 2995sub on_refresh {
2810 my ($self, $id, $cb) = @_; 2996 my ($self, $id, $cb) = @_;
2811 2997
2812 $self->{refresh_hook}{$id} = $cb; 2998 $self->{refresh_hook}{$id} = $cb;
2813} 2999}
2814 3000
3001sub on_post_alloc {
3002 my ($self, $id, $cb) = @_;
3003
3004 $self->{post_alloc_hook}{$id} = $cb;
3005}
3006
2815sub draw { 3007sub draw {
2816 my ($self) = @_; 3008 my ($self) = @_;
3009
3010 while ($self->{refresh_hook}) {
3011 $_->()
3012 for values %{delete $self->{refresh_hook}};
3013 }
2817 3014
2818 if ($self->{check_size}) { 3015 if ($self->{check_size}) {
2819 my @queue = ([], []); 3016 my @queue = ([], []);
2820 3017
2821 for (;;) { 3018 for (;;) {
… …
2829 3026
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)} 3028 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request; 3029 : $widget->size_request;
2833 3030
3031 if (delete $widget->{force_alloc}
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2835 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836 3034
2837 $widget->{req_w} = $w; 3035 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h; 3036 $widget->{req_h} = $h;
2839 3037
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2841 3039
2842 $widget->{parent}->check_size 3040 $widget->{parent}->check_size
2843 if $widget->{parent}; 3041 if $widget->{parent};
2844 } 3042 }
2845 } 3043 }
… …
2857 $widget->size_allocate ($w, $h); 3055 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h); 3056 $widget->emit (size_allocate => $w, $h);
2859 } 3057 }
2860 } 3058 }
2861 3059
2862 while ($self->{refresh_hook}) { 3060 while ($self->{post_alloc_hook}) {
2863 $_->() 3061 $_->()
2864 for values %{delete $self->{refresh_hook}}; 3062 for values %{delete $self->{post_alloc_hook}};
2865 } 3063 }
2866 3064
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3065 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 3067 glClear GL_COLOR_BUFFER_BIT;
2870 3068
2871 glMatrixMode GL_PROJECTION; 3069 glMatrixMode GL_PROJECTION;
2872 glLoadIdentity; 3070 glLoadIdentity;
2873 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2874 glMatrixMode GL_MODELVIEW; 3072 glMatrixMode GL_MODELVIEW;
2875 glLoadIdentity; 3073 glLoadIdentity;
2876 3074
2877 $self->_draw; 3075 $self->_draw;
2878} 3076}
… …
2880############################################################################# 3078#############################################################################
2881 3079
2882package CFClient::UI; 3080package CFClient::UI;
2883 3081
2884$ROOT = new CFClient::UI::Root; 3082$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip; 3083$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886 3084
28871 30851
2888 3086

Diff Legend

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