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.183 by elmex, Sun Apr 30 13:10:46 2006 UTC vs.
Revision 1.217 by root, Fri May 19 23:18:42 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
130 133
131 for (@$vals) { 134 for (@$vals) {
132 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
133 $rem += $_ - $i; 136 $rem += $_ - $i;
134 $_ = $i; 137 $_ = $i;
138 }
139}
140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
135 } 161 }
136} 162}
137 163
138############################################################################# 164#############################################################################
139 165
… …
158 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
160 } 186 }
161 } 187 }
162 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
163 $self 191 $self
164} 192}
165 193
166sub destroy { 194sub destroy {
167 my ($self) = @_; 195 my ($self) = @_;
… …
232 $self->{y} = $y; 260 $self->{y} = $y;
233 $self->update; 261 $self->update;
234 } 262 }
235 263
236 if ($self->{w} != $w || $self->{h} != $h) { 264 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 265 $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 } 266 }
244} 267}
245 268
246sub size_allocate { 269sub size_allocate {
247 # nothing to be done 270 # nothing to be done
248} 271}
249 272
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
250sub children { 280sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $_->check_size;
261} 281}
262 282
263sub set_max_size { 283sub set_max_size {
264 my ($self, $w, $h) = @_; 284 my ($self, $w, $h) = @_;
265 285
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 287 delete $self->{max_h}; $self->{max_h} = $h if $h;
268} 288}
269 289
270# return top left coordinates 290sub set_tooltip {
271sub _topleft {
272 my ($self, $x, $y) = @_; 291 my ($self, $tooltip) = @_;
273 292
274 $self->{parent} 293 $self->{tooltip} = $tooltip;
275 or Carp::confess "no parent widget in _topleft\n";#d#
276 294
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
278} 299}
279 300
280# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
281sub coord2local { 302sub coord2local {
282 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
283 304
284 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 306}
287 307
288# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
289sub coord2global { 309sub coord2global {
290 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
291 311
292 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 313}
295 314
296sub focus_in { 315sub focus_in {
297 my ($self) = @_; 316 my ($self) = @_;
298 317
… …
370 glVertex $self->{w}, 0; 389 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h}; 390 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h}; 391 glVertex 0 , $self->{h};
373 glEnd; 392 glEnd;
374 glPopMatrix; 393 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 } 395 }
377} 396}
378 397
379sub _draw { 398sub _draw {
380 my ($self) = @_; 399 my ($self) = @_;
… …
396 415
397sub set_parent { 416sub set_parent {
398 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
399 418
400 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
401} 424}
402 425
403sub check_size { 426sub check_size {
404 my ($self) = @_; 427 my ($self, $forced) = @_;
405 428
406 $self->{parent} 429 $self->{force_alloc} = 1 if $forced;
407 or return 1; 430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427} 431}
428 432
429sub update { 433sub update {
430 my ($self) = @_; 434 my ($self) = @_;
431 435
… …
446} 450}
447 451
448sub DESTROY { 452sub DESTROY {
449 my ($self) = @_; 453 my ($self) = @_;
450 454
455 delete $WIDGET{$self+0};
451 #$self->deactivate; 456 #$self->deactivate;
452} 457}
453 458
454############################################################################# 459#############################################################################
455 460
… …
464 my $class = shift; 469 my $class = shift;
465 470
466 # range [value, low, high, page] 471 # range [value, low, high, page]
467 472
468 $class->SUPER::new ( 473 $class->SUPER::new (
469 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
470 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
471 @_ 476 @_
472 ) 477 )
473} 478}
474 479
475sub _draw { 480sub _draw {
476 my ($self) = @_; 481 my ($self) = @_;
477 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
478 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
479 489
480 glEnable GL_BLEND; 490 glEnable GL_BLEND;
481 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
483 493
484 glBegin GL_QUADS; 494 glBegin GL_QUADS;
485 glVertex 0 , 0; 495 glVertex 0 , 0;
486 glVertex 0 , $h; 496 glVertex 0 , $h;
487 glVertex $w, $h; 497 glVertex $w, $h;
488 glVertex $w, 0; 498 glVertex $w, 0;
489 glEnd; 499 glEnd;
490 500
491 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
492} 503}
493 504
494############################################################################# 505#############################################################################
495 506
496package CFClient::UI::Empty; 507package CFClient::UI::Empty;
… …
528 539
529 $self 540 $self
530} 541}
531 542
532sub add { 543sub add {
533 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
534 545
535 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
536 548
537 use sort 'stable'; 549 use sort 'stable';
538 550
539 $self->{children} = [ 551 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
542 ]; 554 ];
543 555
544 $child->check_size; 556 $self->check_size (1);
545 $self->update; 557 $self->update;
546} 558}
547 559
548sub children { 560sub children {
549 @{ $_[0]{children} } 561 @{ $_[0]{children} }
… …
656} 668}
657 669
658sub update { 670sub update {
659 my ($self) = @_; 671 my ($self) = @_;
660 672
661 $ROOT->on_refresh ($self => sub { $self->render_child }); 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
662 $self->SUPER::update; 674 $self->SUPER::update;
663} 675}
664 676
665sub size_allocate { 677sub size_allocate {
666 my ($self, $w, $h) = @_; 678 my ($self, $w, $h) = @_;
… …
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0; 692 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
682 694
683 $self->_render; 695 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 }; 696 };
692} 697}
693 698
694sub _draw { 699sub _draw {
695 my ($self) = @_; 700 my ($self) = @_;
… …
697 my ($w, $h) = ($self->w, $self->h); 702 my ($w, $h) = ($self->w, $self->h);
698 703
699 my $tex = $self->{texture} 704 my $tex = $self->{texture}
700 or return; 705 or return;
701 706
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1; 709 glColor 1, 1, 1, 1;
707 710
708 $tex->draw_quad (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709 712
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
712} 714}
713 715
714############################################################################# 716#############################################################################
715 717
… …
737 739
738 $self->{view_x} = int $x; 740 $self->{view_x} = int $x;
739 $self->{view_y} = int $y; 741 $self->{view_y} = int $y;
740 742
741 $self->update; 743 $self->update;
744}
745
746# hmm, this does not work for topleft of $self... but we should not ask for that
747sub coord2local {
748 my ($self, $x, $y) = @_;
749
750 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
751}
752
753sub coord2global {
754 my ($self, $x, $y) = @_;
755
756 $x = List::Util::min $self->{w}, $x - $self->{view_x};
757 $y = List::Util::min $self->{h}, $y - $self->{view_y};
758
759 $self->SUPER::coord2global ($x, $y)
760}
761
762sub find_widget {
763 my ($self, $x, $y) = @_;
764
765 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
766 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
767 ) {
768 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
769 } else {
770 $self->CFClient::UI::Base::find_widget ($x, $y)
771 }
742} 772}
743 773
744sub _render { 774sub _render {
745 my ($self) = @_; 775 my ($self) = @_;
746 776
… …
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
768 }, 798 },
769 ; 799 ;
770 800
771 $self = $class->SUPER::new ( 801 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort), 802 vp => (new CFClient::UI::ViewPort expand => 1),
773 slider => $slider, 803 slider => $slider,
774 @_, 804 @_,
775 ); 805 );
776 806
777 $self->{vp}->add ($self->{scrolled}); 807 $self->{vp}->add ($self->{scrolled});
… …
779 $self->add ($self->{slider}); 809 $self->add ($self->{slider});
780 810
781 $self 811 $self
782} 812}
783 813
784#TODO# update range on size_allocate depeneing on child 814#TODO# update range on size_allocate depending on child
785# update viewport offset on scroll 815# update viewport offset on scroll
786 816
787############################################################################# 817#############################################################################
788 818
789package CFClient::UI::Frame; 819package CFClient::UI::Frame;
… …
793use CFClient::OpenGL; 823use CFClient::OpenGL;
794 824
795sub new { 825sub new {
796 my $class = shift; 826 my $class = shift;
797 827
798 my $self = $class->SUPER::new ( 828 $class->SUPER::new (
799 bg => [1, 1, 1, 1], 829 bg => undef,
800 border_bg => [1, 1, 1, 1],
801 border => 0.8,
802 @_ 830 @_,
803 ); 831 )
804
805 $self
806} 832}
807 833
808sub _draw { 834sub _draw {
809 my ($self) = @_; 835 my ($self) = @_;
810 836
811 my ($w, $h) = ($self->{w}, $self->{h}); 837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
812 839
813 glEnable GL_BLEND; 840 glEnable GL_BLEND;
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glEnable GL_TEXTURE_2D; 842 glColor @{ $self->{bg} };
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
817 843
818# glBegin GL_QUADS; 844 glBegin GL_QUADS;
819# glColor 0, 0, 0, 0;
820# glVertex 0 , 0; 845 glVertex 0 , 0;
821# glVertex 0 , $h; 846 glVertex 0 , $h;
822# glVertex $w, $h; 847 glVertex $w, $h;
823# glVertex $w, 0; 848 glVertex $w, 0;
824# glEnd; 849 glEnd;
825 850
826
827 $self->child->draw;
828 glDisable GL_BLEND; 851 glDisable GL_BLEND;
829 glDisable GL_TEXTURE_2D; 852 }
853
854 $self->SUPER::_draw;
830} 855}
831 856
832############################################################################# 857#############################################################################
833 858
834package CFClient::UI::FancyFrame; 859package CFClient::UI::FancyFrame;
… …
848 873
849 my $self = $class->SUPER::new ( 874 my $self = $class->SUPER::new (
850 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
851 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
852 border => 0.6, 877 border => 0.6,
878 toplevel => 1,
853 can_events => 1, 879 can_events => 1,
854 @_ 880 @_
855 ); 881 );
856 882
857 $self->{title} &&= new CFClient::UI::Label 883 $self->{title} &&= new CFClient::UI::Label
… …
882 my ($self, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
883 909
884 $h -= List::Util::max 0, $self->border * 2; 910 $h -= List::Util::max 0, $self->border * 2;
885 $w -= List::Util::max 0, $self->border * 2; 911 $w -= List::Util::max 0, $self->border * 2;
886 912
887 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
888 if $self->{title}; 914 if $self->{title};
889 915
890 $self->child->configure ($self->border, $self->border, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
891} 917}
892 918
… …
950 my ($self) = @_; 976 my ($self) = @_;
951 977
952 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
953 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
954 980
955 glEnable GL_BLEND;
956 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
957 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
958 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
959 983
960 my $border = $self->border; 984 my $border = $self->border;
961 985
962 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
963 $tex[1]->draw_quad (0, 0, $w, $border); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
964 $tex[3]->draw_quad (0, $border, $border, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
966 $tex[4]->draw_quad (0, $h - $border, $w, $border); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
967 991
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
969 my $bg = $tex[0]; 993 my $bg = $tex[0];
970 994
971 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
… …
975 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
976 1000
977 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
978 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
979 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
980 $bg->draw_quad ($border, $border, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
981 1006
982 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
983 glDisable GL_BLEND;
984 }
985 1008
986 $self->{title}->draw if $self->{title}; 1009 $self->{title}->draw if $self->{title};
987 1010
988 $self->child->draw; 1011 $self->child->draw;
989} 1012}
… …
1216} 1239}
1217 1240
1218sub size_allocate { 1241sub size_allocate {
1219 my ($self, $w, $h) = @_; 1242 my ($self, $w, $h) = @_;
1220 1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1221 my $children = $self->{children}; 1246 my $children = $self->{children};
1222 1247
1223 my @h = map $_->{req_h}, @$children; 1248 my @h = map $_->{req_h}, @$children;
1224 1249
1225 my $req_h = List::Util::sum @h; 1250 my $req_h = List::Util::sum @h;
… …
1254 1279
1255############################################################################# 1280#############################################################################
1256 1281
1257package CFClient::UI::Label; 1282package CFClient::UI::Label;
1258 1283
1259our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
1260 1285
1261use CFClient::OpenGL; 1286use CFClient::OpenGL;
1262 1287
1263sub new { 1288sub new {
1264 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
1265 1290
1266 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
1267 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
1293 #bg => none
1294 #active_bg => none
1268 #font => default_font 1295 #font => default_font
1296 #text => initial text
1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1300 layout => (new CFClient::Layout),
1269 fontsize => 1, 1301 fontsize => 1,
1270 text => "",
1271 align => -1, 1302 align => -1,
1272 valign => -1, 1303 valign => -1,
1273 padding => 2, 1304 padding => 2,
1274 layout => new CFClient::Layout,
1275 can_events => 0, 1305 can_events => 0,
1276 %arg 1306 %arg
1277 ); 1307 );
1278 1308
1279 if (exists $self->{template}) { 1309 if (exists $self->{template}) {
1280 my $layout = new CFClient::Layout; 1310 my $layout = new CFClient::Layout;
1281 $layout->set_text (delete $self->{template}); 1311 $layout->set_text (delete $self->{template});
1282 $self->{template} = $layout; 1312 $self->{template} = $layout;
1283 } 1313 }
1284 1314
1285 $self->set_text (delete $self->{text}) if exists $self->{text}; 1315 if (exists $self->{markup}) {
1286 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1316 $self->set_markup (delete $self->{markup});
1317 } else {
1318 $self->set_text (delete $self->{text});
1319 }
1287 1320
1288 $self 1321 $self
1289} 1322}
1290 1323
1291sub escape { 1324sub escape($) {
1292 local $_ = $_[1]; 1325 local $_ = $_[0];
1293 1326
1294 s/&/&amp;/g; 1327 s/&/&amp;/g;
1295 s/>/&gt;/g; 1328 s/>/&gt;/g;
1296 s/</&lt;/g; 1329 s/</&lt;/g;
1297 1330
1298 $_[1] 1331 $_
1299} 1332}
1300 1333
1301sub update { 1334sub update {
1302 my ($self) = @_; 1335 my ($self) = @_;
1303 1336
1304 delete $self->{texture}; 1337 delete $self->{texture};
1305 $self->SUPER::update; 1338 $self->SUPER::update;
1306} 1339}
1307 1340
1308sub reconfigure {
1309 my ($self) = @_;
1310
1311 delete $self->{texture};
1312}
1313
1314sub set_text { 1341sub set_text {
1315 my ($self, $text) = @_; 1342 my ($self, $text) = @_;
1316 1343
1317 return if $self->{text} eq "T$text"; 1344 return if $self->{text} eq "T$text";
1318 $self->{text} = "T$text"; 1345 $self->{text} = "T$text";
1319 1346
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1320 $self->{layout}->set_text ($text); 1348 $self->{layout}->set_text ($text);
1321 1349
1322 delete $self->{texture};
1323 $self->update; 1350 $self->update;
1324 $self->check_size; 1351 $self->check_size;
1325} 1352}
1326 1353
1327sub set_markup { 1354sub set_markup {
1328 my ($self, $markup) = @_; 1355 my ($self, $markup) = @_;
1329 1356
1330 return if $self->{text} eq "M$markup"; 1357 return if $self->{text} eq "M$markup";
1331 $self->{text} = "M$markup"; 1358 $self->{text} = "M$markup";
1332 1359
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1333 $self->{layout}->set_markup ($markup); 1363 $self->{layout}->set_markup ($markup);
1334 1364
1335 delete $self->{texture};
1336 $self->update; 1365 $self->update;
1337 $self->check_size; 1366 $self->check_size;
1338} 1367}
1339 1368
1340sub size_request { 1369sub size_request {
1341 my ($self) = @_; 1370 my ($self) = @_;
1342 1371
1343 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1344 $self->{layout}->set_width ($self->{max_w} || -1); 1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1345 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1346 1377
1347 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1348 1379
1349 if (exists $self->{template}) { 1380 if (exists $self->{template}) {
… …
1371sub set_fontsize { 1402sub set_fontsize {
1372 my ($self, $fontsize) = @_; 1403 my ($self, $fontsize) = @_;
1373 1404
1374 $self->{fontsize} = $fontsize; 1405 $self->{fontsize} = $fontsize;
1375 delete $self->{texture}; 1406 delete $self->{texture};
1407
1408 $self->update;
1376 $self->check_size; 1409 $self->check_size;
1377 $self->update;
1378} 1410}
1379 1411
1380sub _draw { 1412sub _draw {
1381 my ($self) = @_; 1413 my ($self) = @_;
1382 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1383 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1385 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1386 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424
1387 new_from_layout CFClient::Texture $self->{layout} 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1388 }; 1436 };
1389 1437
1390 glEnable GL_BLEND;
1391 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1392 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
1393 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1394 1440
1441 if ($tex->{format} == GL_ALPHA) {
1395 glColor @{$self->{fg}}; 1442 glColor @{$self->{fg}};
1396
1397 $self->{ox} = int (
1398 $self->{align} < 0 ? $self->{padding}
1399 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1400 : ($self->{w} - $tex->{w}) * 0.5
1401 );
1402
1403 $self->{oy} = int (
1404 $self->{valign} < 0 ? $self->{padding}
1405 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1406 : ($self->{h} - $tex->{h}) * 0.5
1407 );
1408
1409 $tex->draw_quad ($self->{ox}, $self->{oy}); 1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 }
1410 1447
1411 glDisable GL_TEXTURE_2D; 1448 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413} 1449}
1414 1450
1415############################################################################# 1451#############################################################################
1416 1452
1417package CFClient::UI::EntryBase; 1453package CFClient::UI::EntryBase;
… …
1452 $self->{layout}->set_text ("$text "); 1488 $self->{layout}->set_text ("$text ");
1453 1489
1454 $self->emit (changed => $self->{text}); 1490 $self->emit (changed => $self->{text});
1455} 1491}
1456 1492
1457sub get_text {
1458 $_[0]{text}
1459}
1460
1461sub size_request {
1462 my ($self) = @_;
1463
1464 my ($w, $h) = $self->SUPER::size_request;
1465
1466 ($w + 1, $h) # add 1 for cursor
1467}
1468
1469sub size_allocate {
1470 my ($self, $w, $h) = @_;
1471
1472 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1473}
1474
1475sub set_text { 1493sub set_text {
1476 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1477 1495
1478 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1479 $self->_set_text ($text); 1497 $self->_set_text ($text);
1480 $self->update; 1498 $self->update;
1499 $self->check_size;
1500}
1501
1502sub get_text {
1503 $_[0]{text}
1504}
1505
1506sub size_request {
1507 my ($self) = @_;
1508
1509 my ($w, $h) = $self->SUPER::size_request;
1510
1511 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1481} 1518}
1482 1519
1483sub key_down { 1520sub key_down {
1484 my ($self, $ev) = @_; 1521 my ($self, $ev) = @_;
1485 1522
… …
1487 my $sym = $ev->{sym}; 1524 my $sym = $ev->{sym};
1488 my $uni = $ev->{unicode}; 1525 my $uni = $ev->{unicode};
1489 1526
1490 my $text = $self->get_text; 1527 my $text = $self->get_text;
1491 1528
1492 if ($sym == 8) { 1529 if ($uni == 8) {
1493 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1494 } elsif ($sym == 127) { 1531 } elsif ($uni == 127) {
1495 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1496 } elsif ($sym == CFClient::SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1497 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1498 } elsif ($sym == CFClient::SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1499 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1500 } elsif ($sym == CFClient::SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1501 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1502 } elsif ($sym == CFClient::SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1503 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1504 } elsif ($sym == 27) { 1541 } elsif ($uni == 27) {
1505 $self->emit ('escape'); 1542 $self->emit ('escape');
1506 } elsif ($uni) { 1543 } elsif ($uni) {
1507 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1508 } 1545 }
1509 1546
1510 $self->_set_text ($text); 1547 $self->_set_text ($text);
1511 $self->update; 1548 $self->update;
1549 $self->check_size;
1512} 1550}
1513 1551
1514sub focus_in { 1552sub focus_in {
1515 my ($self) = @_; 1553 my ($self) = @_;
1516 1554
… …
1645 my $class = shift; 1683 my $class = shift;
1646 1684
1647 $class->SUPER::new ( 1685 $class->SUPER::new (
1648 padding => 4, 1686 padding => 4,
1649 fg => [1, 1, 1], 1687 fg => [1, 1, 1],
1650 bg => [1, 1, 1, 0.2],
1651 active_fg => [0, 0, 1], 1688 active_fg => [0, 0, 1],
1652 can_hover => 1, 1689 can_hover => 1,
1653 align => 0, 1690 align => 0,
1654 valign => 0, 1691 valign => 0,
1655 can_events => 1, 1692 can_events => 1,
… …
1673 1710
1674 if ($GRAB == $self) { 1711 if ($GRAB == $self) {
1675 $self->{fg} = $self->{active_fg}; 1712 $self->{fg} = $self->{active_fg};
1676 } 1713 }
1677 1714
1678 glEnable GL_BLEND;
1679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1680 glEnable GL_TEXTURE_2D; 1715 glEnable GL_TEXTURE_2D;
1681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1682 glColor 0, 0, 0, 1; 1717 glColor 0, 0, 0, 1;
1683 1718
1684 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1685 1720
1686 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1687 glDisable GL_BLEND;
1688 1722
1689 $self->SUPER::_draw; 1723 $self->SUPER::_draw;
1690} 1724}
1691 1725
1692############################################################################# 1726#############################################################################
… …
1706 1740
1707 $class->SUPER::new ( 1741 $class->SUPER::new (
1708 padding => 2, 1742 padding => 2,
1709 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1710 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1711 state => 0, 1747 state => 0,
1712 can_hover => 1, 1748 can_hover => 1,
1713 @_ 1749 @_
1714 ) 1750 )
1715} 1751}
… …
1739 1775
1740 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1741 1777
1742 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1743 1779
1744 glEnable GL_BLEND; 1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1745 glEnable GL_TEXTURE_2D; 1782 glEnable GL_TEXTURE_2D;
1746 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1747
1748 my $tex = $self->{state} ? $tex[1] : $tex[0];
1749
1750 $tex->draw_quad (0, 0, $s, $s); 1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1751
1752 glDisable GL_TEXTURE_2D; 1784 glDisable GL_TEXTURE_2D;
1753 glDisable GL_BLEND;
1754} 1785}
1755 1786
1756############################################################################# 1787#############################################################################
1757 1788
1758package CFClient::UI::Image; 1789package CFClient::UI::Image;
… …
1801 glTranslate 0, -$self->{w}, 0; 1832 glTranslate 0, -$self->{w}, 0;
1802 1833
1803 ($w, $h) = ($h, $w); 1834 ($w, $h) = ($h, $w);
1804 } 1835 }
1805 1836
1806 glEnable GL_BLEND;
1807 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1808 glEnable GL_TEXTURE_2D; 1837 glEnable GL_TEXTURE_2D;
1809 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1810 1839
1811 $tex->draw_quad (0, 0, $w, $h); 1840 $tex->draw_quad_alpha (0, 0, $w, $h);
1812 1841
1813 glDisable GL_BLEND;
1814 glDisable GL_TEXTURE_2D; 1842 glDisable GL_TEXTURE_2D;
1815} 1843}
1816 1844
1817############################################################################# 1845#############################################################################
1818 1846
… …
2007 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
2008 2036
2009sub new { 2037sub new {
2010 my $class = shift; 2038 my $class = shift;
2011 2039
2012 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
2013 2041
2014 # TODO: 0-width page 2042 # TODO: 0-width page
2015 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
2016 # TODO: calculations are off 2044 # TODO: calculations are off
2017 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
2018 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
2019 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2020 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
2021 req_w => $::WIDTH / 80, 2051 req_w => $::WIDTH / 80,
2022 req_h => $::WIDTH / 80, 2052 req_h => $::WIDTH / 80,
2023 vertical => 0, 2053 vertical => 0,
2024 can_hover => 1, 2054 can_hover => 1,
2025 inner_pad => 5, 2055 inner_pad => 0.02,
2026 @_ 2056 @_
2027 ); 2057 );
2028 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
2029 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
2030} 2086}
2031 2087
2032sub size_request { 2088sub size_request {
2033 my ($self) = @_; 2089 my ($self) = @_;
2034 2090
… …
2047 2103
2048sub mouse_motion { 2104sub mouse_motion {
2049 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
2050 2106
2051 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
2052 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
2053 2125
2054 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
2055 2127
2056 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
2057 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2058 2129
2059 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
2060 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
2061 $x = $lo if $x < $lo;
2062 $x = $hi - $page if $x > $hi - $page;
2063 $self->{range}[0] = $x;
2064 2132
2065 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2066 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
2067 } 2140 });
2068}
2069 2141
2070# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
2071# so that the handle doesn't leave the texture. This calculation isn't 100%
2072# correct propably, but it does the job for now
2073sub _calc_inner_pad_px {
2074 my ($self, $w) = @_;
2075 ($w / 100) * $self->{inner_pad} # % to pixels
2076} 2143}
2077 2144
2078sub _draw { 2145sub _draw {
2079 my ($self) = @_; 2146 my ($self) = @_;
2080 2147
2081 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
2082 2149
2083 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
2084 2151
2085 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
2086 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
2087 2154
2155 glTranslate 1, 0, 0;
2088 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
2089 glTranslate 0, -$self->{w}, 0;
2090
2091 ($w, $h) = ($h, $w);
2092 } 2157 }
2093 2158
2094 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2095 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2096 2161
2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
2098
2099 $hi = $value + 1 if $lo == $hi;
2100
2101 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2102 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2103
2104 $page = int $page * $inner_w / ($hi - $lo);
2105 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2106
2107 $w -= $page;
2108 $page &= ~1;
2109 glTranslate $page * 0.5, 0, 0;
2110 $page ||= 2;
2111
2112 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2113 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2114
2115 glEnable GL_BLEND;
2116 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2117 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
2118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2119 2164
2120 # draw background 2165 # draw background
2121 $tex[1]->draw_quad (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2122 2167
2123 # draw handle 2168 # draw handle
2124 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2125 2170
2126 glDisable GL_BLEND;
2127 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
2128} 2172}
2129 2173
2130############################################################################# 2174#############################################################################
2131 2175
… …
2142 fontsize => 1, 2186 fontsize => 1,
2143 can_events => 0, 2187 can_events => 0,
2144 #font => default_font 2188 #font => default_font
2145 @_, 2189 @_,
2146 2190
2147 layout => (new CFClient::Layout), 2191 layout => (new CFClient::Layout 1),
2148 par => [], 2192 par => [],
2149 height => 0, 2193 height => 0,
2150 children => [ 2194 children => [
2151 (new CFClient::UI::Empty expand => 1), 2195 (new CFClient::UI::Empty expand => 1),
2152 (new CFClient::UI::Slider vertical => 1), 2196 (new CFClient::UI::Slider vertical => 1),
… …
2170 2214
2171 my $layout = $self->{layout}; 2215 my $layout = $self->{layout};
2172 2216
2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2174 $layout->set_width ($self->{children}[0]{w}); 2218 $layout->set_width ($self->{children}[0]{w});
2175 $layout->set_text ($text); 2219 $layout->set_markup ($text);
2176 2220
2177 ($layout->size)[1] 2221 ($layout->size)[1]
2178} 2222}
2179 2223
2180sub reflow { 2224sub reflow {
… …
2218 2262
2219 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
2220 2264
2221 delete $self->{texture}; 2265 delete $self->{texture};
2222 2266
2223 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
2224 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
2225 my $height = 0; 2269 my $height = 0;
2226 2270
2227 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
2228 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
2233 2277
2234 delete $self->{texture}; 2278 delete $self->{texture};
2235 } 2279 }
2236 2280
2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2238 glClearColor 0, 0, 0, 0; 2282 glClearColor 0.5, 0.5, 0.5, 0;
2239 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
2240 2284
2241 glEnable GL_BLEND;
2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2243 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2245 2287
2246 my $top = int $self->{children}[1]{range}[0]; 2288 my $top = int $self->{children}[1]{range}[0];
2247 2289
… …
2256 2298
2257 for my $par (@{$self->{par}}) { 2299 for my $par (@{$self->{par}}) {
2258 my $h = $par->[0]; 2300 my $h = $par->[0];
2259 2301
2260 if ($y0 < $y + $h && $y < $y1) { 2302 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
2261 $layout->set_text ($par->[2]); 2304 $layout->set_markup ($par->[2]);
2262 2305
2263 glColor @{ $par->[1] };
2264 my ($W, $H) = $layout->size; 2306 my ($W, $H) = $layout->size;
2265 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2266 } 2308 }
2267 2309
2268 $y += $h; 2310 $y += $h;
2269 } 2311 }
2270 2312
2271 glDisable GL_TEXTURE_2D; 2313 glDisable GL_TEXTURE_2D;
2272 glDisable GL_BLEND;
2273 }; 2314 };
2274 }); 2315 });
2275} 2316}
2276 2317
2277sub _draw { 2318sub _draw {
2278 my ($self) = @_; 2319 my ($self) = @_;
2279 2320
2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2282 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2284 glColor 1, 1, 1, 1; 2323 glColor 1, 1, 1, 1;
2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2286 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2287 glDisable GL_BLEND;
2288 2326
2289 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
2290 2328
2291} 2329}
2292 2330
… …
2386 @_, 2424 @_,
2387 can_events => 0, 2425 can_events => 0,
2388 ) 2426 )
2389} 2427}
2390 2428
2391sub set_markup { 2429sub set_tooltip_from {
2392 my ($self, $text) = @_; 2430 my ($self, $widget) = @_;
2393 2431
2394 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2432 $self->add (new CFClient::UI::Label
2395 $self->{label}->set_markup ($text); 2433 markup => $widget->{tooltip},
2396 $self->add ($self->{label}); 2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8,
2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 );
2397} 2440}
2398 2441
2399sub size_request { 2442sub size_request {
2400 my ($self) = @_; 2443 my ($self) = @_;
2401
2402 $self->child->set_max_size ($::WIDTH * 0.3);
2403 2444
2404 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2405 2446
2406 ($w + 4, $h + 4) 2447 ($w + 4, $h + 4)
2407} 2448}
… …
2413} 2454}
2414 2455
2415sub _draw { 2456sub _draw {
2416 my ($self) = @_; 2457 my ($self) = @_;
2417 2458
2418 glPushMatrix;
2419 glTranslate 0.375, 0.375; 2459 glTranslate 0.375, 0.375;
2420 2460
2421 my ($w, $h) = @$self{qw(w h)}; 2461 my ($w, $h) = @$self{qw(w h)};
2422 2462
2423 glColor 1, 0.8, 0.4; 2463 glColor 1, 0.8, 0.4;
… …
2434 glVertex 0 , $h; 2474 glVertex 0 , $h;
2435 glVertex $w, $h; 2475 glVertex $w, $h;
2436 glVertex $w, 0; 2476 glVertex $w, 0;
2437 glEnd; 2477 glEnd;
2438 2478
2439 glPopMatrix; 2479 glTranslate 2 - 0.375, 2 - 0.375;
2440
2441 glTranslate 2, 2;
2442 $self->SUPER::_draw; 2480 $self->SUPER::_draw;
2443} 2481}
2444 2482
2445############################################################################# 2483#############################################################################
2446 2484
… …
2451use CFClient::OpenGL; 2489use CFClient::OpenGL;
2452 2490
2453sub new { 2491sub new {
2454 my $class = shift; 2492 my $class = shift;
2455 2493
2456 $class->SUPER::new ( 2494 my $self = $class->SUPER::new (
2457 aspect => 1, 2495 aspect => 1,
2458 @_, 2496 @_,
2459 ) 2497 );
2498
2499 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self);
2501
2502 $self->{timer} = Event->timer (
2503 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2504 hard => 1,
2505 interval => $self->{animspeed},
2506 cb => sub {
2507 ++$widget->{frame};
2508 $widget->update;
2509 },
2510 );
2511 }
2512
2513 $self
2460} 2514}
2461 2515
2462sub size_request { 2516sub size_request {
2463 (32, 8) 2517 (32, 8)
2464} 2518}
2465 2519
2466sub _draw { 2520sub _draw {
2467 my ($self) = @_; 2521 my ($self) = @_;
2468 2522
2523 return unless $::CONN;#d# manage and cache textures differently
2524
2525 my $face;
2526
2527 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}];
2529
2530 $face = $anim->[ $self->{frame} % @$anim ]
2531 if $anim && @$anim;
2532 }
2533
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470 2535
2471 # TODO animation
2472 if ($tex) { 2536 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D; 2537 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1; 2539 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D; 2541 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 } 2542 }
2543}
2544
2545sub DESTROY {
2546 my ($self) = @_;
2547
2548 $self->{timer}->cancel
2549 if $self->{timer};
2550
2551 $self->SUPER::DESTROY;
2552}
2553
2554#############################################################################
2555
2556package CFClient::UI::InventoryItem;
2557
2558our @ISA = CFClient::UI::HBox::;
2559
2560sub _item_to_desc {
2561 my ($item) = @_;
2562
2563 my $desc =
2564 $item->{nrof} < 2
2565 ? $item->{name}
2566 : "$item->{nrof} × $item->{name_pl}";
2567
2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2569 and $desc .= " (open)";
2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2571 and $desc .= " (applied)";
2572 $item->{flags} & Crossfire::Protocol::F_UNPAID
2573 and $desc .= " (unpaid)";
2574 $item->{flags} & Crossfire::Protocol::F_MAGIC
2575 and $desc .= " (magic)";
2576 $item->{flags} & Crossfire::Protocol::F_CURSED
2577 and $desc .= " (cursed)";
2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2579 and $desc .= " (damned)";
2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2581 and $desc .= " *";
2582
2583 $desc
2584}
2585
2586sub new {
2587 my $class = shift;
2588
2589 my %args = @_;
2590
2591 my $item = delete $args{item};
2592
2593 my $desc = _item_to_desc ($item);
2594
2595 my $self = $class->SUPER::new (
2596 can_hover => 1,
2597 can_events => 1,
2598 tooltip => ((CFClient::UI::Label::escape $desc)
2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2600 connect_button_down => sub {
2601 my ($self, $ev, $x, $y) = @_;
2602
2603 # todo: maybe put examine on 1? but should just be a tooltip :(
2604 if ($ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag};
2606
2607 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT;
2609 }
2610
2611 $::CONN->send ("move $targ $item->{tag} 0");
2612 } elsif ($ev->{button} == 2) {
2613 $::CONN->send ("apply $item->{tag}");
2614 } elsif ($ev->{button} == 3) {
2615 my @menu_items = (
2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2620 [
2621 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2622 sub { $::CONN->send ("lock $item->{tag}") },
2623 ],
2624 );
2625
2626 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2627 }
2628
2629 1
2630 },
2631 %args
2632 );
2633
2634
2635 $self->add (new CFClient::UI::Face
2636 can_events => 0,
2637 face => $item->{face},
2638 anim => $item->{anim},
2639 animspeed => $item->{animspeed},
2640 );
2641
2642 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2643
2644 $self->{item} = $item;
2645
2646 $self->update_item;
2647
2648 $self
2649}
2650
2651sub update_item {
2652 my ($self) = @_;
2653
2654 my $desc = _item_to_desc ($self->{item});
2655
2656 $self->{name_lbl}->set_text ($desc);
2657}
2658
2659#############################################################################
2660
2661package CFClient::UI::Inventory;
2662
2663our @ISA = CFClient::UI::ScrolledWindow::;
2664
2665sub new {
2666 my $class = shift;
2667
2668 my $self = $class->SUPER::new (
2669 scrolled => (new CFClient::UI::VBox),
2670 @_,
2671 );
2672
2673 $self
2674}
2675
2676sub set_items {
2677 my ($self, $items) = @_;
2678
2679 $self->{scrolled}->clear;
2680 return unless $items;
2681
2682 my @items = sort {
2683 ($a->{type} <=> $b->{type})
2684 or ($a->{name} cmp $b->{name})
2685 } @$items;
2686
2687 $self->{real_items} = \@items;
2688
2689 for my $item (@items) {
2690 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2691 $item->update_item ();
2692 }
2693
2694 $self->{scrolled}->add (@items);
2695
2696# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2697}
2698
2699sub size_request {
2700 my ($self) = @_;
2701 ($self->{req_w}, $self->{req_h});
2482} 2702}
2483 2703
2484############################################################################# 2704#############################################################################
2485 2705
2486package CFClient::UI::Menu; 2706package CFClient::UI::Menu;
… …
2553 } 2773 }
2554} 2774}
2555 2775
2556############################################################################# 2776#############################################################################
2557 2777
2778package CFClient::UI::Statusbox;
2779
2780our @ISA = CFClient::UI::VBox::;
2781
2782sub new {
2783 my $class = shift;
2784
2785 $class->SUPER::new (
2786 fontsize => 0.8,
2787 @_,
2788 )
2789}
2790
2791sub reorder {
2792 my ($self) = @_;
2793 my $NOW = time;
2794
2795 while (my ($k, $v) = each %{ $self->{item} }) {
2796 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2797 }
2798
2799 my @widgets;
2800
2801 my @items = sort {
2802 $a->{pri} <=> $b->{pri}
2803 or $b->{id} <=> $a->{id}
2804 } values %{ $self->{item} };
2805
2806 my $count = 10 + 1;
2807 for my $item (@items) {
2808 last unless --$count;
2809
2810 push @widgets, $item->{label} ||= do {
2811 # TODO: doesn't handle markup well (read as: at all)
2812 my $short = $item->{count} > 1
2813 ? "<b>$item->{count} ×</b> $item->{text}"
2814 : $item->{text};
2815
2816 for ($short) {
2817 s/^\s+//;
2818 s/\s+/ /g;
2819 }
2820
2821 new CFClient::UI::Label
2822 markup => $short,
2823 tooltip => $item->{tooltip},
2824 tooltip_font => $::FONT_PROP,
2825 tooltip_width => 0.67,
2826 fontsize => $item->{fontsize} || $self->{fontsize},
2827 max_w => $::WIDTH * 0.44,
2828 fg => $item->{fg},
2829 can_events => 1,
2830 can_hover => 1
2831 };
2832 }
2833
2834 $self->clear;
2835 $self->SUPER::add (reverse @widgets);
2836}
2837
2838sub add {
2839 my ($self, $text, %arg) = @_;
2840
2841 $text =~ s/^\s+//;
2842 $text =~ s/\s+$//;
2843
2844 my $timeout = time + ((delete $arg{timeout}) || 60);
2845
2846 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2847
2848 if (my $item = $self->{item}{$group}) {
2849 if ($item->{text} eq $text) {
2850 $item->{count}++;
2851 } else {
2852 $item->{count} = 1;
2853 $item->{text} = $item->{tooltip} = $text;
2854 }
2855 $item->{id} = ++$self->{id};
2856 $item->{timeout} = $timeout;
2857 delete $item->{label};
2858 } else {
2859 $self->{item}{$group} = {
2860 id => ++$self->{id},
2861 text => $text,
2862 timeout => $timeout,
2863 tooltip => $text,
2864 fg => [0.8, 0.8, 0.8, 0.8],
2865 pri => 0,
2866 count => 1,
2867 %arg,
2868 };
2869 }
2870
2871 $self->reorder;
2872}
2873
2874sub reconfigure {
2875 my ($self) = @_;
2876
2877 delete $_->{label}
2878 for values %{ $self->{item} || {} };
2879
2880 $self->reorder;
2881 $self->SUPER::reconfigure;
2882}
2883
2884#############################################################################
2885
2558package CFClient::UI::Root; 2886package CFClient::UI::Root;
2559 2887
2560our @ISA = CFClient::UI::Container::; 2888our @ISA = CFClient::UI::Container::;
2561 2889
2562use CFClient::OpenGL; 2890use CFClient::OpenGL;
2563 2891
2564sub check_size { 2892sub new {
2565 my ($self) = @_; 2893 my $class = shift;
2566 2894
2567 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2895 $class->SUPER::new (
2568} 2896 @_,
2569 2897 )
2570sub size_request {
2571 ($::WIDTH, $::HEIGHT)
2572} 2898}
2573 2899
2574sub configure { 2900sub configure {
2575 my ($self, $x, $y, $w, $h) = @_; 2901 my ($self, $x, $y, $w, $h) = @_;
2576 2902
2577 $self->SUPER::configure ($x, $y, $w, $h); 2903 $self->{w} = $w;
2904 $self->{h} = $h;
2905}
2578 2906
2907sub check_size {
2908 my ($self) = @_;
2909
2910 $self->size_allocate ($self->{w}, $self->{h})
2911 if $self->{w};
2912}
2913
2914sub size_request {
2915 my ($self) = @_;
2916
2917 ($self->{w}, $self->{h})
2918}
2919
2920sub size_allocate {
2921 my ($self, $w, $h) = @_;
2922
2923 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2924 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2925
2926 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2927 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2928
2579 for my $child (@{$self->{children}}) { 2929 for my $child ($self->children) {
2580 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2930 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2581 2931
2932 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2933 if exists $child->{req_x};
2934
2935 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2936 if exists $child->{req_y};
2937
2582 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2938 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2583 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2939 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2940
2584 $child->configure ($X, $Y, $W,$H); 2941 $child->configure ($X, $Y, $W, $H);
2585 } 2942 }
2586} 2943}
2587 2944
2588sub _topleft { 2945sub coord2local {
2589 my ($self, $x, $y) = @_; 2946 my ($self, $x, $y) = @_;
2590 2947
2591 ($x, $y) 2948 ($x, $y)
2592} 2949}
2593 2950
2951sub coord2global {
2952 my ($self, $x, $y) = @_;
2953
2954 ($x, $y)
2955}
2956
2594sub update { 2957sub update {
2595 my ($self) = @_; 2958 my ($self) = @_;
2596 2959
2597 $self->check_size; 2960 $self->check_size;
2598 ::refresh (); 2961 $::WANT_REFRESH++;
2599} 2962}
2600 2963
2601sub add { 2964sub add {
2602 my ($self, $child) = @_; 2965 my ($self, @children) = @_;
2603 2966
2967 for my $child (@children) {
2968 $child->{toplevel} = 1;
2969
2604 # integerize window positions 2970 # integerise window positions
2605 $child->{x} = int $child->{x}; 2971 $child->{x} = int $child->{x};
2606 $child->{y} = int $child->{y}; 2972 $child->{y} = int $child->{y};
2973 }
2607 2974
2608 $self->SUPER::add ($child); 2975 $self->SUPER::add (@children);
2609} 2976}
2610 2977
2611sub on_refresh { 2978sub on_refresh {
2612 my ($self, $id, $cb) = @_; 2979 my ($self, $id, $cb) = @_;
2613 2980
2614 $self->{refresh_hook}{$id} = $cb; 2981 $self->{refresh_hook}{$id} = $cb;
2615} 2982}
2616 2983
2984sub on_post_alloc {
2985 my ($self, $id, $cb) = @_;
2986
2987 $self->{post_alloc_hook}{$id} = $cb;
2988}
2989
2617sub draw { 2990sub draw {
2618 my ($self) = @_; 2991 my ($self) = @_;
2619 2992
2620 while (my $rcb = delete $self->{refresh_hook}) { 2993 while ($self->{refresh_hook}) {
2621 $_->() for values %$rcb; 2994 $_->()
2995 for values %{delete $self->{refresh_hook}};
2996 }
2997
2998 if ($self->{check_size}) {
2999 my @queue = ([], []);
3000
3001 for (;;) {
3002 if ($self->{check_size}) {
3003 # heuristic: check containers last
3004 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3005 for values %{delete $self->{check_size}}
3006 }
3007
3008 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3009
3010 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3011 ? @$widget{qw(user_w user_h)}
3012 : $widget->size_request;
3013
3014 if (delete $widget->{force_alloc}
3015 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3016 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3017
3018 $widget->{req_w} = $w;
3019 $widget->{req_h} = $h;
3020
3021 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3022
3023 $widget->{parent}->check_size
3024 if $widget->{parent};
3025 }
3026 }
3027 }
3028
3029 while ($self->{size_alloc}) {
3030 for (values %{delete $self->{size_alloc}}) {
3031 my ($widget, $w, $h) = @$_;
3032
3033 $w = 0 if $w < 0;
3034 $h = 0 if $h < 0;
3035
3036 $widget->{w} = $w;
3037 $widget->{h} = $h;
3038 $widget->size_allocate ($w, $h);
3039 $widget->emit (size_allocate => $w, $h);
3040 }
3041 }
3042
3043 while ($self->{post_alloc_hook}) {
3044 $_->()
3045 for values %{delete $self->{post_alloc_hook}};
2622 } 3046 }
2623 3047
2624 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3048 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2625 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3049 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2626 glClear GL_COLOR_BUFFER_BIT; 3050 glClear GL_COLOR_BUFFER_BIT;
… …
2634 $self->_draw; 3058 $self->_draw;
2635} 3059}
2636 3060
2637############################################################################# 3061#############################################################################
2638 3062
2639package CFClient::UI::InventoryItem;
2640
2641our @ISA = CFClient::UI::HBox::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my %args = @_;
2647
2648 my $item = $args{item};
2649
2650 my $desc = $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} $item->{name_pl}";
2653
2654
2655 my $self = $class->SUPER::new (
2656 can_hover => 1,
2657 can_events => 1,
2658 tooltip => (CFClient::UI::Label->escape ($desc)
2659 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2660 connect_button_down => sub {
2661 my ($self, $ev, $x, $y) = @_;
2662
2663 # todo: maybe put examine on 1? but should just be a tooltip :(
2664 if ($ev->{button} == 1) {
2665 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2666 } elsif ($ev->{button} == 2) {
2667 $::CONN->send ("apply $item->{tag}");
2668 } elsif ($ev->{button} == 3) {
2669 CFClient::UI::Menu->new (
2670 items => [
2671 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2672 [
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2674 sub { $::CONN->send ("lock $item->{tag}") },
2675 ],
2676 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2677 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2678 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2679 ],
2680 )->popup ($ev);
2681 }
2682
2683 1
2684 },
2685 %args
2686 );
2687 $self->add(new CFClient::UI::Face
2688 can_events => 0,
2689 face => $item->{face},
2690 anim => $item->{anim},
2691 animspeed => $item->{animspeed});
2692 $self->add(new CFClient::UI::Label
2693 can_events => 0,
2694 text => $desc);
2695
2696 $self
2697}
2698
2699#############################################################################
2700
2701package CFClient::UI::Inventory;
2702
2703our @ISA = CFClient::UI::ScrolledWindow::;
2704
2705sub new {
2706 my $class = shift;
2707
2708 my $self = $class->SUPER::new (
2709 scrolled => (new CFClient::UI::VBox),
2710 @_,
2711 );
2712
2713 $self
2714}
2715
2716sub set_items {
2717 my ($self, $items) = @_;
2718
2719 $self->{scrolled}->clear;
2720 return unless $items;
2721
2722 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2723
2724 $self->{real_items} = \@items;
2725
2726 for my $item (@items) {
2727 my $desc = $item->{nrof} < 2
2728 ? $item->{name}
2729 : "$item->{nrof} $item->{name_pl}";
2730
2731 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2732 }
2733
2734# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2735}
2736
2737sub size_request {
2738 my ($self) = @_;
2739 ($self->{req_w}, $self->{req_h});
2740}
2741
2742#############################################################################
2743
2744package CFClient::UI; 3063package CFClient::UI;
2745 3064
2746$ROOT = new CFClient::UI::Root; 3065$ROOT = new CFClient::UI::Root;
2747$TOOLTIP = new CFClient::UI::Tooltip; 3066$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2748 3067
27491 30681
2750 3069

Diff Legend

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