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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.231 by root, Thu May 25 00:26:19 2006 UTC

… …
11our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
12 12
13our $ROOT; 13our $ROOT;
14our $TOOLTIP; 14our $TOOLTIP;
15our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
16 18
17sub check_tooltip { 19sub check_tooltip {
18 if (!$GRAB) { 20 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
29 $TOOLTIP->set_tooltip_from ($widget); 31 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size; 40 $TOOLTIP->check_size;
40 $TOOLTIP->update; 41 $TOOLTIP->update;
41 } 42 }
… …
49 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
50} 51}
51 52
52# class methods for events 53# class methods for events
53sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 56 if $FOCUS;
56} 57}
57 58
58sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 61 if $FOCUS;
61} 62}
62 63
63sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
64 my ($ev) = @_; 65 my ($ev) = @_;
… …
73 check_tooltip; 74 check_tooltip;
74 } 75 }
75 76
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 78
78 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 81}
83 82
84sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
85 my ($ev) = @_; 84 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
87 86
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 88
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 90
92 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 93
97 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 96 $grab->update if $grab;
100 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 114
118 check_tooltip; 115 check_tooltip;
119 } 116 }
120 117
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 119 if $HOVER;
125} 120}
126 121
127# convert position array to integers 122# convert position array to integers
128sub harmonize { 123sub harmonize {
129 my ($vals) = @_; 124 my ($vals) = @_;
… …
133 for (@$vals) { 128 for (@$vals) {
134 my $i = int $_ + $rem; 129 my $i = int $_ + $rem;
135 $rem += $_ - $i; 130 $rem += $_ - $i;
136 $_ = $i; 131 $_ = $i;
137 } 132 }
133}
134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
151# call when resolution changes etc.
152sub rescale_widgets {
153 my ($sx, $sy) = @_;
154
155 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 }
166 }
167
168 reconfigure_widgets;
138} 169}
139 170
140############################################################################# 171#############################################################################
141 172
142package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
160 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
162 } 193 }
163 } 194 }
164 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
165 $self 198 $self
166} 199}
167 200
168sub destroy { 201sub destroy {
169 my ($self) = @_; 202 my ($self) = @_;
… …
172 %$self = (); 205 %$self = ();
173} 206}
174 207
175sub show { 208sub show {
176 my ($self) = @_; 209 my ($self) = @_;
177
178 return if $self->{parent}; 210 return if $self->{parent};
179 211
180 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
181} 213}
182 214
183sub hide { 215sub show_centered {
184 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
185 234
186 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 $self->focus_out;
239}
240
241sub hide {
242 my ($self) = @_;
243
244 $self->set_invisible;
188 245
189 $self->{parent}->remove ($self) 246 $self->{parent}->remove ($self)
190 if $self->{parent}; 247 if $self->{parent};
191} 248}
192 249
… …
242 299
243sub size_allocate { 300sub size_allocate {
244 # nothing to be done 301 # nothing to be done
245} 302}
246 303
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
247sub children { 311sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260} 312}
261 313
262sub set_max_size { 314sub set_max_size {
263 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
264 316
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 317 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 318 delete $self->{max_h}; $self->{max_h} = $h if $h;
319}
320
321sub set_tooltip {
322 my ($self, $tooltip) = @_;
323
324 $self->{tooltip} = $tooltip;
325
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner};
328 CFClient::UI::check_tooltip;
329 }
267} 330}
268 331
269# translate global coordinates to local coordinate system 332# translate global coordinates to local coordinate system
270sub coord2local { 333sub coord2local {
271 my ($self, $x, $y) = @_; 334 my ($self, $x, $y) = @_;
… …
286 return if $FOCUS == $self; 349 return if $FOCUS == $self;
287 return unless $self->{can_focus}; 350 return unless $self->{can_focus};
288 351
289 my $focus = $FOCUS; $FOCUS = $self; 352 my $focus = $FOCUS; $FOCUS = $self;
290 353
291 $self->emit (focus_in => $focus); 354 $self->_emit (focus_in => $focus);
292 355
293 $focus->update if $focus; 356 $focus->update if $focus;
294 $FOCUS->update; 357 $FOCUS->update;
295} 358}
296 359
… …
299 362
300 return unless $FOCUS == $self; 363 return unless $FOCUS == $self;
301 364
302 my $focus = $FOCUS; undef $FOCUS; 365 my $focus = $FOCUS; undef $FOCUS;
303 366
304 $self->emit (focus_out => $focus); 367 $self->_emit (focus_out => $focus);
305 368
306 $focus->update if $focus; #? 369 $focus->update if $focus; #?
370
371 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
372 unless $FOCUS;
307} 373}
308 374
309sub mouse_motion { } 375sub mouse_motion { }
310sub button_up { } 376sub button_up { }
311sub key_down { } 377sub key_down { }
312sub key_up { } 378sub key_up { }
313 379
314sub button_down { 380sub button_down {
315 my ($self, $ev, $x, $y) = @_; 381 my ($self, $ev, $x, $y) = @_;
316 382
317 $self->focus_in; 383 $self->focus_in;
… …
357 glVertex $self->{w}, 0; 423 glVertex $self->{w}, 0;
358 glVertex $self->{w}, $self->{h}; 424 glVertex $self->{w}, $self->{h};
359 glVertex 0 , $self->{h}; 425 glVertex 0 , $self->{h};
360 glEnd; 426 glEnd;
361 glPopMatrix; 427 glPopMatrix;
362 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 428 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363 } 429 }
364} 430}
365 431
366sub _draw { 432sub _draw {
367 my ($self) = @_; 433 my ($self) = @_;
… …
384sub set_parent { 450sub set_parent {
385 my ($self, $parent) = @_; 451 my ($self, $parent) = @_;
386 452
387 Scalar::Util::weaken ($self->{parent} = $parent); 453 Scalar::Util::weaken ($self->{parent} = $parent);
388 454
455 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size 456 $self->check_size
390 unless exists $self->{req_w}; 457 unless exists $self->{req_w};
458
459 $self->show;
391} 460}
392 461
393sub check_size { 462sub check_size {
394 my ($self, $forced) = @_; 463 my ($self, $forced) = @_;
395 464
… …
408 my ($self, $signal, $cb) = @_; 477 my ($self, $signal, $cb) = @_;
409 478
410 push @{ $self->{signal_cb}{$signal} }, $cb; 479 push @{ $self->{signal_cb}{$signal} }, $cb;
411} 480}
412 481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
413sub emit { 488sub emit {
414 my ($self, $signal, @args) = @_; 489 my ($self, $signal, @args) = @_;
415 490
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
417} 493}
418 494
419sub DESTROY { 495sub DESTROY {
420 my ($self) = @_; 496 my ($self) = @_;
421 497
498 delete $WIDGET{$self+0};
422 #$self->deactivate; 499 #$self->deactivate;
423} 500}
424 501
425############################################################################# 502#############################################################################
426 503
… …
435 my $class = shift; 512 my $class = shift;
436 513
437 # range [value, low, high, page] 514 # range [value, low, high, page]
438 515
439 $class->SUPER::new ( 516 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 517 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 518 #active_bg => [1, 1, 1, 0.5],
442 @_ 519 @_
443 ) 520 )
444} 521}
445 522
446sub _draw { 523sub _draw {
447 my ($self) = @_; 524 my ($self) = @_;
448 525
526 my $color = $FOCUS == $self && $self->{active_bg}
527 ? $self->{active_bg}
528 : $self->{bg};
529
530 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 531 my ($w, $h) = @$self{qw(w h)};
450 532
451 glEnable GL_BLEND; 533 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 535 glColor @$color;
454 536
455 glBegin GL_QUADS; 537 glBegin GL_QUADS;
456 glVertex 0 , 0; 538 glVertex 0 , 0;
457 glVertex 0 , $h; 539 glVertex 0 , $h;
458 glVertex $w, $h; 540 glVertex $w, $h;
459 glVertex $w, 0; 541 glVertex $w, 0;
460 glEnd; 542 glEnd;
461 543
462 glDisable GL_BLEND; 544 glDisable GL_BLEND;
545 }
463} 546}
464 547
465############################################################################# 548#############################################################################
466 549
467package CFClient::UI::Empty; 550package CFClient::UI::Empty;
… …
628} 711}
629 712
630sub update { 713sub update {
631 my ($self) = @_; 714 my ($self) = @_;
632 715
633 $ROOT->on_refresh ($self => sub { $self->render_child }); 716 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 717 $self->SUPER::update;
635} 718}
636 719
637sub size_allocate { 720sub size_allocate {
638 my ($self, $w, $h) = @_; 721 my ($self, $w, $h) = @_;
… …
651 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652 glClearColor 0, 0, 0, 0; 735 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 736 glClear GL_COLOR_BUFFER_BIT;
654 737
655 $self->_render; 738 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 739 };
664} 740}
665 741
666sub _draw { 742sub _draw {
667 my ($self) = @_; 743 my ($self) = @_;
… …
671 my $tex = $self->{texture} 747 my $tex = $self->{texture}
672 or return; 748 or return;
673 749
674 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 752 glColor 1, 1, 1, 1;
677 753
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 755
680 glDisable GL_TEXTURE_2D; 756 glDisable GL_TEXTURE_2D;
681} 757}
… …
688 764
689sub size_request { 765sub size_request {
690 my ($self) = @_; 766 my ($self) = @_;
691 767
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 769
695 @$self{qw(child_w child_h)} 770 @$self{qw(child_w child_h)}
696} 771}
697 772
698sub size_allocate { 773sub size_allocate {
699 my ($self, $w, $h) = @_; 774 my ($self, $w, $h) = @_;
700 775
776 my ($cw, $ch) = @$self{qw(child_w child_h)};
777# $w = $self->{w};
778 $self->child->configure (0, 0, $cw, $ch);
701 $self->update; 779 $self->update;
702} 780}
703 781
704sub set_offset { 782sub set_offset {
705 my ($self, $x, $y) = @_; 783 my ($self, $x, $y) = @_;
… …
759 837
760 my $slider = new CFClient::UI::Slider 838 my $slider = new CFClient::UI::Slider
761 vertical => 1, 839 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 840 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 841 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 842 $self->{vp}->set_offset (0, $_[1]);
765 }, 843 },
766 ; 844 ;
767 845
768 $self = $class->SUPER::new ( 846 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 847 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 848 slider => $slider,
771 @_, 849 @_,
772 ); 850 );
773 851
774 $self->{vp}->add ($self->{scrolled}); 852 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 854 $self->add ($self->{slider});
777 855
778 $self 856 $self
779} 857}
780 858
859sub size_allocate {
860 my ($self, $w, $h) = @_;
861
862 $self->SUPER::size_allocate ($w, $h);
863
864 my $child = $self->{vp}->child;
865 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
866}
867
781#TODO# update range on size_allocate depeneing on child 868#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 869# update viewport offset on scroll
783 870
784############################################################################# 871#############################################################################
785 872
786package CFClient::UI::Frame; 873package CFClient::UI::Frame;
787 874
788our @ISA = CFClient::UI::Bin::; 875our @ISA = CFClient::UI::Bin::;
789 876
790use CFClient::OpenGL; 877use CFClient::OpenGL;
878
879sub new {
880 my $class = shift;
881
882 $class->SUPER::new (
883 bg => undef,
884 @_,
885 )
886}
887
888sub _draw {
889 my ($self) = @_;
890
891 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)};
893
894 glEnable GL_BLEND;
895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
896 glColor @{ $self->{bg} };
897
898 glBegin GL_QUADS;
899 glVertex 0 , 0;
900 glVertex 0 , $h;
901 glVertex $w, $h;
902 glVertex $w, 0;
903 glEnd;
904
905 glDisable GL_BLEND;
906 }
907
908 $self->SUPER::_draw;
909}
791 910
792############################################################################# 911#############################################################################
793 912
794package CFClient::UI::FancyFrame; 913package CFClient::UI::FancyFrame;
795 914
… …
805 my $class = shift; 924 my $class = shift;
806 925
807 # TODO: user_x, user_y, overwrite moveto? 926 # TODO: user_x, user_y, overwrite moveto?
808 927
809 my $self = $class->SUPER::new ( 928 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1], 929 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1], 930 border_bg => [1, 1, 1, 1],
812 border => 0.6, 931 border => 0.6,
932 is_toplevel => 1,
813 can_events => 1, 933 can_events => 1,
814 @_ 934 @_
815 ); 935 );
816 936
817 $self->{title} &&= new CFClient::UI::Label 937 $self->{title} &&= new CFClient::UI::Label
818 align => 0, 938 align => 0,
… …
842 my ($self, $w, $h) = @_; 962 my ($self, $w, $h) = @_;
843 963
844 $h -= List::Util::max 0, $self->border * 2; 964 $h -= List::Util::max 0, $self->border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 965 $w -= List::Util::max 0, $self->border * 2;
846 966
847 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848 if $self->{title}; 968 if $self->{title};
849 969
850 $self->child->configure ($self->border, $self->border, $w, $h); 970 $self->child->configure ($self->border, $self->border, $w, $h);
851} 971}
852 972
… …
1213 1333
1214############################################################################# 1334#############################################################################
1215 1335
1216package CFClient::UI::Label; 1336package CFClient::UI::Label;
1217 1337
1218our @ISA = CFClient::UI::Base::; 1338our @ISA = CFClient::UI::DrawBG::;
1219 1339
1220use CFClient::OpenGL; 1340use CFClient::OpenGL;
1221 1341
1222sub new { 1342sub new {
1223 my ($class, %arg) = @_; 1343 my ($class, %arg) = @_;
1224 1344
1225 my $self = $class->SUPER::new ( 1345 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1346 fg => [1, 1, 1],
1347 #bg => none
1348 #active_bg => none
1227 #font => default_font 1349 #font => default_font
1228 #text => initial text 1350 #text => initial text
1229 #markup => initial narkup 1351 #markup => initial narkup
1352 #max_w => maximum pixel width
1353 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1354 layout => (new CFClient::Layout),
1231 fontsize => 1, 1355 fontsize => 1,
1232 align => -1, 1356 align => -1,
1233 valign => -1, 1357 valign => -1,
1234 padding => 2, 1358 padding => 2,
… …
1249 } 1373 }
1250 1374
1251 $self 1375 $self
1252} 1376}
1253 1377
1254sub escape { 1378sub escape($) {
1255 local $_ = $_[1]; 1379 local $_ = $_[0];
1256 1380
1257 s/&/&amp;/g; 1381 s/&/&amp;/g;
1258 s/>/&gt;/g; 1382 s/>/&gt;/g;
1259 s/</&lt;/g; 1383 s/</&lt;/g;
1260 1384
1261 $_[1] 1385 $_
1262} 1386}
1263 1387
1264sub update { 1388sub update {
1265 my ($self) = @_; 1389 my ($self) = @_;
1266 1390
… …
1299sub size_request { 1423sub size_request {
1300 my ($self) = @_; 1424 my ($self) = @_;
1301 1425
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1426 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{max_w} || -1); 1427 $self->{layout}->set_width ($self->{max_w} || -1);
1428 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1431
1306 my ($w, $h) = $self->{layout}->size; 1432 my ($w, $h) = $self->{layout}->size;
1307 1433
1308 if (exists $self->{template}) { 1434 if (exists $self->{template}) {
… …
1338} 1464}
1339 1465
1340sub _draw { 1466sub _draw {
1341 my ($self) = @_; 1467 my ($self) = @_;
1342 1468
1469 $self->SUPER::_draw; # draw background, if applicable
1470
1343 my $tex = $self->{texture} ||= do { 1471 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1472 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1473 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $self->{layout}->set_width ($self->{w}); 1474 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1478
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1479 my $tex = new_from_layout CFClient::Texture $self->{layout};
1350 1480
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1483 : ($self->{w} - $tex->{w}) * 0.5);
1354 1484
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1487 : ($self->{h} - $tex->{h}) * 0.5);
1358 1488
1359 $tex 1489 $tex
1360 }; 1490 };
1361 1491
1362 glEnable GL_TEXTURE_2D; 1492 glEnable GL_TEXTURE_2D;
… …
1390 active_fg => [0, 0, 0], 1520 active_fg => [0, 0, 0],
1391 can_hover => 1, 1521 can_hover => 1,
1392 can_focus => 1, 1522 can_focus => 1,
1393 valign => 0, 1523 valign => 0,
1394 can_events => 1, 1524 can_events => 1,
1525 #text => ...
1395 @_ 1526 @_
1396 ) 1527 )
1397} 1528}
1398 1529
1399sub _set_text { 1530sub _set_text {
… …
1409 $self->{text} = $text; 1540 $self->{text} = $text;
1410 1541
1411 $text =~ s/./*/g if $self->{hidden}; 1542 $text =~ s/./*/g if $self->{hidden};
1412 $self->{layout}->set_text ("$text "); 1543 $self->{layout}->set_text ("$text ");
1413 1544
1414 $self->emit (changed => $self->{text}); 1545 $self->_emit (changed => $self->{text});
1415} 1546}
1416 1547
1417sub set_text { 1548sub set_text {
1418 my ($self, $text) = @_; 1549 my ($self, $text) = @_;
1419 1550
1420 $self->{cursor} = length $text; 1551 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1552 $self->_set_text ($text);
1553 $self->update;
1422 $self->check_size; 1554 $self->check_size;
1423 $self->update;
1424} 1555}
1425 1556
1426sub get_text { 1557sub get_text {
1427 $_[0]{text} 1558 $_[0]{text}
1428} 1559}
… …
1448 my $sym = $ev->{sym}; 1579 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1580 my $uni = $ev->{unicode};
1450 1581
1451 my $text = $self->get_text; 1582 my $text = $self->get_text;
1452 1583
1453 if ($sym == 8) { 1584 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1585 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1586 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1587 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1588 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1589 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1590 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1591 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1592 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1593 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1594 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1595 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1596 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1597 $self->_emit ('escape');
1467 } elsif ($uni) { 1598 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1599 substr $text, $self->{cursor}++, 0, chr $uni;
1469 } 1600 }
1470 1601
1471 $self->_set_text ($text); 1602 $self->_set_text ($text);
1472 $self->update; 1603 $self->update;
1604 $self->check_size;
1473} 1605}
1474 1606
1475sub focus_in { 1607sub focus_in {
1476 my ($self) = @_; 1608 my ($self) = @_;
1477 1609
… …
1557 if ($sym == 13) { 1689 if ($sym == 13) {
1558 unshift @{$self->{history}}, 1690 unshift @{$self->{history}},
1559 my $txt = $self->get_text; 1691 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1; 1692 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = ''; 1693 $self->{history_saveback} = '';
1562 $self->emit (activate => $txt); 1694 $self->_emit (activate => $txt);
1563 $self->update; 1695 $self->update;
1564 1696
1565 } elsif ($sym == CFClient::SDLK_UP) { 1697 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) { 1698 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text; 1699 $self->{history_saveback} = $self->get_text;
… …
1606 my $class = shift; 1738 my $class = shift;
1607 1739
1608 $class->SUPER::new ( 1740 $class->SUPER::new (
1609 padding => 4, 1741 padding => 4,
1610 fg => [1, 1, 1], 1742 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1743 active_fg => [0, 0, 1],
1613 can_hover => 1, 1744 can_hover => 1,
1614 align => 0, 1745 align => 0,
1615 valign => 0, 1746 valign => 0,
1616 can_events => 1, 1747 can_events => 1,
1617 @_ 1748 @_
1618 ) 1749 )
1619} 1750}
1620 1751
1752sub activate { }
1753
1621sub button_up { 1754sub button_up {
1622 my ($self, $ev, $x, $y) = @_; 1755 my ($self, $ev, $x, $y) = @_;
1623 1756
1757 $self->emit ("activate")
1624 if ($x >= 0 && $x < $self->{w} 1758 if $x >= 0 && $x < $self->{w}
1625 && $y >= 0 && $y < $self->{h}) { 1759 && $y >= 0 && $y < $self->{h};
1626 $self->emit ("activate");
1627 }
1628} 1760}
1629 1761
1630sub _draw { 1762sub _draw {
1631 my ($self) = @_; 1763 my ($self) = @_;
1632 1764
… …
1664 1796
1665 $class->SUPER::new ( 1797 $class->SUPER::new (
1666 padding => 2, 1798 padding => 2,
1667 fg => [1, 1, 1], 1799 fg => [1, 1, 1],
1668 active_fg => [1, 1, 0], 1800 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5],
1669 state => 0, 1803 state => 0,
1670 can_hover => 1, 1804 can_hover => 1,
1671 @_ 1805 @_
1672 ) 1806 )
1673} 1807}
… …
1682 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1683 1817
1684 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1685 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1686 $self->{state} = !$self->{state}; 1820 $self->{state} = !$self->{state};
1687 $self->emit (changed => $self->{state}); 1821 $self->_emit (changed => $self->{state});
1688 } 1822 }
1689} 1823}
1690 1824
1691sub _draw { 1825sub _draw {
1692 my ($self) = @_; 1826 my ($self) = @_;
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2091 qw(s1_slider.png s1_slider_bg.png);
1958 2092
1959sub new { 2093sub new {
1960 my $class = shift; 2094 my $class = shift;
1961 2095
1962 # range [value, low, high, page] 2096 # range [value, low, high, page, unit]
1963 2097
1964 # TODO: 0-width page 2098 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2099 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2100 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2101 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2102 fg => [1, 1, 1],
1969 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5],
1970 range => [0, 0, 100, 10], 2106 range => [0, 0, 100, 10, 0],
1971 req_w => $::WIDTH / 80, 2107 req_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2108 req_h => $::WIDTH / 80,
1973 vertical => 0, 2109 vertical => 0,
1974 can_hover => 1, 2110 can_hover => 1,
1975 inner_pad => 5, 2111 inner_pad => 0.02,
1976 @_ 2112 @_
1977 ); 2113 );
1978 2114
2115 $self->set_value ($self->{range}[0]);
2116 $self->update;
2117
1979 $self 2118 $self
2119}
2120
2121sub set_range {
2122 my ($self, $range) = @_;
2123
2124 $self->{range} = $range;
2125
2126 $self->update;
2127}
2128
2129sub set_value {
2130 my ($self, $value) = @_;
2131
2132 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2133
2134 $hi = $lo + 1 if $hi <= $lo;
2135
2136 $page = $hi - $lo if $page > $hi - $lo;
2137
2138 $value = $lo if $value < $lo;
2139 $value = $hi - $page if $value > $hi - $page;
2140
2141 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2142 if $unit;
2143
2144 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2145
2146 if ($value != $old_value) {
2147 $self->_emit (changed => $value);
2148 $self->update;
2149 }
1980} 2150}
1981 2151
1982sub size_request { 2152sub size_request {
1983 my ($self) = @_; 2153 my ($self) = @_;
1984 2154
… …
1990 2160
1991sub button_down { 2161sub button_down {
1992 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1993 2163
1994 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::button_down ($ev, $x, $y);
2165
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167
1995 $self->mouse_motion ($ev, $x, $y); 2168 $self->mouse_motion ($ev, $x, $y);
1996} 2169}
1997 2170
1998sub mouse_motion { 2171sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2172 my ($self, $ev, $x, $y) = @_;
2000 2173
2001 if ($GRAB == $self) { 2174 if ($GRAB == $self) {
2175 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2176
2177 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2182 }
2183}
2184
2185sub update {
2186 my ($self) = @_;
2187
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2189 $self->set_value ($self->{range}[0]);
2190
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2191 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100;
2003 2193
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2194 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005 2195
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2196 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2197 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008 2198
2009 $x -= $inner_pad_px; # substract the padding 2199 $value = ($value - $lo) / $range;
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2200 $value = $value * $self->{scale} + $self->{offset};
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2201
2015 $self->emit (changed => $x); 2202 $self->{knob_x} = $value - $knob_w * 0.5;
2016 $self->update; 2203 $self->{knob_w} = $knob_w;
2017 } 2204 });
2018}
2019 2205
2020# the inner_* stuff is for generating a padding for the slider handle, 2206 $self->SUPER::update;
2021# so that the handle doesn't leave the texture. This calculation isn't 100%
2022# correct propably, but it does the job for now
2023sub _calc_inner_pad_px {
2024 my ($self, $w) = @_;
2025 ($w / 100) * $self->{inner_pad} # % to pixels
2026} 2207}
2027 2208
2028sub _draw { 2209sub _draw {
2029 my ($self) = @_; 2210 my ($self) = @_;
2030 2211
2031 $self->SUPER::_draw (); 2212 $self->SUPER::_draw ();
2032 2213
2033 my ($w, $h) = @$self{qw(w h)}; 2214 glScale $self->{w}, $self->{h};
2034 2215
2035 if ($self->{vertical}) { 2216 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2217 # draw a vertical slider like a rotated horizontal slider
2037 2218
2219 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2220 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2221 }
2043 2222
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2223 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2224 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2225
2047 my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049 $hi = $value + 1 if $lo == $hi;
2050
2051 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054 $page = int $page * $inner_w / ($hi - $lo);
2055 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057 $w -= $page;
2058 $page &= ~1;
2059 glTranslate $page * 0.5, 0, 0;
2060 $page ||= 2;
2061
2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065 glEnable GL_TEXTURE_2D; 2226 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2227 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2228
2068 # draw background 2229 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2230 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2231
2071 # draw handle 2232 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2233 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2234
2074 glDisable GL_TEXTURE_2D; 2235 glDisable GL_TEXTURE_2D;
2075} 2236}
2237
2238#############################################################################
2239
2240package CFClient::UI::ValSlider;
2241
2242our @ISA = CFClient::UI::HBox::;
2243
2244sub new {
2245 my ($class, %arg) = @_;
2246
2247 my $range = delete $arg{range};
2248
2249 my $self = $class->SUPER::new (
2250 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2251 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2252 to_value => sub { shift },
2253 from_value => sub { shift },
2254 %arg,
2255 );
2256
2257 $self->{slider}->connect (changed => sub {
2258 my ($self, $value) = @_;
2259 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2260 $self->{parent}->emit (changed => $value);
2261 });
2262
2263# $self->{entry}->connect (changed => sub {
2264# my ($self, $value) = @_;
2265# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2266# $self->{parent}->emit (changed => $value);
2267# });
2268
2269 $self->add ($self->{slider}, $self->{entry});
2270
2271 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2272
2273 $self
2274}
2275
2276sub set_range { shift->{slider}->set_range (@_) }
2277sub set_value { shift->{slider}->set_value (@_) }
2076 2278
2077############################################################################# 2279#############################################################################
2078 2280
2079package CFClient::UI::TextView; 2281package CFClient::UI::TextView;
2080 2282
… …
2110 2312
2111 $self->{fontsize} = $fontsize; 2313 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2314 $self->reflow;
2113} 2315}
2114 2316
2115sub text_height {
2116 my ($self, $text) = @_;
2117
2118 my $layout = $self->{layout};
2119
2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $layout->set_width ($self->{children}[0]{w});
2122 $layout->set_markup ($text);
2123
2124 ($layout->size)[1]
2125}
2126
2127sub reflow {
2128 my ($self) = @_;
2129
2130 $self->{need_reflow}++;
2131 $self->update;
2132}
2133
2134sub size_allocate { 2317sub size_allocate {
2135 my ($self, $w, $h) = @_; 2318 my ($self, $w, $h) = @_;
2136 2319
2137 $self->SUPER::size_allocate ($w, $h); 2320 $self->SUPER::size_allocate ($w, $h);
2138 2321
… …
2141 $self->{layout}->set_width ($self->{children}[0]{w}); 2324 $self->{layout}->set_width ($self->{children}[0]{w});
2142 2325
2143 $self->reflow; 2326 $self->reflow;
2144} 2327}
2145 2328
2329sub text_size {
2330 my ($self, $text, $indent) = @_;
2331
2332 my $layout = $self->{layout};
2333
2334 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2335 $layout->set_width ($self->{children}[0]{w} - $indent);
2336 $layout->set_markup ($text);
2337
2338 $layout->size
2339}
2340
2341sub reflow {
2342 my ($self) = @_;
2343
2344 $self->{need_reflow}++;
2345 $self->update;
2346}
2347
2348sub set_offset {
2349 my ($self, $offset) = @_;
2350
2351 # todo: base offset on lines or so, not on pixels
2352 $self->{children}[1]->set_value ($offset);
2353}
2354
2355sub clear {
2356 my ($self) = @_;
2357
2358 $self->{par} = [];
2359 $self->{height} = 0;
2360 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2361}
2362
2146sub add_paragraph { 2363sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2364 my ($self, $color, $text, $indent) = @_;
2148 2365
2149 #TODO: intelligently "reformat" paragraph 2366 for my $line (split /\n/, $text) {
2150 2367 my ($w, $h) = $self->text_size ($line);
2151 my $height = $self->text_height ($text);
2152
2153 $self->{height} += $height; 2368 $self->{height} += $h;
2369 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2370 }
2154 2371
2155 push @{$self->{par}}, [$height, $color, $text];
2156
2157 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2372 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158 $self->{children}[1]->update;
2159} 2373}
2160 2374
2161sub update { 2375sub update {
2162 my ($self) = @_; 2376 my ($self) = @_;
2163 2377
… …
2165 2379
2166 return unless $self->{h} > 0; 2380 return unless $self->{h} > 0;
2167 2381
2168 delete $self->{texture}; 2382 delete $self->{texture};
2169 2383
2170 $ROOT->on_refresh ($self, sub { 2384 $ROOT->on_post_alloc ($self, sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386
2171 if (delete $self->{need_reflow}) { 2387 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2388 my $height = 0;
2173 2389
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2390 my $layout = $self->{layout};
2391
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393
2175 for @{$self->{par}}; 2394 for (@{$self->{par}}) {
2395 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2396 $layout->set_width ($W - $_->[3]);
2397 $layout->set_markup ($_->[4]);
2398 my ($w, $h) = $layout->size;
2399 $_->[0] = $w + $_->[3];
2400 $_->[1] = $h;
2401 }
2402
2403 $height += $_->[1];
2404 }
2176 2405
2177 $self->{height} = $height; 2406 $self->{height} = $height;
2178 2407
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180 2409
2181 delete $self->{texture}; 2410 delete $self->{texture};
2182 } 2411 }
2183 2412
2184 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185 glClearColor 0, 0, 0, 0; 2414 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2415 glClear GL_COLOR_BUFFER_BIT;
2187 2416
2188 glEnable GL_TEXTURE_2D;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191 my $top = int $self->{children}[1]{range}[0]; 2417 my $top = int $self->{children}[1]{range}[0];
2192 2418
2193 my $y0 = $top; 2419 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2420 my $y1 = $top + $H;
2195 2421
2196 my $y = 0; 2422 my $y = 0;
2197 2423
2198 my $layout = $self->{layout}; 2424 my $layout = $self->{layout};
2199 2425
2200 $layout->set_font ($self->{font}) if $self->{font}; 2426 $layout->set_font ($self->{font}) if $self->{font};
2201 2427
2428 glEnable GL_BLEND;
2429 #TODO# not correct in windows where rgba is forced off
2430 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2431
2202 for my $par (@{$self->{par}}) { 2432 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2433 my $h = $par->[1];
2204 2434
2205 if ($y0 < $y + $h && $y < $y1) { 2435 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2436 $layout->set_foreground (@{ $par->[2] });
2437 $layout->set_width ($W - $par->[3]);
2207 $layout->set_markup ($par->[2]); 2438 $layout->set_markup ($par->[4]);
2208 2439
2209 my ($W, $H) = $layout->size; 2440 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2441
2442 glRasterPos $par->[3], $y - $y0;
2443 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211 } 2444 }
2212 2445
2213 $y += $h; 2446 $y += $h;
2214 } 2447 }
2215 2448
2216 glDisable GL_TEXTURE_2D; 2449 glDisable GL_BLEND;
2217 }; 2450 };
2218 }); 2451 });
2219} 2452}
2220 2453
2221sub _draw { 2454sub _draw {
2222 my ($self) = @_; 2455 my ($self) = @_;
2223 2456
2224 glEnable GL_TEXTURE_2D; 2457 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2459 glColor 1, 1, 1, 1;
2227 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228 glDisable GL_TEXTURE_2D; 2461 glDisable GL_TEXTURE_2D;
2229 2462
2230 $self->{children}[1]->draw; 2463 $self->{children}[1]->draw;
2231 2464
2232} 2465}
… …
2301 2534
2302 # TODO: use animation 2535 # TODO: use animation
2303 if ($self->{state} = !$self->{state}) { 2536 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other}); 2537 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h})); 2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open"); 2539 $self->_emit ("open");
2307 } else { 2540 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other}); 2541 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close"); 2542 $self->_emit ("close");
2310 } 2543 }
2311 2544
2312 $self->emit (changed => $self->{state}); 2545 $self->_emit (changed => $self->{state});
2313} 2546}
2314 2547
2315############################################################################# 2548#############################################################################
2316 2549
2317package CFClient::UI::Tooltip; 2550package CFClient::UI::Tooltip;
… …
2331 2564
2332sub set_tooltip_from { 2565sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2566 my ($self, $widget) = @_;
2334 2567
2335 $self->add (new CFClient::UI::Label 2568 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2569 markup => $widget->{tooltip},
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2571 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2572 fg => [0, 0, 0, 1],
2573 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2574 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2575 );
2342} 2576}
2343 2577
2344sub size_request { 2578sub size_request {
2345 my ($self) = @_; 2579 my ($self) = @_;
… …
2391use CFClient::OpenGL; 2625use CFClient::OpenGL;
2392 2626
2393sub new { 2627sub new {
2394 my $class = shift; 2628 my $class = shift;
2395 2629
2396 $class->SUPER::new ( 2630 my $self = $class->SUPER::new (
2397 aspect => 1, 2631 aspect => 1,
2398 @_, 2632 @_,
2399 ) 2633 );
2634
2635 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self);
2637
2638 $self->{timer} = Event->timer (
2639 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2640 hard => 1,
2641 interval => $self->{animspeed},
2642 cb => sub {
2643 ++$widget->{frame};
2644 $widget->update;
2645 },
2646 );
2647 }
2648
2649 $self
2400} 2650}
2401 2651
2402sub size_request { 2652sub size_request {
2403 (32, 8) 2653 (32, 8)
2404} 2654}
2405 2655
2656sub update {
2657 my ($self) = @_;
2658
2659 return unless $self->{visible};
2660
2661 $self->SUPER::update;
2662}
2663
2406sub _draw { 2664sub _draw {
2407 my ($self) = @_; 2665 my ($self) = @_;
2408 2666
2409 return unless $::CONN;#d# manage and cache textures differently 2667 return unless $::CONN;
2668
2669 my $face;
2670
2671 if ($self->{frame}) {
2672 my $anim = $::CONN->{anim}[$self->{anim}];
2673
2674 $face = $anim->[ $self->{frame} % @$anim ]
2675 if $anim && @$anim;
2676 }
2677
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2679
2412 # TODO animation
2413 if ($tex) { 2680 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2681 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2683 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2685 glDisable GL_TEXTURE_2D;
2419 } 2686 }
2420} 2687}
2421 2688
2689sub DESTROY {
2690 my ($self) = @_;
2691
2692 $self->{timer}->cancel
2693 if $self->{timer};
2694
2695 $self->SUPER::DESTROY;
2696}
2697
2422############################################################################# 2698#############################################################################
2423 2699
2424package CFClient::UI::InventoryItem; 2700package CFClient::UI::InventoryItem;
2425 2701
2426our @ISA = CFClient::UI::HBox::; 2702our @ISA = CFClient::UI::HBox::;
2703
2704sub _item_to_desc {
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2427 2729
2428sub new { 2730sub new {
2429 my $class = shift; 2731 my $class = shift;
2430 2732
2431 my %args = @_; 2733 my %args = @_;
2432 2734
2433 my $item = delete $args{item}; 2735 my $item = delete $args{item};
2434 2736
2435 my $desc = $item->{nrof} < 2 2737 my $desc = _item_to_desc ($item);
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439 2738
2440 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
2441 can_hover => 1, 2740 can_hover => 1,
2442 can_events => 1, 2741 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc) 2742 tooltip => ((CFClient::UI::Label::escape $desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub { 2744 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_; 2745 my ($self, $ev, $x, $y) = @_;
2447 2746
2448 # todo: maybe put examine on 1? but should just be a tooltip :( 2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2449 if ($ev->{button} == 1) { 2756 } elsif ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0"); 2757 $::CONN->send ("examine $item->{tag}");
2451 } elsif ($ev->{button} == 2) { 2758 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}"); 2759 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) { 2760 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new ( 2761 my @menu_items = (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }], 2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2464 ], 2774 ),
2465 )->popup ($ev); 2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2466 } 2778 }
2467 2779
2468 1 2780 1
2469 }, 2781 },
2470 %args 2782 %args
2471 ); 2783 );
2784
2472 2785
2473 $self->add (new CFClient::UI::Face 2786 $self->add (new CFClient::UI::Face
2474 can_events => 0, 2787 can_events => 0,
2475 face => $item->{face}, 2788 face => $item->{face},
2476 anim => $item->{anim}, 2789 anim => $item->{anim},
2477 animspeed => $item->{animspeed}, 2790 animspeed => $item->{animspeed},
2478 ); 2791 );
2479 2792
2480 $self->add (new CFClient::UI::Label 2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2481 can_events => 0, 2794
2482 text => $desc, 2795 $self->{item} = $item;
2483 ); 2796
2797 $self->update_item;
2484 2798
2485 $self 2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2486} 2808}
2487 2809
2488############################################################################# 2810#############################################################################
2489 2811
2490package CFClient::UI::Inventory; 2812package CFClient::UI::Inventory;
… …
2493 2815
2494sub new { 2816sub new {
2495 my $class = shift; 2817 my $class = shift;
2496 2818
2497 my $self = $class->SUPER::new ( 2819 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox), 2820 scrolled => (new CFClient::UI::Table),
2499 @_, 2821 @_,
2500 ); 2822 );
2501 2823
2502 $self 2824 $self
2503} 2825}
… …
2506 my ($self, $items) = @_; 2828 my ($self, $items) = @_;
2507 2829
2508 $self->{scrolled}->clear; 2830 $self->{scrolled}->clear;
2509 return unless $items; 2831 return unless $items;
2510 2832
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2833 my @items = sort {
2834 ($a->{type} <=> $b->{type})
2835 or ($a->{name} cmp $b->{name})
2836 } @$items;
2512 2837
2513 $self->{real_items} = \@items; 2838 $self->{real_items} = \@items;
2514 2839
2515 for my $item (@items) { 2840 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2 2841 $item->{item} = $item;
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845
2846 my $i = 0;
2847 for (@items) {
2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2521 } 2851 }
2522 2852
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524} 2854}
2525 2855
… …
2568 2898
2569# popup given the event (must be a mouse button down event currently) 2899# popup given the event (must be a mouse button down event currently)
2570sub popup { 2900sub popup {
2571 my ($self, $ev) = @_; 2901 my ($self, $ev) = @_;
2572 2902
2573 $self->emit ("popdown"); 2903 $self->_emit ("popdown");
2574 2904
2575 # maybe save $GRAB? must be careful about events... 2905 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self; 2906 $GRAB = $self;
2577 $self->{button} = $ev->{button}; 2907 $self->{button} = $ev->{button};
2578 2908
… …
2593 2923
2594 if ($ev->{button} == $self->{button}) { 2924 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB; 2925 undef $GRAB;
2596 $self->hide; 2926 $self->hide;
2597 2927
2598 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover}; 2929 $self->{hover}[1]->() if $self->{hover};
2600 } 2930 }
2601} 2931}
2602 2932
2603############################################################################# 2933#############################################################################
2604 2934
2605package CFClient::UI::Statusbox; 2935package CFClient::UI::Statusbox;
2606 2936
2607our @ISA = CFClient::UI::VBox::; 2937our @ISA = CFClient::UI::VBox::;
2938
2939sub new {
2940 my $class = shift;
2941
2942 $class->SUPER::new (
2943 fontsize => 0.8,
2944 @_,
2945 )
2946}
2608 2947
2609sub reorder { 2948sub reorder {
2610 my ($self) = @_; 2949 my ($self) = @_;
2611 my $NOW = time; 2950 my $NOW = time;
2612 2951
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 2970 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 2971 : $item->{text};
2633 2972
2634 for ($short) { 2973 for ($short) {
2635 s/^\s+//; 2974 s/^\s+//;
2636 s/\012.*/…/s; 2975 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 2976 }
2640 2977
2641 new CFClient::UI::Label 2978 new CFClient::UI::Label
2642 markup => $short, 2979 markup => $short,
2643 tooltip => $item->{tooltip}, 2980 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 2981 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 2982 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 2983 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 2985 fg => $item->{fg},
2648 can_events => 1, 2986 can_events => 1,
2649 can_hover => 1 2987 can_hover => 1
2650 }; 2988 };
2651 } 2989 }
2652 2990
… …
2654 $self->SUPER::add (reverse @widgets); 2992 $self->SUPER::add (reverse @widgets);
2655} 2993}
2656 2994
2657sub add { 2995sub add {
2658 my ($self, $text, %arg) = @_; 2996 my ($self, $text, %arg) = @_;
2997
2998 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//;
2659 3000
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 3001 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 3002
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 3004
… …
2666 $item->{count}++; 3007 $item->{count}++;
2667 } else { 3008 } else {
2668 $item->{count} = 1; 3009 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 3010 $item->{text} = $item->{tooltip} = $text;
2670 } 3011 }
3012 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 3013 $item->{timeout} = $timeout;
2672 delete $item->{label}; 3014 delete $item->{label};
2673 } else { 3015 } else {
2674 $self->{item}{$group} = { 3016 $self->{item}{$group} = {
2675 id => ++$self->{id}, 3017 id => ++$self->{id},
2676 text => $text, 3018 text => $text,
2677 timeout => $timeout, 3019 timeout => $timeout,
2678 tooltip => $text, 3020 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 3021 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 3022 pri => 0,
2682 count => 1, 3023 count => 1,
2683 %arg, 3024 %arg,
2684 }; 3025 };
2685 } 3026 }
2686 3027
2687 $self->reorder; 3028 $self->reorder;
2688} 3029}
2689 3030
3031sub reconfigure {
3032 my ($self) = @_;
3033
3034 delete $_->{label}
3035 for values %{ $self->{item} || {} };
3036
3037 $self->reorder;
3038 $self->SUPER::reconfigure;
3039}
3040
2690############################################################################# 3041#############################################################################
2691 3042
2692package CFClient::UI::Root; 3043package CFClient::UI::Root;
2693 3044
2694our @ISA = CFClient::UI::Container::; 3045our @ISA = CFClient::UI::Container::;
… …
2724} 3075}
2725 3076
2726sub size_allocate { 3077sub size_allocate {
2727 my ($self, $w, $h) = @_; 3078 my ($self, $w, $h) = @_;
2728 3079
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744
2745 for my $child ($self->children) { 3080 for my $child ($self->children) {
2746 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747 3082
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3084 if exists $child->{req_x};
3085
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3087 if exists $child->{req_y};
3088
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3090 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091
2750 $child->configure ($X, $Y, $W, $H); 3092 $child->configure ($X, $Y, $W, $H);
2751 } 3093 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 3094}
2756 3095
2757sub coord2local { 3096sub coord2local {
2758 my ($self, $x, $y) = @_; 3097 my ($self, $x, $y) = @_;
2759 3098
… …
2772 $self->check_size; 3111 $self->check_size;
2773 $::WANT_REFRESH++; 3112 $::WANT_REFRESH++;
2774} 3113}
2775 3114
2776sub add { 3115sub add {
2777 my ($self, $child) = @_; 3116 my ($self, @children) = @_;
2778 3117
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
3124 for my $child (@children) {
3125 $child->{is_toplevel} = 1;
3126
2779 # integerise window positions 3127 # integerise window positions
2780 $child->{x} = int $child->{x}; 3128 $child->{x} = int $child->{x};
2781 $child->{y} = int $child->{y}; 3129 $child->{y} = int $child->{y};
3130 }
2782 3131
2783 $self->SUPER::add ($child); 3132 $self->SUPER::add (@children);
3133}
3134
3135sub remove {
3136 my ($self, @children) = @_;
3137
3138 $self->SUPER::remove (@children);
3139
3140 while (@children) {
3141 my $w = pop @children;
3142 push @children, $w->children;
3143 $w->set_invisible;
3144 }
2784} 3145}
2785 3146
2786sub on_refresh { 3147sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3148 my ($self, $id, $cb) = @_;
2788 3149
2789 $self->{refresh_hook}{$id} = $cb; 3150 $self->{refresh_hook}{$id} = $cb;
2790} 3151}
2791 3152
3153sub on_post_alloc {
3154 my ($self, $id, $cb) = @_;
3155
3156 $self->{post_alloc_hook}{$id} = $cb;
3157}
3158
2792sub draw { 3159sub draw {
2793 my ($self) = @_; 3160 my ($self) = @_;
3161
3162 while ($self->{refresh_hook}) {
3163 $_->()
3164 for values %{delete $self->{refresh_hook}};
3165 }
2794 3166
2795 if ($self->{check_size}) { 3167 if ($self->{check_size}) {
2796 my @queue = ([], []); 3168 my @queue = ([], []);
2797 3169
2798 for (;;) { 3170 for (;;) {
… …
2830 $w = 0 if $w < 0; 3202 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0; 3203 $h = 0 if $h < 0;
2832 3204
2833 $widget->{w} = $w; 3205 $widget->{w} = $w;
2834 $widget->{h} = $h; 3206 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h); 3207 $widget->emit (size_allocate => $w, $h);
2837 } 3208 }
2838 } 3209 }
2839 3210
2840 while ($self->{refresh_hook}) { 3211 while ($self->{post_alloc_hook}) {
2841 $_->() 3212 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3213 for values %{delete $self->{post_alloc_hook}};
2843 } 3214 }
2844 3215
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3216 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
2848 3219
2849 glMatrixMode GL_PROJECTION; 3220 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3221 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3223 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3224 glLoadIdentity;
2854 3225
2855 $self->_draw; 3226 $self->_draw;
2856} 3227}
… …
2858############################################################################# 3229#############################################################################
2859 3230
2860package CFClient::UI; 3231package CFClient::UI;
2861 3232
2862$ROOT = new CFClient::UI::Root; 3233$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3234$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3235
28651 32361
2866 3237

Diff Legend

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