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.186 by root, Mon May 8 20:39:34 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) = @_;
… …
232 $self->{y} = $y; 268 $self->{y} = $y;
233 $self->update; 269 $self->update;
234 } 270 }
235 271
236 if ($self->{w} != $w || $self->{h} != $h) { 272 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 273 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 274 }
244} 275}
245 276
246sub size_allocate { 277sub size_allocate {
247 # nothing to be done 278 # nothing to be done
248} 279}
249 280
281sub reconfigure {
282 my ($self) = @_;
283
284 $self->check_size (1);
285 $self->update;
286}
287
250sub children { 288sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 289}
264 290
265sub set_max_size { 291sub set_max_size {
266 my ($self, $w, $h) = @_; 292 my ($self, $w, $h) = @_;
267 293
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 294 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 295 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 296}
271 297
272# return top left coordinates 298sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 299 my ($self, $tooltip) = @_;
275 300
276 $self->{parent} 301 $self->{tooltip} = $tooltip;
277 or Carp::confess "no parent widget in _topleft\n";#d#
278 302
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 303 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip;
306 }
280} 307}
281 308
282# translate global coordinates to local coordinate system 309# translate global coordinates to local coordinate system
283sub coord2local { 310sub coord2local {
284 my ($self, $x, $y) = @_; 311 my ($self, $x, $y) = @_;
285 312
286 my ($X, $Y) = $self->_topleft; 313 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 314}
289 315
290# translate local coordinates to global coordinate system 316# translate local coordinates to global coordinate system
291sub coord2global { 317sub coord2global {
292 my ($self, $x, $y) = @_; 318 my ($self, $x, $y) = @_;
293 319
294 my ($X, $Y) = $self->_topleft; 320 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 321}
297 322
298sub focus_in { 323sub focus_in {
299 my ($self) = @_; 324 my ($self) = @_;
300 325
… …
372 glVertex $self->{w}, 0; 397 glVertex $self->{w}, 0;
373 glVertex $self->{w}, $self->{h}; 398 glVertex $self->{w}, $self->{h};
374 glVertex 0 , $self->{h}; 399 glVertex 0 , $self->{h};
375 glEnd; 400 glEnd;
376 glPopMatrix; 401 glPopMatrix;
377 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;
378 } 403 }
379} 404}
380 405
381sub _draw { 406sub _draw {
382 my ($self) = @_; 407 my ($self) = @_;
… …
398 423
399sub set_parent { 424sub set_parent {
400 my ($self, $parent) = @_; 425 my ($self, $parent) = @_;
401 426
402 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};
403} 432}
404 433
405sub check_size { 434sub check_size {
406 my ($self) = @_; 435 my ($self, $forced) = @_;
407 436
408 $self->{parent} 437 $self->{force_alloc} = 1 if $forced;
409 or return 1; 438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 439}
430 440
431sub update { 441sub update {
432 my ($self) = @_; 442 my ($self) = @_;
433 443
… …
448} 458}
449 459
450sub DESTROY { 460sub DESTROY {
451 my ($self) = @_; 461 my ($self) = @_;
452 462
463 delete $WIDGET{$self+0};
453 #$self->deactivate; 464 #$self->deactivate;
454} 465}
455 466
456############################################################################# 467#############################################################################
457 468
… …
466 my $class = shift; 477 my $class = shift;
467 478
468 # range [value, low, high, page] 479 # range [value, low, high, page]
469 480
470 $class->SUPER::new ( 481 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 482 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 483 #active_bg => [1, 1, 1, 0.5],
473 @_ 484 @_
474 ) 485 )
475} 486}
476 487
477sub _draw { 488sub _draw {
478 my ($self) = @_; 489 my ($self) = @_;
479 490
491 my $color = $FOCUS == $self && $self->{active_bg}
492 ? $self->{active_bg}
493 : $self->{bg};
494
495 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 496 my ($w, $h) = @$self{qw(w h)};
481 497
482 glEnable GL_BLEND; 498 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 500 glColor @$color;
485 501
486 glBegin GL_QUADS; 502 glBegin GL_QUADS;
487 glVertex 0 , 0; 503 glVertex 0 , 0;
488 glVertex 0 , $h; 504 glVertex 0 , $h;
489 glVertex $w, $h; 505 glVertex $w, $h;
490 glVertex $w, 0; 506 glVertex $w, 0;
491 glEnd; 507 glEnd;
492 508
493 glDisable GL_BLEND; 509 glDisable GL_BLEND;
510 }
494} 511}
495 512
496############################################################################# 513#############################################################################
497 514
498package CFClient::UI::Empty; 515package CFClient::UI::Empty;
… …
530 547
531 $self 548 $self
532} 549}
533 550
534sub add { 551sub add {
535 my ($self, $child) = @_; 552 my ($self, @widgets) = @_;
536 553
537 $child->set_parent ($self); 554 $_->set_parent ($self)
555 for @widgets;
538 556
539 use sort 'stable'; 557 use sort 'stable';
540 558
541 $self->{children} = [ 559 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 560 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 561 @{$self->{children}}, @widgets
544 ]; 562 ];
545 563
546 $child->check_size; 564 $self->check_size (1);
547 $self->update; 565 $self->update;
548} 566}
549 567
550sub children { 568sub children {
551 @{ $_[0]{children} } 569 @{ $_[0]{children} }
… …
658} 676}
659 677
660sub update { 678sub update {
661 my ($self) = @_; 679 my ($self) = @_;
662 680
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 681 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 682 $self->SUPER::update;
665} 683}
666 684
667sub size_allocate { 685sub size_allocate {
668 my ($self, $w, $h) = @_; 686 my ($self, $w, $h) = @_;
… …
681 $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 {
682 glClearColor 0, 0, 0, 0; 700 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 701 glClear GL_COLOR_BUFFER_BIT;
684 702
685 $self->_render; 703 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 704 };
694} 705}
695 706
696sub _draw { 707sub _draw {
697 my ($self) = @_; 708 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 710 my ($w, $h) = ($self->w, $self->h);
700 711
701 my $tex = $self->{texture} 712 my $tex = $self->{texture}
702 or return; 713 or return;
703 714
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 715 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 717 glColor 1, 1, 1, 1;
709 718
710 $tex->draw_quad (0, 0, $w, $h); 719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 720
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 721 glDisable GL_TEXTURE_2D;
714} 722}
715 723
716############################################################################# 724#############################################################################
717 725
… …
741 $self->{view_y} = int $y; 749 $self->{view_y} = int $y;
742 750
743 $self->update; 751 $self->update;
744} 752}
745 753
746# hmm, this does not work for topleft of $self... but we should not aks for that 754# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 755sub coord2local {
748 my ($self, $x, $y) = @_; 756 my ($self, $x, $y) = @_;
749 757
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 758 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
759}
760
761sub coord2global {
762 my ($self, $x, $y) = @_;
763
764 $x = List::Util::min $self->{w}, $x - $self->{view_x};
765 $y = List::Util::min $self->{h}, $y - $self->{view_y};
766
767 $self->SUPER::coord2global ($x, $y)
751} 768}
752 769
753sub find_widget { 770sub find_widget {
754 my ($self, $x, $y) = @_; 771 my ($self, $x, $y) = @_;
755 772
… …
788 $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}));
789 }, 806 },
790 ; 807 ;
791 808
792 $self = $class->SUPER::new ( 809 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 810 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 811 slider => $slider,
795 @_, 812 @_,
796 ); 813 );
797 814
798 $self->{vp}->add ($self->{scrolled}); 815 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 817 $self->add ($self->{slider});
801 818
802 $self 819 $self
803} 820}
804 821
805#TODO# update range on size_allocate depeneing on child 822#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 823# update viewport offset on scroll
807 824
808############################################################################# 825#############################################################################
809 826
810package CFClient::UI::Frame; 827package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 831use CFClient::OpenGL;
815 832
816sub new { 833sub new {
817 my $class = shift; 834 my $class = shift;
818 835
819 my $self = $class->SUPER::new ( 836 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 837 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 838 @_,
824 ); 839 )
825
826 $self
827} 840}
828 841
829sub _draw { 842sub _draw {
830 my ($self) = @_; 843 my ($self) = @_;
831 844
832 my ($w, $h) = ($self->{w}, $self->{h}); 845 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)};
833 847
834 glEnable GL_BLEND; 848 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 850 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 851
839# glBegin GL_QUADS; 852 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 853 glVertex 0 , 0;
842# glVertex 0 , $h; 854 glVertex 0 , $h;
843# glVertex $w, $h; 855 glVertex $w, $h;
844# glVertex $w, 0; 856 glVertex $w, 0;
845# glEnd; 857 glEnd;
846 858
847
848 $self->child->draw;
849 glDisable GL_BLEND; 859 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 860 }
861
862 $self->SUPER::_draw;
851} 863}
852 864
853############################################################################# 865#############################################################################
854 866
855package CFClient::UI::FancyFrame; 867package CFClient::UI::FancyFrame;
… …
869 881
870 my $self = $class->SUPER::new ( 882 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 883 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 884 border_bg => [1, 1, 1, 1],
873 border => 0.6, 885 border => 0.6,
886 toplevel => 1,
874 can_events => 1, 887 can_events => 1,
875 @_ 888 @_
876 ); 889 );
877 890
878 $self->{title} &&= new CFClient::UI::Label 891 $self->{title} &&= new CFClient::UI::Label
… …
903 my ($self, $w, $h) = @_; 916 my ($self, $w, $h) = @_;
904 917
905 $h -= List::Util::max 0, $self->border * 2; 918 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 919 $w -= List::Util::max 0, $self->border * 2;
907 920
908 $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)
909 if $self->{title}; 922 if $self->{title};
910 923
911 $self->child->configure ($self->border, $self->border, $w, $h); 924 $self->child->configure ($self->border, $self->border, $w, $h);
912} 925}
913 926
… …
971 my ($self) = @_; 984 my ($self) = @_;
972 985
973 my ($w, $h ) = ($self->{w}, $self->{h}); 986 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 988
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 989 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 991
981 my $border = $self->border; 992 my $border = $self->border;
982 993
983 glColor @{ $self->{border_bg} }; 994 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 995 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 999
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1001 my $bg = $tex[0];
991 1002
992 # TODO: repeat texture not scale 1003 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1007 glColor @{ $self->{bg} };
997 1008
998 $bg->{s} = $rep_x; 1009 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1010 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1011 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 }
1002 1014
1003 glDisable GL_TEXTURE_2D; 1015 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1016
1007 $self->{title}->draw if $self->{title}; 1017 $self->{title}->draw if $self->{title};
1008 1018
1009 $self->child->draw; 1019 $self->child->draw;
1010} 1020}
… …
1237} 1247}
1238 1248
1239sub size_allocate { 1249sub size_allocate {
1240 my ($self, $w, $h) = @_; 1250 my ($self, $w, $h) = @_;
1241 1251
1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1242 my $children = $self->{children}; 1254 my $children = $self->{children};
1243 1255
1244 my @h = map $_->{req_h}, @$children; 1256 my @h = map $_->{req_h}, @$children;
1245 1257
1246 my $req_h = List::Util::sum @h; 1258 my $req_h = List::Util::sum @h;
… …
1275 1287
1276############################################################################# 1288#############################################################################
1277 1289
1278package CFClient::UI::Label; 1290package CFClient::UI::Label;
1279 1291
1280our @ISA = CFClient::UI::Base::; 1292our @ISA = CFClient::UI::DrawBG::;
1281 1293
1282use CFClient::OpenGL; 1294use CFClient::OpenGL;
1283 1295
1284sub new { 1296sub new {
1285 my ($class, %arg) = @_; 1297 my ($class, %arg) = @_;
1286 1298
1287 my $self = $class->SUPER::new ( 1299 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1300 fg => [1, 1, 1],
1301 #bg => none
1302 #active_bg => none
1289 #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),
1290 fontsize => 1, 1309 fontsize => 1,
1291 text => "",
1292 align => -1, 1310 align => -1,
1293 valign => -1, 1311 valign => -1,
1294 padding => 2, 1312 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1313 can_events => 0,
1297 %arg 1314 %arg
1298 ); 1315 );
1299 1316
1300 if (exists $self->{template}) { 1317 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1318 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1319 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1320 $self->{template} = $layout;
1304 } 1321 }
1305 1322
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1323 if (exists $self->{markup}) {
1307 $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 }
1308 1328
1309 $self 1329 $self
1310} 1330}
1311 1331
1312sub escape { 1332sub escape($) {
1313 local $_ = $_[1]; 1333 local $_ = $_[0];
1314 1334
1315 s/&/&amp;/g; 1335 s/&/&amp;/g;
1316 s/>/&gt;/g; 1336 s/>/&gt;/g;
1317 s/</&lt;/g; 1337 s/</&lt;/g;
1318 1338
1319 $_[1] 1339 $_
1320} 1340}
1321 1341
1322sub update { 1342sub update {
1323 my ($self) = @_; 1343 my ($self) = @_;
1324 1344
… …
1330 my ($self, $text) = @_; 1350 my ($self, $text) = @_;
1331 1351
1332 return if $self->{text} eq "T$text"; 1352 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1353 $self->{text} = "T$text";
1334 1354
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1356 $self->{layout}->set_text ($text);
1336 1357
1337 delete $self->{texture};
1338 $self->update; 1358 $self->update;
1339 $self->check_size; 1359 $self->check_size;
1340} 1360}
1341 1361
1342sub set_markup { 1362sub set_markup {
1343 my ($self, $markup) = @_; 1363 my ($self, $markup) = @_;
1344 1364
1345 return if $self->{text} eq "M$markup"; 1365 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1366 $self->{text} = "M$markup";
1347 1367
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1371 $self->{layout}->set_markup ($markup);
1349 1372
1350 delete $self->{texture};
1351 $self->update; 1373 $self->update;
1352 $self->check_size; 1374 $self->check_size;
1353} 1375}
1354 1376
1355sub size_request { 1377sub size_request {
1356 my ($self) = @_; 1378 my ($self) = @_;
1357 1379
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1380 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $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});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1385
1362 my ($w, $h) = $self->{layout}->size; 1386 my ($w, $h) = $self->{layout}->size;
1363 1387
1364 if (exists $self->{template}) { 1388 if (exists $self->{template}) {
… …
1394} 1418}
1395 1419
1396sub _draw { 1420sub _draw {
1397 my ($self) = @_; 1421 my ($self) = @_;
1398 1422
1423 $self->SUPER::_draw; # draw background, if applicable
1424
1399 my $tex = $self->{texture} ||= do { 1425 my $tex = $self->{texture} ||= do {
1426 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1427 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $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});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432
1403 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
1404 }; 1444 };
1405 1445
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1446 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1448
1449 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1450 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $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 }
1426 1455
1427 glDisable GL_TEXTURE_2D; 1456 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1457}
1430 1458
1431############################################################################# 1459#############################################################################
1432 1460
1433package CFClient::UI::EntryBase; 1461package CFClient::UI::EntryBase;
… …
1468 $self->{layout}->set_text ("$text "); 1496 $self->{layout}->set_text ("$text ");
1469 1497
1470 $self->emit (changed => $self->{text}); 1498 $self->emit (changed => $self->{text});
1471} 1499}
1472 1500
1473sub get_text {
1474 $_[0]{text}
1475}
1476
1477sub size_request {
1478 my ($self) = @_;
1479
1480 my ($w, $h) = $self->SUPER::size_request;
1481
1482 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489}
1490
1491sub set_text { 1501sub set_text {
1492 my ($self, $text) = @_; 1502 my ($self, $text) = @_;
1493 1503
1494 $self->{cursor} = length $text; 1504 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1505 $self->_set_text ($text);
1496 $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
1497} 1526}
1498 1527
1499sub key_down { 1528sub key_down {
1500 my ($self, $ev) = @_; 1529 my ($self, $ev) = @_;
1501 1530
… …
1503 my $sym = $ev->{sym}; 1532 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1533 my $uni = $ev->{unicode};
1505 1534
1506 my $text = $self->get_text; 1535 my $text = $self->get_text;
1507 1536
1508 if ($sym == 8) { 1537 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1538 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1539 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1540 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1541 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1542 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1543 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1544 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1545 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1546 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1547 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1548 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1549 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1550 $self->emit ('escape');
1522 } elsif ($uni) { 1551 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1552 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1553 }
1525 1554
1526 $self->_set_text ($text); 1555 $self->_set_text ($text);
1527 $self->update; 1556 $self->update;
1557 $self->check_size;
1528} 1558}
1529 1559
1530sub focus_in { 1560sub focus_in {
1531 my ($self) = @_; 1561 my ($self) = @_;
1532 1562
… …
1661 my $class = shift; 1691 my $class = shift;
1662 1692
1663 $class->SUPER::new ( 1693 $class->SUPER::new (
1664 padding => 4, 1694 padding => 4,
1665 fg => [1, 1, 1], 1695 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1696 active_fg => [0, 0, 1],
1668 can_hover => 1, 1697 can_hover => 1,
1669 align => 0, 1698 align => 0,
1670 valign => 0, 1699 valign => 0,
1671 can_events => 1, 1700 can_events => 1,
… …
1689 1718
1690 if ($GRAB == $self) { 1719 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1720 $self->{fg} = $self->{active_fg};
1692 } 1721 }
1693 1722
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1723 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1725 glColor 0, 0, 0, 1;
1699 1726
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1727 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1728
1702 glDisable GL_TEXTURE_2D; 1729 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1730
1705 $self->SUPER::_draw; 1731 $self->SUPER::_draw;
1706} 1732}
1707 1733
1708############################################################################# 1734#############################################################################
… …
1722 1748
1723 $class->SUPER::new ( 1749 $class->SUPER::new (
1724 padding => 2, 1750 padding => 2,
1725 fg => [1, 1, 1], 1751 fg => [1, 1, 1],
1726 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],
1727 state => 0, 1755 state => 0,
1728 can_hover => 1, 1756 can_hover => 1,
1729 @_ 1757 @_
1730 ) 1758 )
1731} 1759}
… …
1755 1783
1756 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;
1757 1785
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1787
1760 glEnable GL_BLEND; 1788 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789
1761 glEnable GL_TEXTURE_2D; 1790 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1791 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1792 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1793}
1771 1794
1772############################################################################# 1795#############################################################################
1773 1796
1774package CFClient::UI::Image; 1797package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1840 glTranslate 0, -$self->{w}, 0;
1818 1841
1819 ($w, $h) = ($h, $w); 1842 ($w, $h) = ($h, $w);
1820 } 1843 }
1821 1844
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1845 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1846 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1847
1827 $tex->draw_quad (0, 0, $w, $h); 1848 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1849
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1850 glDisable GL_TEXTURE_2D;
1831} 1851}
1832 1852
1833############################################################################# 1853#############################################################################
1834 1854
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2043 qw(s1_slider.png s1_slider_bg.png);
2024 2044
2025sub new { 2045sub new {
2026 my $class = shift; 2046 my $class = shift;
2027 2047
2028 # range [value, low, high, page] 2048 # range [value, low, high, page, unit]
2029 2049
2030 # TODO: 0-width page 2050 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2051 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2052 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2053 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2054 fg => [1, 1, 1],
2035 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],
2036 range => [0, 0, 100, 10], 2058 range => [0, 0, 100, 10],
2037 req_w => $::WIDTH / 80, 2059 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2060 req_h => $::WIDTH / 80,
2039 vertical => 0, 2061 vertical => 0,
2040 can_hover => 1, 2062 can_hover => 1,
2041 inner_pad => 5, 2063 inner_pad => 0.02,
2042 @_ 2064 @_
2043 ); 2065 );
2044 2066
2067 $self->set_value ($self->{range}[0]);
2068 $self->update;
2069
2045 $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 }
2046} 2094}
2047 2095
2048sub size_request { 2096sub size_request {
2049 my ($self) = @_; 2097 my ($self) = @_;
2050 2098
… …
2063 2111
2064sub mouse_motion { 2112sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2113 my ($self, $ev, $x, $y) = @_;
2066 2114
2067 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
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2132 my ($value, $lo, $hi, $page) = @{$self->{range}};
2069 2133
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2134 my $inner_w = 1 - 2 * $self->{inner_pad};
2071 2135
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2074 2137
2075 $x -= $inner_pad_px; # substract the padding 2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2139 $value = $self->{scale} * ($value - $lo);
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2140
2081 $self->emit (changed => $x); 2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2082 $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;
2083 } 2148 });
2084}
2085 2149
2086# the inner_* stuff is for generating a padding for the slider handle, 2150 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2151}
2093 2152
2094sub _draw { 2153sub _draw {
2095 my ($self) = @_; 2154 my ($self) = @_;
2096 2155
2097 $self->SUPER::_draw (); 2156 $self->SUPER::_draw ();
2098 2157
2099 my ($w, $h) = @$self{qw(w h)}; 2158 glScale $self->{w}, $self->{h};
2100 2159
2101 if ($self->{vertical}) { 2160 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2161 # draw a vertical slider like a rotated horizontal slider
2103 2162
2163 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2164 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2165 }
2109 2166
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2167 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2168 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2169
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2172
2136 # draw background 2173 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2174 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2175
2139 # draw handle 2176 # draw handle
2140 $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);
2141 2178
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2179 glDisable GL_TEXTURE_2D;
2144} 2180}
2145 2181
2146############################################################################# 2182#############################################################################
2147 2183
… …
2158 fontsize => 1, 2194 fontsize => 1,
2159 can_events => 0, 2195 can_events => 0,
2160 #font => default_font 2196 #font => default_font
2161 @_, 2197 @_,
2162 2198
2163 layout => (new CFClient::Layout), 2199 layout => (new CFClient::Layout 1),
2164 par => [], 2200 par => [],
2165 height => 0, 2201 height => 0,
2166 children => [ 2202 children => [
2167 (new CFClient::UI::Empty expand => 1), 2203 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2204 (new CFClient::UI::Slider vertical => 1),
… …
2179 2215
2180 $self->{fontsize} = $fontsize; 2216 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2217 $self->reflow;
2182} 2218}
2183 2219
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2220sub size_allocate {
2204 my ($self, $w, $h) = @_; 2221 my ($self, $w, $h) = @_;
2205 2222
2206 $self->SUPER::size_allocate ($w, $h); 2223 $self->SUPER::size_allocate ($w, $h);
2207 2224
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2227 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2228
2212 $self->reflow; 2229 $self->reflow;
2213} 2230}
2214 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
2215sub add_paragraph { 2251sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2252 my ($self, $color, $text, $indent) = @_;
2217 2253
2218 #TODO: intelligently "reformat" paragraph 2254 #TODO: intelligently "reformat" paragraph
2219 2255
2256 for my $line (split /\n/, $text) {
2220 my $height = $self->text_height ($text); 2257 my $height = $self->text_height ($line);
2221
2222 $self->{height} += $height; 2258 $self->{height} += $height;
2223
2224 push @{$self->{par}}, [$height, $color, $text]; 2259 push @{$self->{par}}, [$height, $color, $indent, $line];
2260 }
2225 2261
2226 $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}];
2227 $self->{children}[1]->update; 2263 $self->{children}[1]->update;
2228} 2264}
2229 2265
… …
2234 2270
2235 return unless $self->{h} > 0; 2271 return unless $self->{h} > 0;
2236 2272
2237 delete $self->{texture}; 2273 delete $self->{texture};
2238 2274
2239 $ROOT->on_refresh ($self, sub { 2275 $ROOT->on_post_alloc ($self, sub {
2240 if (delete $self->{need_reflow}) { 2276 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2277 my $height = 0;
2242 2278
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2244 for @{$self->{par}}; 2280 for @{$self->{par}};
2245 2281
2246 $self->{height} = $height; 2282 $self->{height} = $height;
2247 2283
2248 $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;
2249 2286
2250 delete $self->{texture}; 2287 delete $self->{texture};
2251 } 2288 }
2252 2289
2253 $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 {
2254 glClearColor 0, 0, 0, 0; 2291 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2292 glClear GL_COLOR_BUFFER_BIT;
2256
2257 glEnable GL_BLEND;
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261 2293
2262 my $top = int $self->{children}[1]{range}[0]; 2294 my $top = int $self->{children}[1]{range}[0];
2263 2295
2264 my $y0 = $top; 2296 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2297 my $y1 = $top + $self->{h};
… …
2268 2300
2269 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2270 2302
2271 $layout->set_font ($self->{font}) if $self->{font}; 2303 $layout->set_font ($self->{font}) if $self->{font};
2272 2304
2305 glEnable GL_BLEND;
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307
2273 for my $par (@{$self->{par}}) { 2308 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2309 my $h = $par->[0];
2275 2310
2276 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]);
2277 $layout->set_text ($par->[2]); 2314 $layout->set_markup ($par->[3]);
2278 2315
2279 glColor @{ $par->[1] }; 2316 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2317
2281 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;
2282 } 2320 }
2283 2321
2284 $y += $h; 2322 $y += $h;
2285 } 2323 }
2286 2324
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2325 glDisable GL_BLEND;
2289 }; 2326 };
2290 }); 2327 });
2291} 2328}
2292 2329
2293sub _draw { 2330sub _draw {
2294 my ($self) = @_; 2331 my ($self) = @_;
2295 2332
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2333 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2335 glColor 1, 1, 1, 1;
2301 $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});
2302 glDisable GL_TEXTURE_2D; 2337 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2338
2305 $self->{children}[1]->draw; 2339 $self->{children}[1]->draw;
2306 2340
2307} 2341}
2308 2342
… …
2402 @_, 2436 @_,
2403 can_events => 0, 2437 can_events => 0,
2404 ) 2438 )
2405} 2439}
2406 2440
2407sub set_markup { 2441sub set_tooltip_from {
2408 my ($self, $text) = @_; 2442 my ($self, $widget) = @_;
2409 2443
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2444 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2445 markup => $widget->{tooltip},
2412 $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 );
2413} 2452}
2414 2453
2415sub size_request { 2454sub size_request {
2416 my ($self) = @_; 2455 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2456
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2457 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2458
2422 ($w + 4, $h + 4) 2459 ($w + 4, $h + 4)
2423} 2460}
… …
2429} 2466}
2430 2467
2431sub _draw { 2468sub _draw {
2432 my ($self) = @_; 2469 my ($self) = @_;
2433 2470
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2471 glTranslate 0.375, 0.375;
2436 2472
2437 my ($w, $h) = @$self{qw(w h)}; 2473 my ($w, $h) = @$self{qw(w h)};
2438 2474
2439 glColor 1, 0.8, 0.4; 2475 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2486 glVertex 0 , $h;
2451 glVertex $w, $h; 2487 glVertex $w, $h;
2452 glVertex $w, 0; 2488 glVertex $w, 0;
2453 glEnd; 2489 glEnd;
2454 2490
2455 glPopMatrix; 2491 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2492 $self->SUPER::_draw;
2459} 2493}
2460 2494
2461############################################################################# 2495#############################################################################
2462 2496
… …
2467use CFClient::OpenGL; 2501use CFClient::OpenGL;
2468 2502
2469sub new { 2503sub new {
2470 my $class = shift; 2504 my $class = shift;
2471 2505
2472 $class->SUPER::new ( 2506 my $self = $class->SUPER::new (
2473 aspect => 1, 2507 aspect => 1,
2474 @_, 2508 @_,
2475 ) 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
2476} 2526}
2477 2527
2478sub size_request { 2528sub size_request {
2479 (32, 8) 2529 (32, 8)
2480} 2530}
2481 2531
2482sub _draw { 2532sub _draw {
2483 my ($self) = @_; 2533 my ($self) = @_;
2484 2534
2485 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
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2547
2488 # TODO animation
2489 if ($tex) { 2548 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2549 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2551 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2553 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2554 }
2555}
2556
2557sub DESTROY {
2558 my ($self) = @_;
2559
2560 $self->{timer}->cancel
2561 if $self->{timer};
2562
2563 $self->SUPER::DESTROY;
2499} 2564}
2500 2565
2501############################################################################# 2566#############################################################################
2502 2567
2503package CFClient::UI::InventoryItem; 2568package CFClient::UI::InventoryItem;
2504 2569
2505our @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}
2506 2597
2507sub new { 2598sub new {
2508 my $class = shift; 2599 my $class = shift;
2509 2600
2510 my %args = @_; 2601 my %args = @_;
2511 2602
2512 my $item = $args{item}; 2603 my $item = delete $args{item};
2513 2604
2514 my $desc = $item->{nrof} < 2 2605 my $desc = _item_to_desc ($item);
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518 2606
2519 my $self = $class->SUPER::new ( 2607 my $self = $class->SUPER::new (
2520 can_hover => 1, 2608 can_hover => 1,
2521 can_events => 1, 2609 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc) 2610 tooltip => ((CFClient::UI::Label::escape $desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub { 2612 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_; 2613 my ($self, $ev, $x, $y) = @_;
2526 2614
2527 # 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 :(
2528 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
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2623 $::CONN->send ("move $targ $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) { 2624 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}"); 2625 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) { 2626 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new ( 2627 my @menu_items = (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2541 ["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}) }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2543 ], 2640 ),
2544 )->popup ($ev); 2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2545 } 2644 }
2546 2645
2547 1 2646 1
2548 }, 2647 },
2549 %args 2648 %args
2550 ); 2649 );
2650
2651
2551 $self->add(new CFClient::UI::Face 2652 $self->add (new CFClient::UI::Face
2552 can_events => 0, 2653 can_events => 0,
2553 face => $item->{face}, 2654 face => $item->{face},
2554 anim => $item->{anim}, 2655 anim => $item->{anim},
2555 animspeed => $item->{animspeed}); 2656 animspeed => $item->{animspeed},
2556 $self->add(new CFClient::UI::Label 2657 );
2557 can_events => 0, 2658
2558 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;
2559 2664
2560 $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);
2561} 2674}
2562 2675
2563############################################################################# 2676#############################################################################
2564 2677
2565package CFClient::UI::Inventory; 2678package CFClient::UI::Inventory;
… …
2581 my ($self, $items) = @_; 2694 my ($self, $items) = @_;
2582 2695
2583 $self->{scrolled}->clear; 2696 $self->{scrolled}->clear;
2584 return unless $items; 2697 return unless $items;
2585 2698
2586 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;
2587 2703
2588 $self->{real_items} = \@items; 2704 $self->{real_items} = \@items;
2589 2705
2590 for my $item (@items) { 2706 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2596 } 2709 }
2710
2711 $self->{scrolled}->add (@items);
2597 2712
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599} 2714}
2600 2715
2601sub size_request { 2716sub size_request {
… …
2675 } 2790 }
2676} 2791}
2677 2792
2678############################################################################# 2793#############################################################################
2679 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
2680package CFClient::UI::Root; 2903package CFClient::UI::Root;
2681 2904
2682our @ISA = CFClient::UI::Container::; 2905our @ISA = CFClient::UI::Container::;
2683 2906
2684use CFClient::OpenGL; 2907use CFClient::OpenGL;
2685 2908
2909sub new {
2910 my $class = shift;
2911
2912 $class->SUPER::new (
2913 @_,
2914 )
2915}
2916
2917sub configure {
2918 my ($self, $x, $y, $w, $h) = @_;
2919
2920 $self->{w} = $w;
2921 $self->{h} = $h;
2922}
2923
2686sub check_size { 2924sub check_size {
2687 my ($self) = @_; 2925 my ($self) = @_;
2688 2926
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 2927 $self->size_allocate ($self->{w}, $self->{h})
2928 if $self->{w};
2690} 2929}
2691 2930
2692sub size_request { 2931sub size_request {
2693 my ($self) = @_; 2932 my ($self) = @_;
2694 2933
… …
2696} 2935}
2697 2936
2698sub size_allocate { 2937sub size_allocate {
2699 my ($self, $w, $h) = @_; 2938 my ($self, $w, $h) = @_;
2700 2939
2701 my $old_w = $self->{old_w}; 2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2702 my $old_h = $self->{old_h}; 2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2703 2942
2704 if ($old_w && $old_h) { 2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2705 for my $child ($self->children) { 2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725 2945
2726 for my $child ($self->children) { 2946 for my $child ($self->children) {
2727 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)};
2728 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
2729 $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;
2730 $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
2731 $child->configure ($X, $Y, $W, $H); 2958 $child->configure ($X, $Y, $W, $H);
2732 } 2959 }
2733} 2960}
2734 2961
2735sub _topleft { 2962sub coord2local {
2736 my ($self, $x, $y) = @_; 2963 my ($self, $x, $y) = @_;
2737 2964
2738 ($x, $y) 2965 ($x, $y)
2739} 2966}
2740 2967
2968sub coord2global {
2969 my ($self, $x, $y) = @_;
2970
2971 ($x, $y)
2972}
2973
2741sub update { 2974sub update {
2742 my ($self) = @_; 2975 my ($self) = @_;
2743 2976
2744 $self->check_size; 2977 $self->check_size;
2745 ::refresh (); 2978 $::WANT_REFRESH++;
2746} 2979}
2747 2980
2748sub add { 2981sub add {
2749 my ($self, $child) = @_; 2982 my ($self, @children) = @_;
2750 2983
2984 for my $child (@children) {
2985 $child->{toplevel} = 1;
2986
2751 # integerize window positions 2987 # integerise window positions
2752 $child->{x} = int $child->{x}; 2988 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 2989 $child->{y} = int $child->{y};
2990 }
2754 2991
2755 $self->SUPER::add ($child); 2992 $self->SUPER::add (@children);
2756} 2993}
2757 2994
2758sub on_refresh { 2995sub on_refresh {
2759 my ($self, $id, $cb) = @_; 2996 my ($self, $id, $cb) = @_;
2760 2997
2761 $self->{refresh_hook}{$id} = $cb; 2998 $self->{refresh_hook}{$id} = $cb;
2762} 2999}
2763 3000
3001sub on_post_alloc {
3002 my ($self, $id, $cb) = @_;
3003
3004 $self->{post_alloc_hook}{$id} = $cb;
3005}
3006
2764sub draw { 3007sub draw {
2765 my ($self) = @_; 3008 my ($self) = @_;
2766 3009
2767 while (my $rcb = delete $self->{refresh_hook}) { 3010 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3011 $_->()
3012 for values %{delete $self->{refresh_hook}};
3013 }
3014
3015 if ($self->{check_size}) {
3016 my @queue = ([], []);
3017
3018 for (;;) {
3019 if ($self->{check_size}) {
3020 # heuristic: check containers last
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3022 for values %{delete $self->{check_size}}
3023 }
3024
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3026
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3028 ? @$widget{qw(user_w user_h)}
3029 : $widget->size_request;
3030
3031 if (delete $widget->{force_alloc}
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
3035 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h;
3037
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3039
3040 $widget->{parent}->check_size
3041 if $widget->{parent};
3042 }
3043 }
3044 }
3045
3046 while ($self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) {
3048 my ($widget, $w, $h) = @$_;
3049
3050 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0;
3052
3053 $widget->{w} = $w;
3054 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h);
3056 $widget->emit (size_allocate => $w, $h);
3057 }
3058 }
3059
3060 while ($self->{post_alloc_hook}) {
3061 $_->()
3062 for values %{delete $self->{post_alloc_hook}};
2769 } 3063 }
2770 3064
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3065 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3067 glClear GL_COLOR_BUFFER_BIT;
2774 3068
2775 glMatrixMode GL_PROJECTION; 3069 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3070 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3072 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3073 glLoadIdentity;
2780 3074
2781 $self->_draw; 3075 $self->_draw;
2782} 3076}
… …
2784############################################################################# 3078#############################################################################
2785 3079
2786package CFClient::UI; 3080package CFClient::UI;
2787 3081
2788$ROOT = new CFClient::UI::Root; 3082$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3083$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3084
27911 30851
2792 3086

Diff Legend

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