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.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
13our $ROOT; 14our $ROOT;
14our $TOOLTIP; 15our $TOOLTIP;
15our $BUTTON_STATE; 16our $BUTTON_STATE;
17
18our %WIDGET; # all widgets, weak-referenced
16 19
17sub check_tooltip { 20sub check_tooltip {
18 if (!$GRAB) { 21 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 23 if (length $widget->{tooltip}) {
29 $TOOLTIP->set_tooltip_from ($widget); 32 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 33 $TOOLTIP->show;
31 34
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 36
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 38 if $x + $TOOLTIP->{w} > $::WIDTH;
37 39
38 $TOOLTIP->move ($x, $y); 40 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size; 41 $TOOLTIP->check_size;
40 $TOOLTIP->update; 42 $TOOLTIP->update;
41 } 43 }
49 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
50} 52}
51 53
52# class methods for events 54# class methods for events
53sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 57 if $FOCUS;
56} 58}
57 59
58sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 62 if $FOCUS;
61} 63}
62 64
63sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
64 my ($ev) = @_; 66 my ($ev) = @_;
73 check_tooltip; 75 check_tooltip;
74 } 76 }
75 77
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 79
78 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 82}
83 83
84sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
85 my ($ev) = @_; 85 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
87 87
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 89
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 91
92 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 94
97 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 97 $grab->update if $grab;
100 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 115
118 check_tooltip; 116 check_tooltip;
119 } 117 }
120 118
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 120 if $HOVER;
125} 121}
126 122
127# convert position array to integers 123# convert position array to integers
128sub harmonize { 124sub harmonize {
129 my ($vals) = @_; 125 my ($vals) = @_;
133 for (@$vals) { 129 for (@$vals) {
134 my $i = int $_ + $rem; 130 my $i = int $_ + $rem;
135 $rem += $_ - $i; 131 $rem += $_ - $i;
136 $_ = $i; 132 $_ = $i;
137 } 133 }
134}
135
136sub full_refresh {
137 # make a copy, otherwise for complains about freed values.
138 my @widgets = values %WIDGET;
139
140 $_->update
141 for @widgets;
142}
143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
152# call when resolution changes etc.
153sub rescale_widgets {
154 my ($sx, $sy) = @_;
155
156 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167 }
168
169 reconfigure_widgets;
138} 170}
139 171
140############################################################################# 172#############################################################################
141 173
142package CFClient::UI::Base; 174package CFClient::UI::Base;
160 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
162 } 194 }
163 } 195 }
164 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
165 $self 199 $self
166} 200}
167 201
168sub destroy { 202sub destroy {
169 my ($self) = @_; 203 my ($self) = @_;
172 %$self = (); 206 %$self = ();
173} 207}
174 208
175sub show { 209sub show {
176 my ($self) = @_; 210 my ($self) = @_;
177
178 return if $self->{parent}; 211 return if $self->{parent};
179 212
180 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
181} 214}
182 215
183sub hide { 216sub show_centered {
184 my ($self) = @_; 217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
229sub set_invisible {
230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{root};
235 delete $self->{visible};
185 236
186 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
239
240 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self;
242
243 $self->focus_out;
244}
245
246sub hide {
247 my ($self) = @_;
248
249 $self->set_invisible;
188 250
189 $self->{parent}->remove ($self) 251 $self->{parent}->remove ($self)
190 if $self->{parent}; 252 if $self->{parent};
191} 253}
192 254
242 304
243sub size_allocate { 305sub size_allocate {
244 # nothing to be done 306 # nothing to be done
245} 307}
246 308
247sub children {
248}
249
250# call when resolution changes etc.
251sub reconfigure { 309sub reconfigure {
252 my ($self) = @_; 310 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256 311
257 $self->check_size (1); 312 $self->check_size (1);
258 $self->update; 313 $self->update;
259} 314}
260 315
316sub children {
317}
318
261sub set_max_size { 319sub set_max_size {
262 my ($self, $w, $h) = @_; 320 my ($self, $w, $h) = @_;
263 321
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 322 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 323 delete $self->{max_h}; $self->{max_h} = $h if $h;
324}
325
326sub set_tooltip {
327 my ($self, $tooltip) = @_;
328
329 $tooltip =~ s/^\s+//;
330 $tooltip =~ s/\s+$//;
331
332 return if $self->{tooltip} eq $tooltip;
333
334 $self->{tooltip} = $tooltip;
335
336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
337 delete $CFClient::UI::TOOLTIP->{owner};
338 CFClient::UI::check_tooltip;
339 }
266} 340}
267 341
268# translate global coordinates to local coordinate system 342# translate global coordinates to local coordinate system
269sub coord2local { 343sub coord2local {
270 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
285 return if $FOCUS == $self; 359 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 360 return unless $self->{can_focus};
287 361
288 my $focus = $FOCUS; $FOCUS = $self; 362 my $focus = $FOCUS; $FOCUS = $self;
289 363
290 $self->emit (focus_in => $focus); 364 $self->_emit (focus_in => $focus);
291 365
292 $focus->update if $focus; 366 $focus->update if $focus;
293 $FOCUS->update; 367 $FOCUS->update;
294} 368}
295 369
298 372
299 return unless $FOCUS == $self; 373 return unless $FOCUS == $self;
300 374
301 my $focus = $FOCUS; undef $FOCUS; 375 my $focus = $FOCUS; undef $FOCUS;
302 376
303 $self->emit (focus_out => $focus); 377 $self->_emit (focus_out => $focus);
304 378
305 $focus->update if $focus; #? 379 $focus->update if $focus; #?
380
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS;
306} 383}
307 384
308sub mouse_motion { } 385sub mouse_motion { }
309sub button_up { } 386sub button_up { }
310sub key_down { } 387sub key_down { }
311sub key_up { } 388sub key_up { }
312 389
313sub button_down { 390sub button_down {
314 my ($self, $ev, $x, $y) = @_; 391 my ($self, $ev, $x, $y) = @_;
315 392
316 $self->focus_in; 393 $self->focus_in;
350 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix; 428 glPushMatrix;
352 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 432 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
359 glEnd; 436 glEnd;
360 glPopMatrix; 437 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 439 }
363} 440}
364 441
365sub _draw { 442sub _draw {
366 my ($self) = @_; 443 my ($self) = @_;
383sub set_parent { 460sub set_parent {
384 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
385 462
386 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
387 464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
388 467
389 # TODO: req_w _does_change after ->reconfigure 468 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size 469 $self->check_size
391 unless exists $self->{req_w}; 470 unless exists $self->{req_w};
471
472 $self->show;
392} 473}
393 474
394sub check_size { 475sub check_size {
395 my ($self, $forced) = @_; 476 my ($self, $forced) = @_;
396 477
409 my ($self, $signal, $cb) = @_; 490 my ($self, $signal, $cb) = @_;
410 491
411 push @{ $self->{signal_cb}{$signal} }, $cb; 492 push @{ $self->{signal_cb}{$signal} }, $cb;
412} 493}
413 494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
414sub emit { 501sub emit {
415 my ($self, $signal, @args) = @_; 502 my ($self, $signal, @args) = @_;
416 503
417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
418} 506}
419 507
420sub DESTROY { 508sub DESTROY {
421 my ($self) = @_; 509 my ($self) = @_;
422 510
511 delete $WIDGET{$self+0};
423 #$self->deactivate; 512 #$self->deactivate;
424} 513}
425 514
426############################################################################# 515#############################################################################
427 516
436 my $class = shift; 525 my $class = shift;
437 526
438 # range [value, low, high, page] 527 # range [value, low, high, page]
439 528
440 $class->SUPER::new ( 529 $class->SUPER::new (
441 bg => [0, 0, 0, 0.2], 530 #bg => [0, 0, 0, 0.2],
442 active_bg => [1, 1, 1, 0.5], 531 #active_bg => [1, 1, 1, 0.5],
443 @_ 532 @_
444 ) 533 )
445} 534}
446 535
447sub _draw { 536sub _draw {
448 my ($self) = @_; 537 my ($self) = @_;
449 538
539 my $color = $FOCUS == $self && $self->{active_bg}
540 ? $self->{active_bg}
541 : $self->{bg};
542
543 if ($color && (@$color < 4 || $color->[3])) {
450 my ($w, $h) = @$self{qw(w h)}; 544 my ($w, $h) = @$self{qw(w h)};
451 545
452 glEnable GL_BLEND; 546 glEnable GL_BLEND;
453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
454 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 548 glColor @$color;
455 549
456 glBegin GL_QUADS; 550 glBegin GL_QUADS;
457 glVertex 0 , 0; 551 glVertex 0 , 0;
458 glVertex 0 , $h; 552 glVertex 0 , $h;
459 glVertex $w, $h; 553 glVertex $w, $h;
460 glVertex $w, 0; 554 glVertex $w, 0;
461 glEnd; 555 glEnd;
462 556
463 glDisable GL_BLEND; 557 glDisable GL_BLEND;
558 }
464} 559}
465 560
466############################################################################# 561#############################################################################
467 562
468package CFClient::UI::Empty; 563package CFClient::UI::Empty;
528 delete $child->{parent}; 623 delete $child->{parent};
529 $child->hide; 624 $child->hide;
530 625
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 627
533 $self->check_size; 628 $self->check_size (1);
534 $self->update; 629 $self->update;
535} 630}
536 631
537sub clear { 632sub clear {
538 my ($self) = @_; 633 my ($self) = @_;
652 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 747 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
653 glClearColor 0, 0, 0, 0; 748 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT; 749 glClear GL_COLOR_BUFFER_BIT;
655 750
656 $self->_render; 751 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 }; 752 };
665} 753}
666 754
667sub _draw { 755sub _draw {
668 my ($self) = @_; 756 my ($self) = @_;
672 my $tex = $self->{texture} 760 my $tex = $self->{texture}
673 or return; 761 or return;
674 762
675 glEnable GL_TEXTURE_2D; 763 glEnable GL_TEXTURE_2D;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1; 765 glColor 1, 1, 1, 1;
678 766
679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
680 768
681 glDisable GL_TEXTURE_2D; 769 glDisable GL_TEXTURE_2D;
682} 770}
685 773
686package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
687 775
688our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
689 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
690sub size_request { 788sub size_request {
691 my ($self) = @_; 789 my ($self) = @_;
692 790
693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
695 792
696 @$self{qw(child_w child_h)} 793 @$self{qw(child_w child_h)}
697} 794}
698 795
699sub size_allocate { 796sub size_allocate {
700 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
701 798
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
802 $self->child->configure (0, 0, $w, $h);
702 $self->update; 803 $self->update;
703} 804}
704 805
705sub set_offset { 806sub set_offset {
706 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
760 861
761 my $slider = new CFClient::UI::Slider 862 my $slider = new CFClient::UI::Slider
762 vertical => 1, 863 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix 864 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub { 865 connect_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 866 $self->{vp}->set_offset (0, $_[1]);
766 }, 867 },
767 ; 868 ;
768 869
769 $self = $class->SUPER::new ( 870 $self = $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort), 871 vp => (new CFClient::UI::ViewPort expand => 1),
771 slider => $slider, 872 slider => $slider,
772 @_, 873 @_,
773 ); 874 );
774 875
775 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
777 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
778 879
779 $self 880 $self
780} 881}
781 882
883sub update {
884 my ($self) = @_;
885
886 $self->SUPER::update;
887
888 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
891}
892
893sub size_allocate {
894 my ($self, $w, $h) = @_;
895
896 $self->SUPER::size_allocate ($w, $h);
897
898 my $child = $self->{vp}->child;
899 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
900}
901
782#TODO# update range on size_allocate depeneing on child 902#TODO# update range on size_allocate depending on child
783# update viewport offset on scroll 903# update viewport offset on scroll
784 904
785############################################################################# 905#############################################################################
786 906
787package CFClient::UI::Frame; 907package CFClient::UI::Frame;
788 908
789our @ISA = CFClient::UI::Bin::; 909our @ISA = CFClient::UI::Bin::;
790 910
791use CFClient::OpenGL; 911use CFClient::OpenGL;
912
913sub new {
914 my $class = shift;
915
916 $class->SUPER::new (
917 bg => undef,
918 @_,
919 )
920}
921
922sub _draw {
923 my ($self) = @_;
924
925 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)};
927
928 glEnable GL_BLEND;
929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
930 glColor @{ $self->{bg} };
931
932 glBegin GL_QUADS;
933 glVertex 0 , 0;
934 glVertex 0 , $h;
935 glVertex $w, $h;
936 glVertex $w, 0;
937 glEnd;
938
939 glDisable GL_BLEND;
940 }
941
942 $self->SUPER::_draw;
943}
792 944
793############################################################################# 945#############################################################################
794 946
795package CFClient::UI::FancyFrame; 947package CFClient::UI::FancyFrame;
796 948
806 my $class = shift; 958 my $class = shift;
807 959
808 # TODO: user_x, user_y, overwrite moveto? 960 # TODO: user_x, user_y, overwrite moveto?
809 961
810 my $self = $class->SUPER::new ( 962 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1], 963 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1], 964 border_bg => [1, 1, 1, 1],
813 border => 0.6, 965 border => 0.6,
966 is_toplevel => 1,
814 can_events => 1, 967 can_events => 1,
815 @_ 968 @_
816 ); 969 );
817 970
818 $self->{title} &&= new CFClient::UI::Label 971 $self->{title} &&= new CFClient::UI::Label
819 align => 0, 972 align => 0,
843 my ($self, $w, $h) = @_; 996 my ($self, $w, $h) = @_;
844 997
845 $h -= List::Util::max 0, $self->border * 2; 998 $h -= List::Util::max 0, $self->border * 2;
846 $w -= List::Util::max 0, $self->border * 2; 999 $w -= List::Util::max 0, $self->border * 2;
847 1000
848 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
849 if $self->{title}; 1002 if $self->{title};
850 1003
851 $self->child->configure ($self->border, $self->border, $w, $h); 1004 $self->child->configure ($self->border, $self->border, $w, $h);
852} 1005}
853 1006
959sub new { 1112sub new {
960 my $class = shift; 1113 my $class = shift;
961 1114
962 $class->SUPER::new ( 1115 $class->SUPER::new (
963 col_expand => [], 1116 col_expand => [],
964 @_ 1117 @_,
965 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
966} 1123}
967 1124
968sub add { 1125sub add {
969 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
970 1127
971 $child->set_parent ($self); 1128 $child->set_parent ($self);
972 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
973 1130
974 $child->check_size; 1131 $self->check_size (1);
975} 1132}
976 1133
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979}
980
981# TODO: move to container class maybe? send childs a signal on removal? 1134# TODO: move to container class maybe? send children a signal on removal?
982sub clear { 1135sub clear {
983 my ($self) = @_; 1136 my ($self) = @_;
984 1137
985 my @children = $self->children; 1138 my @children = $self->children;
986 delete $self->{children}; 1139 delete $self->{children};
988 for (@children) { 1141 for (@children) {
989 delete $_->{parent}; 1142 delete $_->{parent};
990 $_->hide; 1143 $_->hide;
991 } 1144 }
992 1145
1146 $self->check_size (1);
993 $self->update; 1147 $self->update;
994} 1148}
995 1149
996sub get_wh { 1150sub get_wh {
997 my ($self) = @_; 1151 my ($self) = @_;
1029sub size_allocate { 1183sub size_allocate {
1030 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1031 1185
1032 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1033 1187
1034 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1035 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1036 1190
1037 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1038 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1039 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1040 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
1214 1368
1215############################################################################# 1369#############################################################################
1216 1370
1217package CFClient::UI::Label; 1371package CFClient::UI::Label;
1218 1372
1219our @ISA = CFClient::UI::Base::; 1373our @ISA = CFClient::UI::DrawBG::;
1220 1374
1221use CFClient::OpenGL; 1375use CFClient::OpenGL;
1222 1376
1223sub new { 1377sub new {
1224 my ($class, %arg) = @_; 1378 my ($class, %arg) = @_;
1225 1379
1226 my $self = $class->SUPER::new ( 1380 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1381 fg => [1, 1, 1],
1382 #bg => none
1383 #active_bg => none
1228 #font => default_font 1384 #font => default_font
1229 #text => initial text 1385 #text => initial text
1230 #markup => initial narkup 1386 #markup => initial narkup
1387 #max_w => maximum pixel width
1388 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1389 layout => (new CFClient::Layout),
1232 fontsize => 1, 1390 fontsize => 1,
1233 align => -1, 1391 align => -1,
1234 valign => -1, 1392 valign => -1,
1235 padding => 2, 1393 padding => 2,
1250 } 1408 }
1251 1409
1252 $self 1410 $self
1253} 1411}
1254 1412
1255sub escape { 1413sub escape($) {
1256 local $_ = $_[1]; 1414 local $_ = $_[0];
1257 1415
1258 s/&/&amp;/g; 1416 s/&/&amp;/g;
1259 s/>/&gt;/g; 1417 s/>/&gt;/g;
1260 s/</&lt;/g; 1418 s/</&lt;/g;
1261 1419
1262 $_[1] 1420 $_
1263} 1421}
1264 1422
1265sub update { 1423sub update {
1266 my ($self) = @_; 1424 my ($self) = @_;
1267 1425
1300sub size_request { 1458sub size_request {
1301 my ($self) = @_; 1459 my ($self) = @_;
1302 1460
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1461 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $self->{layout}->set_width ($self->{max_w} || -1); 1462 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1466
1307 my ($w, $h) = $self->{layout}->size; 1467 my ($w, $h) = $self->{layout}->size;
1308 1468
1309 if (exists $self->{template}) { 1469 if (exists $self->{template}) {
1339} 1499}
1340 1500
1341sub _draw { 1501sub _draw {
1342 my ($self) = @_; 1502 my ($self) = @_;
1343 1503
1504 $self->SUPER::_draw; # draw background, if applicable
1505
1344 my $tex = $self->{texture} ||= do { 1506 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1507 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1508 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $self->{layout}->set_width ($self->{w}); 1509 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1513
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1514 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351 1515
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5; 1518 : ($self->{w} - $tex->{w}) * 0.5);
1355 1519
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5; 1522 : ($self->{h} - $tex->{h}) * 0.5);
1359 1523
1360 $tex 1524 $tex
1361 }; 1525 };
1362 1526
1363 glEnable GL_TEXTURE_2D; 1527 glEnable GL_TEXTURE_2D;
1391 active_fg => [0, 0, 0], 1555 active_fg => [0, 0, 0],
1392 can_hover => 1, 1556 can_hover => 1,
1393 can_focus => 1, 1557 can_focus => 1,
1394 valign => 0, 1558 valign => 0,
1395 can_events => 1, 1559 can_events => 1,
1560 #text => ...
1396 @_ 1561 @_
1397 ) 1562 )
1398} 1563}
1399 1564
1400sub _set_text { 1565sub _set_text {
1410 $self->{text} = $text; 1575 $self->{text} = $text;
1411 1576
1412 $text =~ s/./*/g if $self->{hidden}; 1577 $text =~ s/./*/g if $self->{hidden};
1413 $self->{layout}->set_text ("$text "); 1578 $self->{layout}->set_text ("$text ");
1414 1579
1415 $self->emit (changed => $self->{text}); 1580 $self->_emit (changed => $self->{text});
1416} 1581}
1417 1582
1418sub set_text { 1583sub set_text {
1419 my ($self, $text) = @_; 1584 my ($self, $text) = @_;
1420 1585
1421 $self->{cursor} = length $text; 1586 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1587 $self->_set_text ($text);
1588 $self->update;
1423 $self->check_size; 1589 $self->check_size;
1424 $self->update;
1425} 1590}
1426 1591
1427sub get_text { 1592sub get_text {
1428 $_[0]{text} 1593 $_[0]{text}
1429} 1594}
1432 my ($self) = @_; 1597 my ($self) = @_;
1433 1598
1434 my ($w, $h) = $self->SUPER::size_request; 1599 my ($w, $h) = $self->SUPER::size_request;
1435 1600
1436 ($w + 1, $h) # add 1 for cursor 1601 ($w + 1, $h) # add 1 for cursor
1437}
1438
1439sub size_allocate {
1440 my ($self, $w, $h) = @_;
1441
1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1443} 1602}
1444 1603
1445sub key_down { 1604sub key_down {
1446 my ($self, $ev) = @_; 1605 my ($self, $ev) = @_;
1447 1606
1449 my $sym = $ev->{sym}; 1608 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1609 my $uni = $ev->{unicode};
1451 1610
1452 my $text = $self->get_text; 1611 my $text = $self->get_text;
1453 1612
1454 if ($sym == 8) { 1613 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1614 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1615 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1616 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1617 } elsif ($sym == CFClient::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1618 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1619 } elsif ($sym == CFClient::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1620 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1621 } elsif ($sym == CFClient::SDLK_HOME) {
1463 $self->{cursor} = 0; 1622 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1623 } elsif ($sym == CFClient::SDLK_END) {
1465 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1466 } elsif ($sym == 27) { 1625 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1626 $self->_emit ('escape');
1468 } elsif ($uni) { 1627 } elsif ($uni) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1628 substr $text, $self->{cursor}++, 0, chr $uni;
1470 } 1629 }
1471 1630
1472 $self->_set_text ($text); 1631 $self->_set_text ($text);
1473 $self->update; 1632 $self->update;
1633 $self->check_size;
1474} 1634}
1475 1635
1476sub focus_in { 1636sub focus_in {
1477 my ($self) = @_; 1637 my ($self) = @_;
1478 1638
1558 if ($sym == 13) { 1718 if ($sym == 13) {
1559 unshift @{$self->{history}}, 1719 unshift @{$self->{history}},
1560 my $txt = $self->get_text; 1720 my $txt = $self->get_text;
1561 $self->{history_pointer} = -1; 1721 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = ''; 1722 $self->{history_saveback} = '';
1563 $self->emit (activate => $txt); 1723 $self->_emit (activate => $txt);
1564 $self->update; 1724 $self->update;
1565 1725
1566 } elsif ($sym == CFClient::SDLK_UP) { 1726 } elsif ($sym == CFClient::SDLK_UP) {
1567 if ($self->{history_pointer} < 0) { 1727 if ($self->{history_pointer} < 0) {
1568 $self->{history_saveback} = $self->get_text; 1728 $self->{history_saveback} = $self->get_text;
1607 my $class = shift; 1767 my $class = shift;
1608 1768
1609 $class->SUPER::new ( 1769 $class->SUPER::new (
1610 padding => 4, 1770 padding => 4,
1611 fg => [1, 1, 1], 1771 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 1772 active_fg => [0, 0, 1],
1614 can_hover => 1, 1773 can_hover => 1,
1615 align => 0, 1774 align => 0,
1616 valign => 0, 1775 valign => 0,
1617 can_events => 1, 1776 can_events => 1,
1618 @_ 1777 @_
1619 ) 1778 )
1620} 1779}
1621 1780
1781sub activate { }
1782
1622sub button_up { 1783sub button_up {
1623 my ($self, $ev, $x, $y) = @_; 1784 my ($self, $ev, $x, $y) = @_;
1624 1785
1786 $self->emit ("activate")
1625 if ($x >= 0 && $x < $self->{w} 1787 if $x >= 0 && $x < $self->{w}
1626 && $y >= 0 && $y < $self->{h}) { 1788 && $y >= 0 && $y < $self->{h};
1627 $self->emit ("activate");
1628 }
1629} 1789}
1630 1790
1631sub _draw { 1791sub _draw {
1632 my ($self) = @_; 1792 my ($self) = @_;
1633 1793
1665 1825
1666 $class->SUPER::new ( 1826 $class->SUPER::new (
1667 padding => 2, 1827 padding => 2,
1668 fg => [1, 1, 1], 1828 fg => [1, 1, 1],
1669 active_fg => [1, 1, 0], 1829 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5],
1670 state => 0, 1832 state => 0,
1671 can_hover => 1, 1833 can_hover => 1,
1672 @_ 1834 @_
1673 ) 1835 )
1674} 1836}
1683 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1684 1846
1685 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1686 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1687 $self->{state} = !$self->{state}; 1849 $self->{state} = !$self->{state};
1688 $self->emit (changed => $self->{state}); 1850 $self->_emit (changed => $self->{state});
1689 } 1851 }
1690} 1852}
1691 1853
1692sub _draw { 1854sub _draw {
1693 my ($self) = @_; 1855 my ($self) = @_;
1958 qw(s1_slider.png s1_slider_bg.png); 2120 qw(s1_slider.png s1_slider_bg.png);
1959 2121
1960sub new { 2122sub new {
1961 my $class = shift; 2123 my $class = shift;
1962 2124
1963 # range [value, low, high, page] 2125 # range [value, low, high, page, unit]
1964 2126
1965 # TODO: 0-width page 2127 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2128 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2129 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2131 fg => [1, 1, 1],
1970 active_fg => [0, 0, 0], 2132 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5],
1971 range => [0, 0, 100, 10], 2135 range => [0, 0, 100, 10, 0],
1972 req_w => $::WIDTH / 80, 2136 req_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2137 req_h => $::WIDTH / 80,
1974 vertical => 0, 2138 vertical => 0,
1975 can_hover => 1, 2139 can_hover => 1,
1976 inner_pad => 5, 2140 inner_pad => 0.02,
1977 @_ 2141 @_
1978 ); 2142 );
1979 2143
2144 $self->set_value ($self->{range}[0]);
2145 $self->update;
2146
1980 $self 2147 $self
2148}
2149
2150sub set_range {
2151 my ($self, $range) = @_;
2152
2153 ($range, $self->{range}) = ($self->{range}, $range);
2154
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2157}
2158
2159sub set_value {
2160 my ($self, $value) = @_;
2161
2162 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2163
2164 $hi = $lo + 1 if $hi <= $lo;
2165
2166 $page = $hi - $lo if $page > $hi - $lo;
2167
2168 $value = $lo if $value < $lo;
2169 $value = $hi - $page if $value > $hi - $page;
2170
2171 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2172 if $unit;
2173
2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2175
2176 if ($value != $old_value) {
2177 $self->_emit (changed => $value);
2178 $self->update;
2179 }
1981} 2180}
1982 2181
1983sub size_request { 2182sub size_request {
1984 my ($self) = @_; 2183 my ($self) = @_;
1985 2184
1991 2190
1992sub button_down { 2191sub button_down {
1993 my ($self, $ev, $x, $y) = @_; 2192 my ($self, $ev, $x, $y) = @_;
1994 2193
1995 $self->SUPER::button_down ($ev, $x, $y); 2194 $self->SUPER::button_down ($ev, $x, $y);
2195
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197
1996 $self->mouse_motion ($ev, $x, $y); 2198 $self->mouse_motion ($ev, $x, $y);
1997} 2199}
1998 2200
1999sub mouse_motion { 2201sub mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
2001 2203
2002 if ($GRAB == $self) { 2204 if ($GRAB == $self) {
2205 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2206
2207 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210
2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2212 }
2213}
2214
2215sub update {
2216 my ($self) = @_;
2217
2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2219 $self->set_value ($self->{range}[0]);
2220
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2221 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100;
2004 2223
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2224 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2006 2225
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2226 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2227 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2009 2228
2010 $x -= $inner_pad_px; # substract the padding 2229 $value = ($value - $lo) / $range;
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2230 $value = $value * $self->{scale} + $self->{offset};
2012 $x = $lo if $x < $lo;
2013 $x = $hi - $page if $x > $hi - $page;
2014 $self->{range}[0] = $x;
2015 2231
2016 $self->emit (changed => $x); 2232 $self->{knob_x} = $value - $knob_w * 0.5;
2017 $self->update; 2233 $self->{knob_w} = $knob_w;
2018 } 2234 });
2019}
2020 2235
2021# the inner_* stuff is for generating a padding for the slider handle, 2236 $self->SUPER::update;
2022# so that the handle doesn't leave the texture. This calculation isn't 100%
2023# correct propably, but it does the job for now
2024sub _calc_inner_pad_px {
2025 my ($self, $w) = @_;
2026 ($w / 100) * $self->{inner_pad} # % to pixels
2027} 2237}
2028 2238
2029sub _draw { 2239sub _draw {
2030 my ($self) = @_; 2240 my ($self) = @_;
2031 2241
2032 $self->SUPER::_draw (); 2242 $self->SUPER::_draw ();
2033 2243
2034 my ($w, $h) = @$self{qw(w h)}; 2244 glScale $self->{w}, $self->{h};
2035 2245
2036 if ($self->{vertical}) { 2246 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2247 # draw a vertical slider like a rotated horizontal slider
2038 2248
2249 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2250 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2251 }
2044 2252
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2253 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2254 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2255
2048 my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050 $hi = $value + 1 if $lo == $hi;
2051
2052 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055 $page = int $page * $inner_w / ($hi - $lo);
2056 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058 $w -= $page;
2059 $page &= ~1;
2060 glTranslate $page * 0.5, 0, 0;
2061 $page ||= 2;
2062
2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2258
2069 # draw background 2259 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2260 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2261
2072 # draw handle 2262 # draw handle
2073 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2263 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2074 2264
2075 glDisable GL_TEXTURE_2D; 2265 glDisable GL_TEXTURE_2D;
2076} 2266}
2267
2268#############################################################################
2269
2270package CFClient::UI::ValSlider;
2271
2272our @ISA = CFClient::UI::HBox::;
2273
2274sub new {
2275 my ($class, %arg) = @_;
2276
2277 my $range = delete $arg{range};
2278
2279 my $self = $class->SUPER::new (
2280 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2281 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2282 to_value => sub { shift },
2283 from_value => sub { shift },
2284 %arg,
2285 );
2286
2287 $self->{slider}->connect (changed => sub {
2288 my ($self, $value) = @_;
2289 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2290 $self->{parent}->emit (changed => $value);
2291 });
2292
2293# $self->{entry}->connect (changed => sub {
2294# my ($self, $value) = @_;
2295# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2296# $self->{parent}->emit (changed => $value);
2297# });
2298
2299 $self->add ($self->{slider}, $self->{entry});
2300
2301 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2302
2303 $self
2304}
2305
2306sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) }
2077 2308
2078############################################################################# 2309#############################################################################
2079 2310
2080package CFClient::UI::TextView; 2311package CFClient::UI::TextView;
2081 2312
2111 2342
2112 $self->{fontsize} = $fontsize; 2343 $self->{fontsize} = $fontsize;
2113 $self->reflow; 2344 $self->reflow;
2114} 2345}
2115 2346
2116sub text_height {
2117 my ($self, $text) = @_;
2118
2119 my $layout = $self->{layout};
2120
2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122 $layout->set_width ($self->{children}[0]{w});
2123 $layout->set_markup ($text);
2124
2125 ($layout->size)[1]
2126}
2127
2128sub reflow {
2129 my ($self) = @_;
2130
2131 $self->{need_reflow}++;
2132 $self->update;
2133}
2134
2135sub size_allocate { 2347sub size_allocate {
2136 my ($self, $w, $h) = @_; 2348 my ($self, $w, $h) = @_;
2137 2349
2138 $self->SUPER::size_allocate ($w, $h); 2350 $self->SUPER::size_allocate ($w, $h);
2139 2351
2142 $self->{layout}->set_width ($self->{children}[0]{w}); 2354 $self->{layout}->set_width ($self->{children}[0]{w});
2143 2355
2144 $self->reflow; 2356 $self->reflow;
2145} 2357}
2146 2358
2359sub text_size {
2360 my ($self, $text, $indent) = @_;
2361
2362 my $layout = $self->{layout};
2363
2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2365 $layout->set_width ($self->{children}[0]{w} - $indent);
2366 $layout->set_markup ($text);
2367
2368 $layout->size
2369}
2370
2371sub reflow {
2372 my ($self) = @_;
2373
2374 $self->{need_reflow}++;
2375 $self->update;
2376}
2377
2378sub set_offset {
2379 my ($self, $offset) = @_;
2380
2381 # todo: base offset on lines or so, not on pixels
2382 $self->{children}[1]->set_value ($offset);
2383}
2384
2385sub clear {
2386 my ($self) = @_;
2387
2388 $self->{par} = [];
2389 $self->{height} = 0;
2390 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2391}
2392
2147sub add_paragraph { 2393sub add_paragraph {
2148 my ($self, $color, $text) = @_; 2394 my ($self, $color, $text, $indent) = @_;
2149 2395
2150 #TODO: intelligently "reformat" paragraph 2396 for my $line (split /\n/, $text) {
2151 2397 my ($w, $h) = $self->text_size ($line);
2152 my $height = $self->text_height ($text);
2153
2154 $self->{height} += $height; 2398 $self->{height} += $h;
2399 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2400 }
2155 2401
2156 push @{$self->{par}}, [$height, $color, $text];
2157
2158 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2402 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2159 $self->{children}[1]->update;
2160} 2403}
2161 2404
2162sub update { 2405sub update {
2163 my ($self) = @_; 2406 my ($self) = @_;
2164 2407
2167 return unless $self->{h} > 0; 2410 return unless $self->{h} > 0;
2168 2411
2169 delete $self->{texture}; 2412 delete $self->{texture};
2170 2413
2171 $ROOT->on_post_alloc ($self, sub { 2414 $ROOT->on_post_alloc ($self, sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416
2172 if (delete $self->{need_reflow}) { 2417 if (delete $self->{need_reflow}) {
2173 my $height = 0; 2418 my $height = 0;
2174 2419
2175 $height += $_->[0] = $self->text_height ($_->[2]) 2420 my $layout = $self->{layout};
2421
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423
2176 for @{$self->{par}}; 2424 for (@{$self->{par}}) {
2425 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2426 $layout->set_width ($W - $_->[3]);
2427 $layout->set_markup ($_->[4]);
2428 my ($w, $h) = $layout->size;
2429 $_->[0] = $w + $_->[3];
2430 $_->[1] = $h;
2431 }
2432
2433 $height += $_->[1];
2434 }
2177 2435
2178 $self->{height} = $height; 2436 $self->{height} = $height;
2179 2437
2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2438 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2181 2439
2182 delete $self->{texture}; 2440 delete $self->{texture};
2183 } 2441 }
2184 2442
2185 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2186 glClearColor 0, 0, 0, 0; 2444 glClearColor 0.5, 0.5, 0.5, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 2445 glClear GL_COLOR_BUFFER_BIT;
2188 2446
2189 glEnable GL_TEXTURE_2D;
2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2191
2192 my $top = int $self->{children}[1]{range}[0]; 2447 my $top = int $self->{children}[1]{range}[0];
2193 2448
2194 my $y0 = $top; 2449 my $y0 = $top;
2195 my $y1 = $top + $self->{h}; 2450 my $y1 = $top + $H;
2196 2451
2197 my $y = 0; 2452 my $y = 0;
2198 2453
2199 my $layout = $self->{layout}; 2454 my $layout = $self->{layout};
2200 2455
2201 $layout->set_font ($self->{font}) if $self->{font}; 2456 $layout->set_font ($self->{font}) if $self->{font};
2202 2457
2458 glEnable GL_BLEND;
2459 #TODO# not correct in windows where rgba is forced off
2460 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2461
2203 for my $par (@{$self->{par}}) { 2462 for my $par (@{$self->{par}}) {
2204 my $h = $par->[0]; 2463 my $h = $par->[1];
2205 2464
2206 if ($y0 < $y + $h && $y < $y1) { 2465 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] }); 2466 $layout->set_foreground (@{ $par->[2] });
2467 $layout->set_width ($W - $par->[3]);
2208 $layout->set_markup ($par->[2]); 2468 $layout->set_markup ($par->[4]);
2209 2469
2210 my ($W, $H) = $layout->size; 2470 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2211 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2471
2472 glRasterPos $par->[3], $y - $y0;
2473 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2212 } 2474 }
2213 2475
2214 $y += $h; 2476 $y += $h;
2215 } 2477 }
2216 2478
2217 glDisable GL_TEXTURE_2D; 2479 glDisable GL_BLEND;
2218 }; 2480 };
2219 }); 2481 });
2220} 2482}
2221 2483
2222sub _draw { 2484sub _draw {
2223 my ($self) = @_; 2485 my ($self) = @_;
2224 2486
2225 glEnable GL_TEXTURE_2D; 2487 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 2489 glColor 1, 1, 1, 1;
2228 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2490 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2229 glDisable GL_TEXTURE_2D; 2491 glDisable GL_TEXTURE_2D;
2230 2492
2231 $self->{children}[1]->draw; 2493 $self->{children}[1]->draw;
2232 2494
2233} 2495}
2302 2564
2303 # TODO: use animation 2565 # TODO: use animation
2304 if ($self->{state} = !$self->{state}) { 2566 if ($self->{state} = !$self->{state}) {
2305 $CFClient::UI::ROOT->add ($self->{other}); 2567 $CFClient::UI::ROOT->add ($self->{other});
2306 $self->{other}->move ($self->coord2global (0, $self->{h})); 2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2307 $self->emit ("open"); 2569 $self->_emit ("open");
2308 } else { 2570 } else {
2309 $CFClient::UI::ROOT->remove ($self->{other}); 2571 $CFClient::UI::ROOT->remove ($self->{other});
2310 $self->emit ("close"); 2572 $self->_emit ("close");
2311 } 2573 }
2312 2574
2313 $self->emit (changed => $self->{state}); 2575 $self->_emit (changed => $self->{state});
2314} 2576}
2315 2577
2316############################################################################# 2578#############################################################################
2317 2579
2318package CFClient::UI::Tooltip; 2580package CFClient::UI::Tooltip;
2332 2594
2333sub set_tooltip_from { 2595sub set_tooltip_from {
2334 my ($self, $widget) = @_; 2596 my ($self, $widget) = @_;
2335 2597
2336 $self->add (new CFClient::UI::Label 2598 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip}, 2599 markup => $widget->{tooltip},
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 2601 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 2602 fg => [0, 0, 0, 1],
2603 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 2604 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 2605 );
2343} 2606}
2344 2607
2345sub size_request { 2608sub size_request {
2346 my ($self) = @_; 2609 my ($self) = @_;
2392use CFClient::OpenGL; 2655use CFClient::OpenGL;
2393 2656
2394sub new { 2657sub new {
2395 my $class = shift; 2658 my $class = shift;
2396 2659
2397 $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2398 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2399 @_, 2663 @_,
2400 ) 2664 );
2665
2666 if ($self->{anim} && $self->{animspeed}) {
2667 Scalar::Util::weaken (my $widget = $self);
2668
2669 $self->{timer} = Event->timer (
2670 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2671 hard => 1,
2672 interval => $self->{animspeed},
2673 cb => sub {
2674 ++$widget->{frame};
2675 $widget->update;
2676 },
2677 );
2678 }
2679
2680 $self
2401} 2681}
2402 2682
2403sub size_request { 2683sub size_request {
2404 (32, 8) 2684 (32, 8)
2405} 2685}
2406 2686
2687sub update {
2688 my ($self) = @_;
2689
2690 return unless $self->{visible};
2691
2692 $self->SUPER::update;
2693}
2694
2407sub _draw { 2695sub _draw {
2408 my ($self) = @_; 2696 my ($self) = @_;
2409 2697
2410 return unless $::CONN;#d# manage and cache textures differently 2698 return unless $::CONN;
2699
2700 my $face;
2701
2702 if ($self->{frame}) {
2703 my $anim = $::CONN->{anim}[$self->{anim}];
2704
2705 $face = $anim->[ $self->{frame} % @$anim ]
2706 if $anim && @$anim;
2707 }
2708
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 2710
2413 # TODO animation
2414 if ($tex) { 2711 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 2712 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2714 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2716 glDisable GL_TEXTURE_2D;
2420 } 2717 }
2421} 2718}
2422 2719
2720sub DESTROY {
2721 my ($self) = @_;
2722
2723 $self->{timer}->cancel
2724 if $self->{timer};
2725
2726 $self->SUPER::DESTROY;
2727}
2728
2423############################################################################# 2729#############################################################################
2424 2730
2425package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2426 2732
2427our @ISA = CFClient::UI::HBox::; 2733our @ISA = CFClient::UI::ScrolledWindow::;
2428 2734
2429sub new { 2735sub new {
2430 my $class = shift; 2736 my $class = shift;
2431 2737
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
2442 can_hover => 1, 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488
2489#############################################################################
2490
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_, 2740 @_,
2501 ); 2741 );
2502 2742
2503 $self 2743 $self
2504} 2744}
2507 my ($self, $items) = @_; 2747 my ($self, $items) = @_;
2508 2748
2509 $self->{scrolled}->clear; 2749 $self->{scrolled}->clear;
2510 return unless $items; 2750 return unless $items;
2511 2751
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2513 2756
2514 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2515 2758
2759 my $row = 0;
2516 for my $item (@items) { 2760 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2 2761 CFClient::Item::update_widgets $item;
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520 2762
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2522 } 2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2523 2766
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2525} 2769}
2526 2770
2527sub size_request { 2771sub size_request {
2528 my ($self) = @_; 2772 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
2569 2813
2570# popup given the event (must be a mouse button down event currently) 2814# popup given the event (must be a mouse button down event currently)
2571sub popup { 2815sub popup {
2572 my ($self, $ev) = @_; 2816 my ($self, $ev) = @_;
2573 2817
2574 $self->emit ("popdown"); 2818 $self->_emit ("popdown");
2575 2819
2576 # maybe save $GRAB? must be careful about events... 2820 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self; 2821 $GRAB = $self;
2578 $self->{button} = $ev->{button}; 2822 $self->{button} = $ev->{button};
2579 2823
2594 2838
2595 if ($ev->{button} == $self->{button}) { 2839 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB; 2840 undef $GRAB;
2597 $self->hide; 2841 $self->hide;
2598 2842
2599 $self->emit ("popdown"); 2843 $self->_emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover}; 2844 $self->{hover}[1]->() if $self->{hover};
2601 } 2845 }
2602} 2846}
2603 2847
2604############################################################################# 2848#############################################################################
2605 2849
2606package CFClient::UI::Statusbox; 2850package CFClient::UI::Statusbox;
2607 2851
2608our @ISA = CFClient::UI::VBox::; 2852our @ISA = CFClient::UI::VBox::;
2853
2854sub new {
2855 my $class = shift;
2856
2857 $class->SUPER::new (
2858 fontsize => 0.8,
2859 @_,
2860 )
2861}
2609 2862
2610sub reorder { 2863sub reorder {
2611 my ($self) = @_; 2864 my ($self) = @_;
2612 my $NOW = time; 2865 my $NOW = time;
2613 2866
2632 ? "<b>$item->{count} ×</b> $item->{text}" 2885 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 2886 : $item->{text};
2634 2887
2635 for ($short) { 2888 for ($short) {
2636 s/^\s+//; 2889 s/^\s+//;
2637 s/\012.*/…/s; 2890 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 2891 }
2641 2892
2642 new CFClient::UI::Label 2893 new CFClient::UI::Label
2643 markup => $short, 2894 markup => $short,
2644 tooltip => $item->{tooltip}, 2895 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 2896 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 2897 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 2898 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44,
2648 color => $item->{color}, 2900 fg => $item->{fg},
2649 can_events => 1, 2901 can_events => 1,
2650 can_hover => 1 2902 can_hover => 1
2651 }; 2903 };
2652 } 2904 }
2653 2905
2658sub add { 2910sub add {
2659 my ($self, $text, %arg) = @_; 2911 my ($self, $text, %arg) = @_;
2660 2912
2661 $text =~ s/^\s+//; 2913 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//; 2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
2663 2917
2664 my $timeout = time + ((delete $arg{timeout}) || 60); 2918 my $timeout = time + ((delete $arg{timeout}) || 60);
2665 2919
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667 2921
2679 $self->{item}{$group} = { 2933 $self->{item}{$group} = {
2680 id => ++$self->{id}, 2934 id => ++$self->{id},
2681 text => $text, 2935 text => $text,
2682 timeout => $timeout, 2936 timeout => $timeout,
2683 tooltip => $text, 2937 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 2938 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 2939 pri => 0,
2687 count => 1, 2940 count => 1,
2688 %arg, 2941 %arg,
2689 }; 2942 };
2690 } 2943 }
2691 2944
2692 $self->reorder; 2945 $self->reorder;
2693} 2946}
2694 2947
2948sub reconfigure {
2949 my ($self) = @_;
2950
2951 delete $_->{label}
2952 for values %{ $self->{item} || {} };
2953
2954 $self->reorder;
2955 $self->SUPER::reconfigure;
2956}
2957
2695############################################################################# 2958#############################################################################
2696 2959
2697package CFClient::UI::Root; 2960package CFClient::UI::Root;
2698 2961
2699our @ISA = CFClient::UI::Container::; 2962our @ISA = CFClient::UI::Container::;
2702 2965
2703sub new { 2966sub new {
2704 my $class = shift; 2967 my $class = shift;
2705 2968
2706 $class->SUPER::new ( 2969 $class->SUPER::new (
2970 visible => 1,
2707 @_, 2971 @_,
2708 ) 2972 )
2709} 2973}
2710 2974
2711sub configure { 2975sub configure {
2729} 2993}
2730 2994
2731sub size_allocate { 2995sub size_allocate {
2732 my ($self, $w, $h) = @_; 2996 my ($self, $w, $h) = @_;
2733 2997
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749
2750 for my $child ($self->children) { 2998 for my $child ($self->children) {
2751 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2752 3000
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3002 if exists $child->{req_x};
3003
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3005 if exists $child->{req_y};
3006
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2754 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009
2755 $child->configure ($X, $Y, $W, $H); 3010 $child->configure ($X, $Y, $W, $H);
2756 } 3011 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760} 3012}
2761 3013
2762sub coord2local { 3014sub coord2local {
2763 my ($self, $x, $y) = @_; 3015 my ($self, $x, $y) = @_;
2764 3016
2777 $self->check_size; 3029 $self->check_size;
2778 $::WANT_REFRESH++; 3030 $::WANT_REFRESH++;
2779} 3031}
2780 3032
2781sub add { 3033sub add {
2782 my ($self, $child) = @_; 3034 my ($self, @children) = @_;
2783 3035
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1;
3044
2784 # integerise window positions 3045 # integerise window positions
2785 $child->{x} = int $child->{x}; 3046 $child->{x} = int $child->{x};
2786 $child->{y} = int $child->{y}; 3047 $child->{y} = int $child->{y};
3048 }
2787 3049
2788 $self->SUPER::add ($child); 3050 $self->SUPER::add (@children);
3051}
3052
3053sub remove {
3054 my ($self, @children) = @_;
3055
3056 $self->SUPER::remove (@children);
3057
3058 while (@children) {
3059 my $w = pop @children;
3060 push @children, $w->children;
3061 $w->set_invisible;
3062 }
2789} 3063}
2790 3064
2791sub on_refresh { 3065sub on_refresh {
2792 my ($self, $id, $cb) = @_; 3066 my ($self, $id, $cb) = @_;
2793 3067
2846 $w = 0 if $w < 0; 3120 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0; 3121 $h = 0 if $h < 0;
2848 3122
2849 $widget->{w} = $w; 3123 $widget->{w} = $w;
2850 $widget->{h} = $h; 3124 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h);
2852 $widget->emit (size_allocate => $w, $h); 3125 $widget->emit (size_allocate => $w, $h);
2853 } 3126 }
2854 } 3127 }
2855 3128
2856 while ($self->{post_alloc_hook}) { 3129 while ($self->{post_alloc_hook}) {
2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863 glClear GL_COLOR_BUFFER_BIT; 3136 glClear GL_COLOR_BUFFER_BIT;
2864 3137
2865 glMatrixMode GL_PROJECTION; 3138 glMatrixMode GL_PROJECTION;
2866 glLoadIdentity; 3139 glLoadIdentity;
2867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868 glMatrixMode GL_MODELVIEW; 3141 glMatrixMode GL_MODELVIEW;
2869 glLoadIdentity; 3142 glLoadIdentity;
2870 3143
2871 $self->_draw; 3144 $self->_draw;
2872} 3145}
2874############################################################################# 3147#############################################################################
2875 3148
2876package CFClient::UI; 3149package CFClient::UI;
2877 3150
2878$ROOT = new CFClient::UI::Root; 3151$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 3152$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2880 3153
28811 31541
2882 3155

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines