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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.248 by root, Sun May 28 01:37:45 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
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
16 38
17sub check_tooltip { 39sub check_tooltip {
18 if (!$GRAB) { 40 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
24 46
25 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
26 48
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 50
29 $TOOLTIP->set_markup ($widget->{tooltip}, $widget->{tooltip_font}); 51 $TOOLTIP->set_tooltip_from ($widget);
30
31 $TOOLTIP->show; 52 $TOOLTIP->show;
32 53
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34 55
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 } 57 if $x + $TOOLTIP->{w} > $::WIDTH;
38 58
39 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
40 } 62 }
41 63
42 return; 64 return;
43 } 65 }
44 } 66 }
… …
48 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
49} 71}
50 72
51# class methods for events 73# class methods for events
52sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
54 if $FOCUS; 76 if $FOCUS;
55} 77}
56 78
57sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
59 if $FOCUS; 81 if $FOCUS;
60} 82}
61 83
62sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
63 my ($ev) = @_; 85 my ($ev) = @_;
… …
72 check_tooltip; 94 check_tooltip;
73 } 95 }
74 96
75 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
76 98
77 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
81} 101}
82 102
83sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
84 my ($ev) = @_; 104 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
86 106
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88 108
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 110
91 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
95 113
96 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
97 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
98 $grab->update if $grab; 116 $grab->update if $grab;
99 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
115 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
116 134
117 check_tooltip; 135 check_tooltip;
118 } 136 }
119 137
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123 } 139 if $HOVER;
124} 140}
125 141
126# convert position array to integers 142# convert position array to integers
127sub harmonize { 143sub harmonize {
128 my ($vals) = @_; 144 my ($vals) = @_;
… …
132 for (@$vals) { 148 for (@$vals) {
133 my $i = int $_ + $rem; 149 my $i = int $_ + $rem;
134 $rem += $_ - $i; 150 $rem += $_ - $i;
135 $_ = $i; 151 $_ = $i;
136 } 152 }
153}
154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
183 }
184 }
185
186 reconfigure_widgets;
137} 187}
138 188
139############################################################################# 189#############################################################################
140 190
141package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
154 can_events => 1, 204 can_events => 1,
155 @_ 205 @_
156 }, $class; 206 }, $class;
157 207
158 for (keys %$self) { 208 for (keys %$self) {
159 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
160 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
161 } 211 }
162 } 212 }
163 213
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
164 $self 223 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
165} 234}
166 235
167sub destroy { 236sub destroy {
168 my ($self) = @_; 237 my ($self) = @_;
169 238
… …
177 return if $self->{parent}; 246 return if $self->{parent};
178 247
179 $CFClient::UI::ROOT->add ($self); 248 $CFClient::UI::ROOT->add ($self);
180} 249}
181 250
182sub hide { 251sub center {
183 my ($self) = @_; 252 my ($self) = @_;
253
254 $CFClient::UI::ROOT->on_post_alloc (
255 "center_$self" => sub {
256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257 },
258 );
259
260 $self->update;
261}
262
263sub set_visible {
264 my ($self) = @_;
265
266 return if $self->{visible};
267
268 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1;
270
271 $self->emit (visibility_change => 1);
272}
273
274sub set_invisible {
275 my ($self) = @_;
276
277 return unless $self->{visible};
278
279 # broken show/hide model
280
281 delete $self->{root};
282 delete $self->{visible};
184 283
185 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self; 285 undef $HOVER if $HOVER == $self;
286
287 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self;
289
290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
293}
294
295sub hide {
296 my ($self) = @_;
297
298 $self->set_invisible;
187 299
188 $self->{parent}->remove ($self) 300 $self->{parent}->remove ($self)
189 if $self->{parent}; 301 if $self->{parent};
190} 302}
191 303
… …
200} 312}
201 313
202sub set_size { 314sub set_size {
203 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
204 316
205 $self->{user_w} = $w; 317 $self->{def_w} = $w;
206 $self->{user_h} = $h; 318 $self->{def_h} = $h;
207 319
208 $self->check_size; 320 $self->check_size;
209} 321}
210 322
211sub size_request { 323sub size_request {
… …
241 353
242sub size_allocate { 354sub size_allocate {
243 # nothing to be done 355 # nothing to be done
244} 356}
245 357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
246sub children { 365sub children {
247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259} 366}
260 367
261sub set_max_size { 368sub set_max_size {
262 my ($self, $w, $h) = @_; 369 my ($self, $w, $h) = @_;
263 370
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 371 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 372 delete $self->{max_h}; $self->{max_h} = $h if $h;
373}
374
375sub set_tooltip {
376 my ($self, $tooltip) = @_;
377
378 $tooltip =~ s/^\s+//;
379 $tooltip =~ s/\s+$//;
380
381 return if $self->{tooltip} eq $tooltip;
382
383 $self->{tooltip} = $tooltip;
384
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip;
388 }
266} 389}
267 390
268# translate global coordinates to local coordinate system 391# translate global coordinates to local coordinate system
269sub coord2local { 392sub coord2local {
270 my ($self, $x, $y) = @_; 393 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 408 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 409 return unless $self->{can_focus};
287 410
288 my $focus = $FOCUS; $FOCUS = $self; 411 my $focus = $FOCUS; $FOCUS = $self;
289 412
290 $self->emit (focus_in => $focus); 413 $self->_emit (focus_in => $focus);
291 414
292 $focus->update if $focus; 415 $focus->update if $focus;
293 $FOCUS->update; 416 $FOCUS->update;
294} 417}
295 418
… …
298 421
299 return unless $FOCUS == $self; 422 return unless $FOCUS == $self;
300 423
301 my $focus = $FOCUS; undef $FOCUS; 424 my $focus = $FOCUS; undef $FOCUS;
302 425
303 $self->emit (focus_out => $focus); 426 $self->_emit (focus_out => $focus);
304 427
305 $focus->update if $focus; #? 428 $focus->update if $focus; #?
429
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431 unless $FOCUS;
306} 432}
307 433
308sub mouse_motion { } 434sub mouse_motion { }
309sub button_up { } 435sub button_up { }
310sub key_down { } 436sub key_down { }
311sub key_up { } 437sub key_up { }
312 438
313sub button_down { 439sub button_down {
314 my ($self, $ev, $x, $y) = @_; 440 my ($self, $ev, $x, $y) = @_;
315 441
316 $self->focus_in; 442 $self->focus_in;
… …
350 if ($ENV{PCLIENT_DEBUG}) { 476 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix; 477 glPushMatrix;
352 glColor 1, 1, 0, 1; 478 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 480 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 481 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 482 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 483 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 484 glVertex 0 , $self->{h} - 1;
359 glEnd; 485 glEnd;
360 glPopMatrix; 486 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 488 }
363} 489}
364 490
365sub _draw { 491sub _draw {
366 my ($self) = @_; 492 my ($self) = @_;
… …
383sub set_parent { 509sub set_parent {
384 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
385 511
386 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
387 513
514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
388 $self->check_size 516 $self->check_size;
389 unless exists $self->{req_w};
390} 517}
391 518
392sub check_size { 519sub check_size {
393 my ($self) = @_; 520 my ($self, $forced) = @_;
394 521
522 $self->{force_alloc} = 1 if $forced;
395 $CFClient::UI::ROOT->{check_size}{$self} = $self; 523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
396} 524}
397 525
398sub update { 526sub update {
399 my ($self) = @_; 527 my ($self) = @_;
… …
406 my ($self, $signal, $cb) = @_; 534 my ($self, $signal, $cb) = @_;
407 535
408 push @{ $self->{signal_cb}{$signal} }, $cb; 536 push @{ $self->{signal_cb}{$signal} }, $cb;
409} 537}
410 538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
411sub emit { 545sub emit {
412 my ($self, $signal, @args) = @_; 546 my ($self, $signal, @args) = @_;
413 547
414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 548 $self->_emit ($signal, @args)
549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
415} 554}
416 555
417sub DESTROY { 556sub DESTROY {
418 my ($self) = @_; 557 my ($self) = @_;
419 558
559 delete $WIDGET{$self+0};
420 #$self->deactivate; 560 #$self->deactivate;
421} 561}
422 562
423############################################################################# 563#############################################################################
424 564
… …
433 my $class = shift; 573 my $class = shift;
434 574
435 # range [value, low, high, page] 575 # range [value, low, high, page]
436 576
437 $class->SUPER::new ( 577 $class->SUPER::new (
438 bg => [0, 0, 0, 0.2], 578 #bg => [0, 0, 0, 0.2],
439 active_bg => [1, 1, 1, 0.5], 579 #active_bg => [1, 1, 1, 0.5],
440 @_ 580 @_
441 ) 581 )
442} 582}
443 583
444sub _draw { 584sub _draw {
445 my ($self) = @_; 585 my ($self) = @_;
446 586
587 my $color = $FOCUS == $self && $self->{active_bg}
588 ? $self->{active_bg}
589 : $self->{bg};
590
591 if ($color && (@$color < 4 || $color->[3])) {
447 my ($w, $h) = @$self{qw(w h)}; 592 my ($w, $h) = @$self{qw(w h)};
448 593
449 glEnable GL_BLEND; 594 glEnable GL_BLEND;
450 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 596 glColor @$color;
452 597
453 glBegin GL_QUADS; 598 glBegin GL_QUADS;
454 glVertex 0 , 0; 599 glVertex 0 , 0;
455 glVertex 0 , $h; 600 glVertex 0 , $h;
456 glVertex $w, $h; 601 glVertex $w, $h;
457 glVertex $w, 0; 602 glVertex $w, 0;
458 glEnd; 603 glEnd;
459 604
460 glDisable GL_BLEND; 605 glDisable GL_BLEND;
606 }
461} 607}
462 608
463############################################################################# 609#############################################################################
464 610
465package CFClient::UI::Empty; 611package CFClient::UI::Empty;
… …
509 $self->{children} = [ 655 $self->{children} = [
510 sort { $a->{z} <=> $b->{z} } 656 sort { $a->{z} <=> $b->{z} }
511 @{$self->{children}}, @widgets 657 @{$self->{children}}, @widgets
512 ]; 658 ];
513 659
514 $self->check_size; 660 $self->check_size (1);
515 $self->update; 661 $self->update;
516} 662}
517 663
518sub children { 664sub children {
519 @{ $_[0]{children} } 665 @{ $_[0]{children} }
… …
525 delete $child->{parent}; 671 delete $child->{parent};
526 $child->hide; 672 $child->hide;
527 673
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529 675
530 $self->check_size; 676 $self->check_size (1);
531 $self->update; 677 $self->update;
532} 678}
533 679
534sub clear { 680sub clear {
535 my ($self) = @_; 681 my ($self) = @_;
… …
626} 772}
627 773
628sub update { 774sub update {
629 my ($self) = @_; 775 my ($self) = @_;
630 776
631 $ROOT->on_refresh ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->SUPER::update; 778 $self->SUPER::update;
633} 779}
634 780
635sub size_allocate { 781sub size_allocate {
636 my ($self, $w, $h) = @_; 782 my ($self, $w, $h) = @_;
… …
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 795 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0; 796 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT; 797 glClear GL_COLOR_BUFFER_BIT;
652 798
653 $self->_render; 799 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 }; 800 };
662} 801}
663 802
664sub _draw { 803sub _draw {
665 my ($self) = @_; 804 my ($self) = @_;
… …
669 my $tex = $self->{texture} 808 my $tex = $self->{texture}
670 or return; 809 or return;
671 810
672 glEnable GL_TEXTURE_2D; 811 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1; 813 glColor 1, 1, 1, 1;
675 814
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 815 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677 816
678 glDisable GL_TEXTURE_2D; 817 glDisable GL_TEXTURE_2D;
679} 818}
… …
682 821
683package CFClient::UI::ViewPort; 822package CFClient::UI::ViewPort;
684 823
685our @ISA = CFClient::UI::Window::; 824our @ISA = CFClient::UI::Window::;
686 825
826sub new {
827 my $class = shift;
828
829 $class->SUPER::new (
830 scroll_x => 0,
831 scroll_y => 1,
832 @_,
833 )
834}
835
687sub size_request { 836sub size_request {
688 my ($self) = @_; 837 my ($self) = @_;
689 838
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692 840
693 @$self{qw(child_w child_h)} 841 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y};
843
844 ($w, $h)
694} 845}
695 846
696sub size_allocate { 847sub size_allocate {
697 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
698 849
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
852
853 $self->child->configure (0, 0, $w, $h);
699 $self->update; 854 $self->update;
700} 855}
701 856
702sub set_offset { 857sub set_offset {
703 my ($self, $x, $y) = @_; 858 my ($self, $x, $y) = @_;
… …
754 my $class = shift; 909 my $class = shift;
755 910
756 my $self; 911 my $self;
757 912
758 my $slider = new CFClient::UI::Slider 913 my $slider = new CFClient::UI::Slider
759 vertical => 1, 914 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix 915 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub { 916 on_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 917 $self->{vp}->set_offset (0, $_[1]);
763 }, 918 },
764 ; 919 ;
765 920
766 $self = $class->SUPER::new ( 921 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort), 922 vp => (new CFClient::UI::ViewPort expand => 1),
768 slider => $slider, 923 slider => $slider,
769 @_, 924 @_,
770 ); 925 );
771 926
772 $self->{vp}->add ($self->{scrolled}); 927 $self->{vp}->add ($self->{scrolled});
… …
774 $self->add ($self->{slider}); 929 $self->add ($self->{slider});
775 930
776 $self 931 $self
777} 932}
778 933
934sub update {
935 my ($self) = @_;
936
937 $self->SUPER::update;
938
939 # todo: overwrite size_allocate of child
940 my $child = $self->{vp}->child;
941 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
942}
943
944sub size_allocate {
945 my ($self, $w, $h) = @_;
946
947 $self->SUPER::size_allocate ($w, $h);
948
949 my $child = $self->{vp}->child;
950 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
951}
952
779#TODO# update range on size_allocate depeneing on child 953#TODO# update range on size_allocate depending on child
780# update viewport offset on scroll 954# update viewport offset on scroll
781 955
782############################################################################# 956#############################################################################
783 957
784package CFClient::UI::Frame; 958package CFClient::UI::Frame;
… …
788use CFClient::OpenGL; 962use CFClient::OpenGL;
789 963
790sub new { 964sub new {
791 my $class = shift; 965 my $class = shift;
792 966
793 my $self = $class->SUPER::new ( 967 $class->SUPER::new (
794 bg => [1, 1, 1, 1], 968 bg => undef,
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_ 969 @_,
798 ); 970 )
799
800 $self
801} 971}
802 972
803sub _draw { 973sub _draw {
804 my ($self) = @_; 974 my ($self) = @_;
805 975
806 my ($w, $h) = ($self->{w}, $self->{h}); 976 if ($self->{bg}) {
977 my ($w, $h) = @$self{qw(w h)};
807 978
808 glEnable GL_BLEND; 979 glEnable GL_BLEND;
809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810 glEnable GL_TEXTURE_2D; 981 glColor @{ $self->{bg} };
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 982
813# glBegin GL_QUADS; 983 glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0; 984 glVertex 0 , 0;
816# glVertex 0 , $h; 985 glVertex 0 , $h;
817# glVertex $w, $h; 986 glVertex $w, $h;
818# glVertex $w, 0; 987 glVertex $w, 0;
819# glEnd; 988 glEnd;
820 989
821
822 $self->child->draw;
823 glDisable GL_BLEND; 990 glDisable GL_BLEND;
824 glDisable GL_TEXTURE_2D; 991 }
992
993 $self->SUPER::_draw;
825} 994}
826 995
827############################################################################# 996#############################################################################
828 997
829package CFClient::UI::FancyFrame; 998package CFClient::UI::FancyFrame;
… …
837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
838 1007
839sub new { 1008sub new {
840 my $class = shift; 1009 my $class = shift;
841 1010
842 # TODO: user_x, user_y, overwrite moveto?
843
844 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
845 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
846 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
847 border => 0.6, 1014 border => 0.6,
1015 is_toplevel => 1,
848 can_events => 1, 1016 can_events => 1,
849 @_ 1017 @_
850 ); 1018 );
851 1019
852 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
853 align => 0, 1021 align => 0,
… …
877 my ($self, $w, $h) = @_; 1045 my ($self, $w, $h) = @_;
878 1046
879 $h -= List::Util::max 0, $self->border * 2; 1047 $h -= List::Util::max 0, $self->border * 2;
880 $w -= List::Util::max 0, $self->border * 2; 1048 $w -= List::Util::max 0, $self->border * 2;
881 1049
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883 if $self->{title}; 1051 if $self->{title};
884 1052
885 $self->child->configure ($self->border, $self->border, $w, $h); 1053 $self->child->configure ($self->border, $self->border, $w, $h);
886} 1054}
887 1055
… …
906 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
907 1075
908 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
910 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
914 $self->check_size; 1084 $self->check_size;
915 }; 1085 };
916 1086
917 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
918 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
921 $self->{motion} = sub { 1091 $self->{motion} = sub {
922 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
923 1093
924 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
925 1095
926 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098
1099 $self->move ($self->{user_x}, $self->{user_y});
927 $self->update; 1100 $self->update;
928 }; 1101 };
929 } 1102 }
930} 1103}
931 1104
… …
945 my ($self) = @_; 1118 my ($self) = @_;
946 1119
947 my ($w, $h ) = ($self->{w}, $self->{h}); 1120 my ($w, $h ) = ($self->{w}, $self->{h});
948 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1121 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949 1122
950 glEnable GL_BLEND;
951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952 glEnable GL_TEXTURE_2D; 1123 glEnable GL_TEXTURE_2D;
953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954 1125
955 my $border = $self->border; 1126 my $border = $self->border;
956 1127
957 glColor @{ $self->{border_bg} }; 1128 glColor @{ $self->{border_bg} };
958 $tex[1]->draw_quad (0, 0, $w, $border); 1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
959 $tex[3]->draw_quad (0, $border, $border, $ch); 1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962 1133
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964 my $bg = $tex[0]; 1135 my $bg = $tex[0];
965 1136
966 # TODO: repeat texture not scale 1137 # TODO: repeat texture not scale
… …
970 glColor @{ $self->{bg} }; 1141 glColor @{ $self->{bg} };
971 1142
972 $bg->{s} = $rep_x; 1143 $bg->{s} = $rep_x;
973 $bg->{t} = $rep_y; 1144 $bg->{t} = $rep_y;
974 $bg->{wrap_mode} = 1; 1145 $bg->{wrap_mode} = 1;
975 $bg->draw_quad ($border, $border, $cw, $ch); 1146 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 }
976 1148
977 glDisable GL_TEXTURE_2D; 1149 glDisable GL_TEXTURE_2D;
978 glDisable GL_BLEND;
979 }
980 1150
981 $self->{title}->draw if $self->{title}; 1151 $self->{title}->draw if $self->{title};
982 1152
983 $self->child->draw; 1153 $self->child->draw;
984} 1154}
… …
996sub new { 1166sub new {
997 my $class = shift; 1167 my $class = shift;
998 1168
999 $class->SUPER::new ( 1169 $class->SUPER::new (
1000 col_expand => [], 1170 col_expand => [],
1001 @_ 1171 @_,
1002 ) 1172 )
1173}
1174
1175sub children {
1176 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003} 1177}
1004 1178
1005sub add { 1179sub add {
1006 my ($self, $x, $y, $child) = @_; 1180 my ($self, $x, $y, $child) = @_;
1007 1181
1008 $child->set_parent ($self); 1182 $child->set_parent ($self);
1009 $self->{children}[$y][$x] = $child; 1183 $self->{children}[$y][$x] = $child;
1010 1184
1011 $child->check_size; 1185 $self->check_size (1);
1012} 1186}
1013 1187
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016}
1017
1018# TODO: move to container class maybe? send childs a signal on removal? 1188# TODO: move to container class maybe? send children a signal on removal?
1019sub clear { 1189sub clear {
1020 my ($self) = @_; 1190 my ($self) = @_;
1021 1191
1022 my @children = $self->children; 1192 my @children = $self->children;
1023 delete $self->{children}; 1193 delete $self->{children};
… …
1025 for (@children) { 1195 for (@children) {
1026 delete $_->{parent}; 1196 delete $_->{parent};
1027 $_->hide; 1197 $_->hide;
1028 } 1198 }
1029 1199
1200 $self->check_size (1);
1030 $self->update; 1201 $self->update;
1031} 1202}
1032 1203
1033sub get_wh { 1204sub get_wh {
1034 my ($self) = @_; 1205 my ($self) = @_;
… …
1066sub size_allocate { 1237sub size_allocate {
1067 my ($self, $w, $h) = @_; 1238 my ($self, $w, $h) = @_;
1068 1239
1069 my ($ws, $hs) = $self->get_wh; 1240 my ($ws, $hs) = $self->get_wh;
1070 1241
1071 my $req_w = sum @$ws; 1242 my $req_w = (sum @$ws) || 1;
1072 my $req_h = sum @$hs; 1243 my $req_h = (sum @$hs) || 1;
1073 1244
1074 # TODO: nicer code && do row_expand 1245 # TODO: nicer code && do row_expand
1075 my @col_expand = @{$self->{col_expand}}; 1246 my @col_expand = @{$self->{col_expand}};
1076 @col_expand = (1) x @$ws unless @col_expand; 1247 @col_expand = (1) x @$ws unless @col_expand;
1077 my $col_expand = (sum @col_expand) || 1; 1248 my $col_expand = (sum @col_expand) || 1;
… …
1131 } 1302 }
1132} 1303}
1133 1304
1134############################################################################# 1305#############################################################################
1135 1306
1136package CFClient::UI::HBox; 1307package CFClient::UI::Box;
1137
1138# TODO: wrap into common Box base class
1139 1308
1140our @ISA = CFClient::UI::Container::; 1309our @ISA = CFClient::UI::Container::;
1141 1310
1142sub size_request { 1311sub size_request {
1143 my ($self) = @_; 1312 my ($self) = @_;
1144 1313
1145 my @alloc = map [$_->size_request], @{$self->{children}}; 1314 $self->{vertical}
1146 1315 ? (
1147 ( 1316 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1148 (List::Util::sum map $_->[0], @alloc), 1317 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1149 (List::Util::max map $_->[1], @alloc), 1318 )
1150 ) 1319 : (
1320 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 )
1151} 1323}
1152 1324
1153sub size_allocate { 1325sub size_allocate {
1154 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1155 1327
1156 ($h, $w) = ($w, $h); 1328 my $space = $self->{vertical} ? $h : $w;
1157
1158 my $children = $self->{children}; 1329 my $children = $self->{children};
1159 1330
1160 my @h = map $_->{req_w}, @$children; 1331 my @req;
1161 1332
1162 my $req_h = List::Util::sum @h; 1333 if ($self->{homogeneous}) {
1163 1334 @req = ($space / (@$children || 1)) x @$children;
1164 if ($req_h > $h) {
1165 # ah well, not enough space
1166 $_ *= $h / $req_h for @h;
1167 } else { 1335 } else {
1336 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1337 my $req = List::Util::sum @req;
1338
1339 if ($req > $space) {
1340 # ah well, not enough space
1341 $_ *= $space / $req for @req;
1342 } else {
1168 my $exp = List::Util::sum map $_->{expand}, @$children; 1343 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1169 $exp ||= 1;
1170 1344
1345 $space = ($space - $req) / $expand; # remaining space to give away
1346
1347 $req[$_] += $space * $children->[$_]{expand}
1171 for (0 .. $#$children) { 1348 for 0 .. $#$children;
1172 my $child = $children->[$_];
1173
1174 my $alloc_h = $h[$_];
1175 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1176 $h[$_] = $alloc_h;
1177 } 1349 }
1178 } 1350 }
1179 1351
1180 CFClient::UI::harmonize \@h; 1352 CFClient::UI::harmonize \@req;
1181 1353
1182 my $y = 0; 1354 my $pos = 0;
1183 for (0 .. $#$children) { 1355 for (0 .. $#$children) {
1184 my $child = $children->[$_];
1185 my $h = $h[$_]; 1356 my $alloc = $req[$_];
1186 $child->configure ($y, 0, $h, $w); 1357 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1187 1358
1188 $y += $h; 1359 $pos += $alloc;
1189 } 1360 }
1190 1361
1191 1 1362 1
1192} 1363}
1193 1364
1194############################################################################# 1365#############################################################################
1195 1366
1367package CFClient::UI::HBox;
1368
1369our @ISA = CFClient::UI::Box::;
1370
1371sub new {
1372 my $class = shift;
1373
1374 $class->SUPER::new (
1375 vertical => 0,
1376 @_,
1377 )
1378}
1379
1380#############################################################################
1381
1196package CFClient::UI::VBox; 1382package CFClient::UI::VBox;
1197 1383
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
1201 1385
1202sub size_request { 1386sub new {
1203 my ($self) = @_; 1387 my $class = shift;
1204 1388
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
1206 1390 vertical => 1,
1207 ( 1391 @_,
1208 (List::Util::max map $_->[0], @alloc),
1209 (List::Util::sum map $_->[1], @alloc),
1210 ) 1392 )
1211} 1393}
1212 1394
1213sub size_allocate {
1214 my ($self, $w, $h) = @_;
1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1395#############################################################################
1253 1396
1254package CFClient::UI::Label; 1397package CFClient::UI::Label;
1255 1398
1256our @ISA = CFClient::UI::Base::; 1399our @ISA = CFClient::UI::DrawBG::;
1257 1400
1258use CFClient::OpenGL; 1401use CFClient::OpenGL;
1259 1402
1260sub new { 1403sub new {
1261 my ($class, %arg) = @_; 1404 my ($class, %arg) = @_;
1262 1405
1263 my $self = $class->SUPER::new ( 1406 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1407 fg => [1, 1, 1],
1408 #bg => none
1409 #active_bg => none
1265 #font => default_font 1410 #font => default_font
1266 #text => initial text 1411 #text => initial text
1267 #markup => initial narkup 1412 #markup => initial narkup
1413 #max_w => maximum pixel width
1414 ellipsise => 3, # end
1268 layout => (new CFClient::Layout), 1415 layout => (new CFClient::Layout),
1269 fontsize => 1, 1416 fontsize => 1,
1270 align => -1, 1417 align => -1,
1271 valign => -1, 1418 valign => -1,
1272 padding => 2, 1419 padding => 2,
… …
1287 } 1434 }
1288 1435
1289 $self 1436 $self
1290} 1437}
1291 1438
1292sub escape { 1439sub escape($) {
1293 local $_ = $_[1]; 1440 local $_ = $_[0];
1294 1441
1295 s/&/&amp;/g; 1442 s/&/&amp;/g;
1296 s/>/&gt;/g; 1443 s/>/&gt;/g;
1297 s/</&lt;/g; 1444 s/</&lt;/g;
1298 1445
1299 $_[1] 1446 $_
1300} 1447}
1301 1448
1302sub update { 1449sub update {
1303 my ($self) = @_; 1450 my ($self) = @_;
1304 1451
… …
1337sub size_request { 1484sub size_request {
1338 my ($self) = @_; 1485 my ($self) = @_;
1339 1486
1340 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1487 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1); 1488 $self->{layout}->set_width ($self->{max_w} || -1);
1489 $self->{layout}->set_ellipsise ($self->{ellipsise});
1490 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1491 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1492
1344 my ($w, $h) = $self->{layout}->size; 1493 my ($w, $h) = $self->{layout}->size;
1345 1494
1346 if (exists $self->{template}) { 1495 if (exists $self->{template}) {
… …
1376} 1525}
1377 1526
1378sub _draw { 1527sub _draw {
1379 my ($self) = @_; 1528 my ($self) = @_;
1380 1529
1530 $self->SUPER::_draw; # draw background, if applicable
1531
1381 my $tex = $self->{texture} ||= do { 1532 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}}); 1533 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1534 $self->{layout}->set_font ($self->{font}) if $self->{font};
1384 $self->{layout}->set_width ($self->{w}); 1535 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386 1539
1387 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1540 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388 1541
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5; 1544 : ($self->{w} - $tex->{w}) * 0.5);
1392 1545
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5; 1548 : ($self->{h} - $tex->{h}) * 0.5);
1396 1549
1397 $tex 1550 $tex
1398 }; 1551 };
1399 1552
1400 glEnable GL_TEXTURE_2D; 1553 glEnable GL_TEXTURE_2D;
… …
1428 active_fg => [0, 0, 0], 1581 active_fg => [0, 0, 0],
1429 can_hover => 1, 1582 can_hover => 1,
1430 can_focus => 1, 1583 can_focus => 1,
1431 valign => 0, 1584 valign => 0,
1432 can_events => 1, 1585 can_events => 1,
1586 #text => ...
1433 @_ 1587 @_
1434 ) 1588 )
1435} 1589}
1436 1590
1437sub _set_text { 1591sub _set_text {
… …
1447 $self->{text} = $text; 1601 $self->{text} = $text;
1448 1602
1449 $text =~ s/./*/g if $self->{hidden}; 1603 $text =~ s/./*/g if $self->{hidden};
1450 $self->{layout}->set_text ("$text "); 1604 $self->{layout}->set_text ("$text ");
1451 1605
1452 $self->emit (changed => $self->{text}); 1606 $self->_emit (changed => $self->{text});
1453} 1607}
1454 1608
1455sub set_text { 1609sub set_text {
1456 my ($self, $text) = @_; 1610 my ($self, $text) = @_;
1457 1611
1458 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1459 $self->_set_text ($text); 1613 $self->_set_text ($text);
1614 $self->update;
1460 $self->check_size; 1615 $self->check_size;
1461 $self->update;
1462} 1616}
1463 1617
1464sub get_text { 1618sub get_text {
1465 $_[0]{text} 1619 $_[0]{text}
1466} 1620}
… …
1469 my ($self) = @_; 1623 my ($self) = @_;
1470 1624
1471 my ($w, $h) = $self->SUPER::size_request; 1625 my ($w, $h) = $self->SUPER::size_request;
1472 1626
1473 ($w + 1, $h) # add 1 for cursor 1627 ($w + 1, $h) # add 1 for cursor
1474}
1475
1476sub size_allocate {
1477 my ($self, $w, $h) = @_;
1478
1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480} 1628}
1481 1629
1482sub key_down { 1630sub key_down {
1483 my ($self, $ev) = @_; 1631 my ($self, $ev) = @_;
1484 1632
… …
1486 my $sym = $ev->{sym}; 1634 my $sym = $ev->{sym};
1487 my $uni = $ev->{unicode}; 1635 my $uni = $ev->{unicode};
1488 1636
1489 my $text = $self->get_text; 1637 my $text = $self->get_text;
1490 1638
1491 if ($sym == 8) { 1639 if ($uni == 8) {
1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1640 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493 } elsif ($sym == 127) { 1641 } elsif ($uni == 127) {
1494 substr $text, $self->{cursor}, 1, ""; 1642 substr $text, $self->{cursor}, 1, "";
1495 } elsif ($sym == CFClient::SDLK_LEFT) { 1643 } elsif ($sym == CFClient::SDLK_LEFT) {
1496 --$self->{cursor} if $self->{cursor}; 1644 --$self->{cursor} if $self->{cursor};
1497 } elsif ($sym == CFClient::SDLK_RIGHT) { 1645 } elsif ($sym == CFClient::SDLK_RIGHT) {
1498 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1646 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1499 } elsif ($sym == CFClient::SDLK_HOME) { 1647 } elsif ($sym == CFClient::SDLK_HOME) {
1500 $self->{cursor} = 0; 1648 $self->{cursor} = 0;
1501 } elsif ($sym == CFClient::SDLK_END) { 1649 } elsif ($sym == CFClient::SDLK_END) {
1502 $self->{cursor} = length $text; 1650 $self->{cursor} = length $text;
1503 } elsif ($sym == 27) { 1651 } elsif ($uni == 27) {
1504 $self->emit ('escape'); 1652 $self->_emit ('escape');
1505 } elsif ($uni) { 1653 } elsif ($uni) {
1506 substr $text, $self->{cursor}++, 0, chr $uni; 1654 substr $text, $self->{cursor}++, 0, chr $uni;
1507 } 1655 }
1508 1656
1509 $self->_set_text ($text); 1657 $self->_set_text ($text);
1510 $self->update; 1658 $self->update;
1659 $self->check_size;
1511} 1660}
1512 1661
1513sub focus_in { 1662sub focus_in {
1514 my ($self) = @_; 1663 my ($self) = @_;
1515 1664
… …
1595 if ($sym == 13) { 1744 if ($sym == 13) {
1596 unshift @{$self->{history}}, 1745 unshift @{$self->{history}},
1597 my $txt = $self->get_text; 1746 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1; 1747 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = ''; 1748 $self->{history_saveback} = '';
1600 $self->emit (activate => $txt); 1749 $self->_emit (activate => $txt);
1601 $self->update; 1750 $self->update;
1602 1751
1603 } elsif ($sym == CFClient::SDLK_UP) { 1752 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) { 1753 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text; 1754 $self->{history_saveback} = $self->get_text;
… …
1644 my $class = shift; 1793 my $class = shift;
1645 1794
1646 $class->SUPER::new ( 1795 $class->SUPER::new (
1647 padding => 4, 1796 padding => 4,
1648 fg => [1, 1, 1], 1797 fg => [1, 1, 1],
1649 bg => [1, 1, 1, 0.2],
1650 active_fg => [0, 0, 1], 1798 active_fg => [0, 0, 1],
1651 can_hover => 1, 1799 can_hover => 1,
1652 align => 0, 1800 align => 0,
1653 valign => 0, 1801 valign => 0,
1654 can_events => 1, 1802 can_events => 1,
1655 @_ 1803 @_
1656 ) 1804 )
1657} 1805}
1658 1806
1807sub activate { }
1808
1659sub button_up { 1809sub button_up {
1660 my ($self, $ev, $x, $y) = @_; 1810 my ($self, $ev, $x, $y) = @_;
1661 1811
1812 $self->emit ("activate")
1662 if ($x >= 0 && $x < $self->{w} 1813 if $x >= 0 && $x < $self->{w}
1663 && $y >= 0 && $y < $self->{h}) { 1814 && $y >= 0 && $y < $self->{h};
1664 $self->emit ("activate");
1665 }
1666} 1815}
1667 1816
1668sub _draw { 1817sub _draw {
1669 my ($self) = @_; 1818 my ($self) = @_;
1670 1819
… …
1702 1851
1703 $class->SUPER::new ( 1852 $class->SUPER::new (
1704 padding => 2, 1853 padding => 2,
1705 fg => [1, 1, 1], 1854 fg => [1, 1, 1],
1706 active_fg => [1, 1, 0], 1855 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5],
1707 state => 0, 1858 state => 0,
1708 can_hover => 1, 1859 can_hover => 1,
1709 @_ 1860 @_
1710 ) 1861 )
1711} 1862}
… …
1720 my ($self, $ev, $x, $y) = @_; 1871 my ($self, $ev, $x, $y) = @_;
1721 1872
1722 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1723 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1724 $self->{state} = !$self->{state}; 1875 $self->{state} = !$self->{state};
1725 $self->emit (changed => $self->{state}); 1876 $self->_emit (changed => $self->{state});
1726 } 1877 }
1727} 1878}
1728 1879
1729sub _draw { 1880sub _draw {
1730 my ($self) = @_; 1881 my ($self) = @_;
… …
1735 1886
1736 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1737 1888
1738 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1739 1890
1891 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892
1740 glEnable GL_TEXTURE_2D; 1893 glEnable GL_TEXTURE_2D;
1741
1742 my $tex = $self->{state} ? $tex[1] : $tex[0];
1743
1744 $tex->draw_quad_alpha (0, 0, $s, $s); 1894 $tex->draw_quad_alpha (0, 0, $s, $s);
1745
1746 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1747} 1896}
1748 1897
1749############################################################################# 1898#############################################################################
1750 1899
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2146 qw(s1_slider.png s1_slider_bg.png);
1998 2147
1999sub new { 2148sub new {
2000 my $class = shift; 2149 my $class = shift;
2001 2150
2002 # range [value, low, high, page] 2151 # range [value, low, high, page, unit]
2003 2152
2004 # TODO: 0-width page 2153 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2154 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2155 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2156 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2157 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2158 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2161 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2162 req_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2163 req_h => $::WIDTH / 80,
2013 vertical => 0, 2164 vertical => 0,
2014 can_hover => 1, 2165 can_hover => 1,
2015 inner_pad => 5, 2166 inner_pad => 0.02,
2016 @_ 2167 @_
2017 ); 2168 );
2018 2169
2170 $self->set_value ($self->{range}[0]);
2171 $self->update;
2172
2019 $self 2173 $self
2174}
2175
2176sub set_range {
2177 my ($self, $range) = @_;
2178
2179 ($range, $self->{range}) = ($self->{range}, $range);
2180
2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2183}
2184
2185sub set_value {
2186 my ($self, $value) = @_;
2187
2188 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2189
2190 $hi = $lo + 1 if $hi <= $lo;
2191
2192 $page = $hi - $lo if $page > $hi - $lo;
2193
2194 $value = $lo if $value < $lo;
2195 $value = $hi - $page if $value > $hi - $page;
2196
2197 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2198 if $unit;
2199
2200 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2201
2202 if ($value != $old_value) {
2203 $self->_emit (changed => $value);
2204 $self->update;
2205 }
2020} 2206}
2021 2207
2022sub size_request { 2208sub size_request {
2023 my ($self) = @_; 2209 my ($self) = @_;
2024 2210
… …
2030 2216
2031sub button_down { 2217sub button_down {
2032 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
2033 2219
2034 $self->SUPER::button_down ($ev, $x, $y); 2220 $self->SUPER::button_down ($ev, $x, $y);
2221
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223
2035 $self->mouse_motion ($ev, $x, $y); 2224 $self->mouse_motion ($ev, $x, $y);
2036} 2225}
2037 2226
2038sub mouse_motion { 2227sub mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2228 my ($self, $ev, $x, $y) = @_;
2040 2229
2041 if ($GRAB == $self) { 2230 if ($GRAB == $self) {
2231 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2232
2233 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236
2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2238 }
2239}
2240
2241sub update {
2242 my ($self) = @_;
2243
2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2245 $self->set_value ($self->{range}[0]);
2246
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2247 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100;
2043 2249
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2250 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2251
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2252 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2253 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2254
2049 $x -= $inner_pad_px; # substract the padding 2255 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2256 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2257
2055 $self->emit (changed => $x); 2258 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2259 $self->{knob_w} = $knob_w;
2057 } 2260 });
2058}
2059 2261
2060# the inner_* stuff is for generating a padding for the slider handle, 2262 $self->SUPER::update;
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066} 2263}
2067 2264
2068sub _draw { 2265sub _draw {
2069 my ($self) = @_; 2266 my ($self) = @_;
2070 2267
2071 $self->SUPER::_draw (); 2268 $self->SUPER::_draw ();
2072 2269
2073 my ($w, $h) = @$self{qw(w h)}; 2270 glScale $self->{w}, $self->{h};
2074 2271
2075 if ($self->{vertical}) { 2272 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2273 # draw a vertical slider like a rotated horizontal slider
2077 2274
2275 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2276 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2277 }
2083 2278
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2279 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2280 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2281
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
2106 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2107 2284
2108 # draw background 2285 # draw background
2109 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2286 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2110 2287
2111 # draw handle 2288 # draw handle
2112 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2289 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2113 2290
2114 glDisable GL_TEXTURE_2D; 2291 glDisable GL_TEXTURE_2D;
2115} 2292}
2293
2294#############################################################################
2295
2296package CFClient::UI::ValSlider;
2297
2298our @ISA = CFClient::UI::HBox::;
2299
2300sub new {
2301 my ($class, %arg) = @_;
2302
2303 my $range = delete $arg{range};
2304
2305 my $self = $class->SUPER::new (
2306 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2307 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2308 to_value => sub { shift },
2309 from_value => sub { shift },
2310 %arg,
2311 );
2312
2313 $self->{slider}->connect (changed => sub {
2314 my ($self, $value) = @_;
2315 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2316 $self->{parent}->emit (changed => $value);
2317 });
2318
2319# $self->{entry}->connect (changed => sub {
2320# my ($self, $value) = @_;
2321# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2322# $self->{parent}->emit (changed => $value);
2323# });
2324
2325 $self->add ($self->{slider}, $self->{entry});
2326
2327 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2328
2329 $self
2330}
2331
2332sub set_range { shift->{slider}->set_range (@_) }
2333sub set_value { shift->{slider}->set_value (@_) }
2116 2334
2117############################################################################# 2335#############################################################################
2118 2336
2119package CFClient::UI::TextView; 2337package CFClient::UI::TextView;
2120 2338
… …
2150 2368
2151 $self->{fontsize} = $fontsize; 2369 $self->{fontsize} = $fontsize;
2152 $self->reflow; 2370 $self->reflow;
2153} 2371}
2154 2372
2155sub text_height {
2156 my ($self, $text) = @_;
2157
2158 my $layout = $self->{layout};
2159
2160 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2161 $layout->set_width ($self->{children}[0]{w});
2162 $layout->set_markup ($text);
2163
2164 ($layout->size)[1]
2165}
2166
2167sub reflow {
2168 my ($self) = @_;
2169
2170 $self->{need_reflow}++;
2171 $self->update;
2172}
2173
2174sub size_allocate { 2373sub size_allocate {
2175 my ($self, $w, $h) = @_; 2374 my ($self, $w, $h) = @_;
2176 2375
2177 $self->SUPER::size_allocate ($w, $h); 2376 $self->SUPER::size_allocate ($w, $h);
2178 2377
… …
2181 $self->{layout}->set_width ($self->{children}[0]{w}); 2380 $self->{layout}->set_width ($self->{children}[0]{w});
2182 2381
2183 $self->reflow; 2382 $self->reflow;
2184} 2383}
2185 2384
2385sub text_size {
2386 my ($self, $text, $indent) = @_;
2387
2388 my $layout = $self->{layout};
2389
2390 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $layout->set_width ($self->{children}[0]{w} - $indent);
2392 $layout->set_markup ($text);
2393
2394 $layout->size
2395}
2396
2397sub reflow {
2398 my ($self) = @_;
2399
2400 $self->{need_reflow}++;
2401 $self->update;
2402}
2403
2404sub set_offset {
2405 my ($self, $offset) = @_;
2406
2407 # todo: base offset on lines or so, not on pixels
2408 $self->{children}[1]->set_value ($offset);
2409}
2410
2411sub clear {
2412 my ($self) = @_;
2413
2414 $self->{par} = [];
2415 $self->{height} = 0;
2416 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2417}
2418
2186sub add_paragraph { 2419sub add_paragraph {
2187 my ($self, $color, $text) = @_; 2420 my ($self, $color, $text, $indent) = @_;
2188 2421
2189 #TODO: intelligently "reformat" paragraph 2422 for my $line (split /\n/, $text) {
2190 2423 my ($w, $h) = $self->text_size ($line);
2191 my $height = $self->text_height ($text);
2192
2193 $self->{height} += $height; 2424 $self->{height} += $h;
2425 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2426 }
2194 2427
2195 push @{$self->{par}}, [$height, $color, $text];
2196
2197 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2428 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2198 $self->{children}[1]->update;
2199} 2429}
2200 2430
2201sub update { 2431sub update {
2202 my ($self) = @_; 2432 my ($self) = @_;
2203 2433
… …
2205 2435
2206 return unless $self->{h} > 0; 2436 return unless $self->{h} > 0;
2207 2437
2208 delete $self->{texture}; 2438 delete $self->{texture};
2209 2439
2210 $ROOT->on_refresh ($self, sub { 2440 $ROOT->on_post_alloc ($self, sub {
2441 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2442
2211 if (delete $self->{need_reflow}) { 2443 if (delete $self->{need_reflow}) {
2212 my $height = 0; 2444 my $height = 0;
2213 2445
2214 $height += $_->[0] = $self->text_height ($_->[2]) 2446 my $layout = $self->{layout};
2447
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449
2215 for @{$self->{par}}; 2450 for (@{$self->{par}}) {
2451 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2452 $layout->set_width ($W - $_->[3]);
2453 $layout->set_markup ($_->[4]);
2454 my ($w, $h) = $layout->size;
2455 $_->[0] = $w + $_->[3];
2456 $_->[1] = $h;
2457 }
2458
2459 $height += $_->[1];
2460 }
2216 2461
2217 $self->{height} = $height; 2462 $self->{height} = $height;
2218 2463
2219 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2464 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2220 2465
2221 delete $self->{texture}; 2466 delete $self->{texture};
2222 } 2467 }
2223 2468
2224 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2225 glClearColor 0, 0, 0, 0; 2470 glClearColor 0.5, 0.5, 0.5, 0;
2226 glClear GL_COLOR_BUFFER_BIT; 2471 glClear GL_COLOR_BUFFER_BIT;
2227 2472
2228 glEnable GL_TEXTURE_2D;
2229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231 my $top = int $self->{children}[1]{range}[0]; 2473 my $top = int $self->{children}[1]{range}[0];
2232 2474
2233 my $y0 = $top; 2475 my $y0 = $top;
2234 my $y1 = $top + $self->{h}; 2476 my $y1 = $top + $H;
2235 2477
2236 my $y = 0; 2478 my $y = 0;
2237 2479
2238 my $layout = $self->{layout}; 2480 my $layout = $self->{layout};
2239 2481
2240 $layout->set_font ($self->{font}) if $self->{font}; 2482 $layout->set_font ($self->{font}) if $self->{font};
2241 2483
2484 glEnable GL_BLEND;
2485 #TODO# not correct in windows where rgba is forced off
2486 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2487
2242 for my $par (@{$self->{par}}) { 2488 for my $par (@{$self->{par}}) {
2243 my $h = $par->[0]; 2489 my $h = $par->[1];
2244 2490
2245 if ($y0 < $y + $h && $y < $y1) { 2491 if ($y0 < $y + $h && $y < $y1) {
2246 $layout->set_foreground (@{ $par->[1] }); 2492 $layout->set_foreground (@{ $par->[2] });
2493 $layout->set_width ($W - $par->[3]);
2247 $layout->set_markup ($par->[2]); 2494 $layout->set_markup ($par->[4]);
2248 2495
2249 my ($W, $H) = $layout->size; 2496 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2250 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2497
2498 glRasterPos $par->[3], $y - $y0;
2499 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2251 } 2500 }
2252 2501
2253 $y += $h; 2502 $y += $h;
2254 } 2503 }
2255 2504
2256 glDisable GL_TEXTURE_2D; 2505 glDisable GL_BLEND;
2257 }; 2506 };
2258 }); 2507 });
2259} 2508}
2260 2509
2261sub _draw { 2510sub _draw {
2262 my ($self) = @_; 2511 my ($self) = @_;
2263 2512
2264 glEnable GL_TEXTURE_2D; 2513 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 1, 1, 1, 1; 2515 glColor 1, 1, 1, 1;
2267 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2516 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2268 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2269 2518
2270 $self->{children}[1]->draw; 2519 $self->{children}[1]->draw;
2271 2520
2272} 2521}
… …
2321 2570
2322sub new { 2571sub new {
2323 my $class = shift; 2572 my $class = shift;
2324 2573
2325 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2326 state => 0, 2575 state => 0,
2327 connect_activate => \&toggle_flopper, 2576 on_activate => \&toggle_flopper,
2328 @_ 2577 @_
2329 ); 2578 );
2330 2579
2331 if ($self->{state}) {
2332 $self->{state} = 0;
2333 $self->toggle_flopper;
2334 }
2335
2336 $self 2580 $self
2337} 2581}
2338 2582
2339sub toggle_flopper { 2583sub toggle_flopper {
2340 my ($self) = @_; 2584 my ($self) = @_;
2341 2585
2342 # TODO: use animation 2586 $self->{other}->toggle_visibility;
2343 if ($self->{state} = !$self->{state}) {
2344 $CFClient::UI::ROOT->add ($self->{other});
2345 $self->{other}->move ($self->coord2global (0, $self->{h}));
2346 $self->emit ("open");
2347 } else {
2348 $CFClient::UI::ROOT->remove ($self->{other});
2349 $self->emit ("close");
2350 }
2351
2352 $self->emit (changed => $self->{state});
2353} 2587}
2354 2588
2355############################################################################# 2589#############################################################################
2356 2590
2357package CFClient::UI::Tooltip; 2591package CFClient::UI::Tooltip;
… …
2367 @_, 2601 @_,
2368 can_events => 0, 2602 can_events => 0,
2369 ) 2603 )
2370} 2604}
2371 2605
2372sub set_markup { 2606sub set_tooltip_from {
2373 my ($self, $text, $font) = @_; 2607 my ($self, $widget) = @_;
2374 2608
2375 $self->{label} = new CFClient::UI::Label 2609 $self->add (new CFClient::UI::Label
2610 markup => $widget->{tooltip},
2611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2376 fontsize => 0.8, 2612 fontsize => 0.8,
2377 fg => [0, 0, 0], 2613 fg => [0, 0, 0, 1],
2614 ellipsise => 0,
2378 font => ($font || $::FONT_PROP); 2615 font => ($widget->{tooltip_font} || $::FONT_PROP),
2379 2616 );
2380 $self->{label}->set_max_size ($::WIDTH * 0.3);
2381 $self->{label}->set_markup ($text);
2382 $self->add ($self->{label});
2383} 2617}
2384 2618
2385sub size_request { 2619sub size_request {
2386 my ($self) = @_; 2620 my ($self) = @_;
2387 2621
… …
2397} 2631}
2398 2632
2399sub _draw { 2633sub _draw {
2400 my ($self) = @_; 2634 my ($self) = @_;
2401 2635
2402 glPushMatrix;
2403 glTranslate 0.375, 0.375; 2636 glTranslate 0.375, 0.375;
2404 2637
2405 my ($w, $h) = @$self{qw(w h)}; 2638 my ($w, $h) = @$self{qw(w h)};
2406 2639
2407 glColor 1, 0.8, 0.4; 2640 glColor 1, 0.8, 0.4;
… …
2418 glVertex 0 , $h; 2651 glVertex 0 , $h;
2419 glVertex $w, $h; 2652 glVertex $w, $h;
2420 glVertex $w, 0; 2653 glVertex $w, 0;
2421 glEnd; 2654 glEnd;
2422 2655
2423 glPopMatrix; 2656 glTranslate 2 - 0.375, 2 - 0.375;
2424
2425 glTranslate 2, 2;
2426 $self->SUPER::_draw; 2657 $self->SUPER::_draw;
2427} 2658}
2428 2659
2429############################################################################# 2660#############################################################################
2430 2661
… …
2435use CFClient::OpenGL; 2666use CFClient::OpenGL;
2436 2667
2437sub new { 2668sub new {
2438 my $class = shift; 2669 my $class = shift;
2439 2670
2440 $class->SUPER::new ( 2671 my $self = $class->SUPER::new (
2441 aspect => 1, 2672 aspect => 1,
2673 can_events => 0,
2442 @_, 2674 @_,
2443 ) 2675 );
2676
2677 if ($self->{anim} && $self->{animspeed}) {
2678 Scalar::Util::weaken (my $widget = $self);
2679
2680 $self->{timer} = Event->timer (
2681 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2682 hard => 1,
2683 interval => $self->{animspeed},
2684 cb => sub {
2685 ++$widget->{frame};
2686 $widget->update;
2687 },
2688 );
2689 }
2690
2691 $self
2444} 2692}
2445 2693
2446sub size_request { 2694sub size_request {
2447 (32, 8) 2695 (32, 8)
2448} 2696}
2449 2697
2698sub update {
2699 my ($self) = @_;
2700
2701 return unless $self->{visible};
2702
2703 $self->SUPER::update;
2704}
2705
2450sub _draw { 2706sub _draw {
2451 my ($self) = @_; 2707 my ($self) = @_;
2452 2708
2453 return unless $::CONN;#d# manage and cache textures differently 2709 return unless $::CONN;
2710
2711 my $face;
2712
2713 if ($self->{frame}) {
2714 my $anim = $::CONN->{anim}[$self->{anim}];
2715
2716 $face = $anim->[ $self->{frame} % @$anim ]
2717 if $anim && @$anim;
2718 }
2719
2454 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2720 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2455 2721
2456 # TODO animation
2457 if ($tex) { 2722 if ($tex) {
2458 glEnable GL_TEXTURE_2D; 2723 glEnable GL_TEXTURE_2D;
2459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2460 glColor 1, 1, 1, 1; 2725 glColor 1, 1, 1, 1;
2461 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2726 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2462 glDisable GL_TEXTURE_2D; 2727 glDisable GL_TEXTURE_2D;
2463 } 2728 }
2464} 2729}
2465 2730
2466############################################################################# 2731sub DESTROY {
2732 my ($self) = @_;
2467 2733
2734 $self->{timer}->cancel
2735 if $self->{timer};
2736
2737 $self->SUPER::DESTROY;
2738}
2739
2740#############################################################################
2741
2468package CFClient::UI::InventoryItem; 2742package CFClient::UI::Inventory;
2469 2743
2470our @ISA = CFClient::UI::HBox::; 2744our @ISA = CFClient::UI::ScrolledWindow::;
2471 2745
2472sub new { 2746sub new {
2473 my $class = shift; 2747 my $class = shift;
2474 2748
2475 my %args = @_;
2476
2477 my $item = delete $args{item};
2478
2479 my $desc = $item->{nrof} < 2
2480 ? $item->{name}
2481 : "$item->{nrof} $item->{name_pl}";
2482
2483
2484 my $self = $class->SUPER::new ( 2749 my $self = $class->SUPER::new (
2485 can_hover => 1, 2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2486 can_events => 1,
2487 tooltip => (CFClient::UI::Label->escape ($desc)
2488 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2489 connect_button_down => sub {
2490 my ($self, $ev, $x, $y) = @_;
2491
2492 # todo: maybe put examine on 1? but should just be a tooltip :(
2493 if ($ev->{button} == 1) {
2494 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2495 } elsif ($ev->{button} == 2) {
2496 $::CONN->send ("apply $item->{tag}");
2497 } elsif ($ev->{button} == 3) {
2498 CFClient::UI::Menu->new (
2499 items => [
2500 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2501 [
2502 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2503 sub { $::CONN->send ("lock $item->{tag}") },
2504 ],
2505 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2506 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2507 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2508 ],
2509 )->popup ($ev);
2510 }
2511
2512 1
2513 },
2514 %args
2515 );
2516
2517 $self->add (new CFClient::UI::Face
2518 can_events => 0,
2519 face => $item->{face},
2520 anim => $item->{anim},
2521 animspeed => $item->{animspeed},
2522 );
2523
2524 $self->add (new CFClient::UI::Label
2525 can_events => 0,
2526 text => $desc,
2527 );
2528
2529 $self
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Inventory;
2535
2536our @ISA = CFClient::UI::ScrolledWindow::;
2537
2538sub new {
2539 my $class = shift;
2540
2541 my $self = $class->SUPER::new (
2542 scrolled => (new CFClient::UI::VBox),
2543 @_, 2751 @_,
2544 ); 2752 );
2545 2753
2546 $self 2754 $self
2547} 2755}
… …
2550 my ($self, $items) = @_; 2758 my ($self, $items) = @_;
2551 2759
2552 $self->{scrolled}->clear; 2760 $self->{scrolled}->clear;
2553 return unless $items; 2761 return unless $items;
2554 2762
2555 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2763 my @items = sort {
2764 ($a->{type} <=> $b->{type})
2765 or ($a->{name} cmp $b->{name})
2766 } @$items;
2556 2767
2557 $self->{real_items} = \@items; 2768 $self->{real_items} = \@items;
2558 2769
2770 my $row = 0;
2559 for my $item (@items) { 2771 for my $item (@items) {
2560 my $desc = $item->{nrof} < 2 2772 CFClient::Item::update_widgets $item;
2561 ? $item->{name}
2562 : "$item->{nrof} $item->{name_pl}";
2563 2773
2564 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2565 } 2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2566 2777
2567# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2778 $row++;
2568} 2779 }
2569
2570sub size_request {
2571 my ($self) = @_;
2572 ($self->{req_w}, $self->{req_h});
2573} 2780}
2574 2781
2575############################################################################# 2782#############################################################################
2576 2783
2577package CFClient::UI::Menu; 2784package CFClient::UI::Menu;
… …
2612 2819
2613# popup given the event (must be a mouse button down event currently) 2820# popup given the event (must be a mouse button down event currently)
2614sub popup { 2821sub popup {
2615 my ($self, $ev) = @_; 2822 my ($self, $ev) = @_;
2616 2823
2617 $self->emit ("popdown"); 2824 $self->_emit ("popdown");
2618 2825
2619 # maybe save $GRAB? must be careful about events... 2826 # maybe save $GRAB? must be careful about events...
2620 $GRAB = $self; 2827 $GRAB = $self;
2621 $self->{button} = $ev->{button}; 2828 $self->{button} = $ev->{button};
2622 2829
… …
2637 2844
2638 if ($ev->{button} == $self->{button}) { 2845 if ($ev->{button} == $self->{button}) {
2639 undef $GRAB; 2846 undef $GRAB;
2640 $self->hide; 2847 $self->hide;
2641 2848
2642 $self->emit ("popdown"); 2849 $self->_emit ("popdown");
2643 $self->{hover}[1]->() if $self->{hover}; 2850 $self->{hover}[1]->() if $self->{hover};
2644 } 2851 }
2645} 2852}
2646 2853
2647############################################################################# 2854#############################################################################
2648 2855
2649package CFClient::UI::Statusbox; 2856package CFClient::UI::Statusbox;
2650 2857
2651our @ISA = CFClient::UI::VBox::; 2858our @ISA = CFClient::UI::VBox::;
2859
2860sub new {
2861 my $class = shift;
2862
2863 $class->SUPER::new (
2864 fontsize => 0.8,
2865 @_,
2866 )
2867}
2652 2868
2653sub reorder { 2869sub reorder {
2654 my ($self) = @_; 2870 my ($self) = @_;
2655 my $NOW = time; 2871 my $NOW = time;
2656 2872
2657 while (my ($k, $v) = each %{ $self->{item} }) { 2873 while (my ($k, $v) = each %{ $self->{item} }) {
2658 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2874 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2659 } 2875 }
2660 2876
2661 my @widgets; 2877 my @widgets;
2662 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2878
2879 my @items = sort {
2880 $a->{pri} <=> $b->{pri}
2881 or $b->{id} <=> $a->{id}
2882 } values %{ $self->{item} };
2883
2663 my $count = 10 + 1; 2884 my $count = 10 + 1;
2664 for my $item (@items) { 2885 for my $item (@items) {
2665 last unless --$count; 2886 last unless --$count;
2666 2887
2667 push @widgets, $item->{label} ||= do { 2888 push @widgets, $item->{label} ||= do {
2668 # TODO: doesn't handle markup well (read as: at all) 2889 # TODO: doesn't handle markup well (read as: at all)
2669 my $short = delete $item->{text}; 2890 my $short = $item->{count} > 1
2891 ? "<b>$item->{count} ×</b> $item->{text}"
2892 : $item->{text};
2893
2670 for ($short) { 2894 for ($short) {
2671 s/^\s+//; 2895 s/^\s+//;
2672 s/\012.*//s; 2896 s/\s+/ /g;
2673 my $len = int 30 / $item->{fontsize};
2674 substr $_, $len, length, "…" if $len < length;
2675 } 2897 }
2676 2898
2677 new CFClient::UI::Label 2899 new CFClient::UI::Label
2678 markup => $short, 2900 markup => $short,
2679 tooltip => delete $item->{tooltip}, 2901 tooltip => $item->{tooltip},
2680 fontsize => delete $item->{fontsize}, 2902 tooltip_font => $::FONT_PROP,
2681 color => delete $item->{color}, 2903 tooltip_width => 0.67,
2904 fontsize => $item->{fontsize} || $self->{fontsize},
2905 max_w => $::WIDTH * 0.44,
2906 fg => $item->{fg},
2682 can_events => 1, 2907 can_events => 1,
2683 can_hover => 1, 2908 can_hover => 1
2684 }; 2909 };
2685 } 2910 }
2686 2911
2687 $self->clear; 2912 $self->clear;
2688 $self->SUPER::add (@widgets); 2913 $self->SUPER::add (reverse @widgets);
2689} 2914}
2690 2915
2691sub add { 2916sub add {
2692 my ($self, $text, %arg) = @_; 2917 my ($self, $text, %arg) = @_;
2693 2918
2694 my $item = { 2919 $text =~ s/^\s+//;
2695 time => time, 2920 $text =~ s/\s+$//;
2921
2922 return unless $text;
2923
2924 my $timeout = time + ((delete $arg{timeout}) || 60);
2925
2926 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2927
2928 if (my $item = $self->{item}{$group}) {
2929 if ($item->{text} eq $text) {
2930 $item->{count}++;
2931 } else {
2932 $item->{count} = 1;
2933 $item->{text} = $item->{tooltip} = $text;
2934 }
2935 $item->{id} = ++$self->{id};
2936 $item->{timeout} = $timeout;
2937 delete $item->{label};
2938 } else {
2939 $self->{item}{$group} = {
2940 id => ++$self->{id},
2696 text => $text, 2941 text => $text,
2697 timeout => 60, 2942 timeout => $timeout,
2698 tooltip => $text, 2943 tooltip => $text,
2699 fontsize => 0.8,
2700 color => [0.8, 0.8, 0.8, 0.8], 2944 fg => [0.8, 0.8, 0.8, 0.8],
2945 pri => 0,
2946 count => 1,
2701 %arg, 2947 %arg,
2948 };
2702 }; 2949 }
2703
2704 $item->{timeout} += time;
2705 $item->{group} ||= $item+0;
2706
2707 $item = $self->{item}{$item->{group}} ||= $item;
2708 2950
2709 $self->reorder; 2951 $self->reorder;
2952}
2953
2954sub reconfigure {
2955 my ($self) = @_;
2956
2957 delete $_->{label}
2958 for values %{ $self->{item} || {} };
2959
2960 $self->reorder;
2961 $self->SUPER::reconfigure;
2710} 2962}
2711 2963
2712############################################################################# 2964#############################################################################
2713 2965
2714package CFClient::UI::Root; 2966package CFClient::UI::Root;
… …
2719 2971
2720sub new { 2972sub new {
2721 my $class = shift; 2973 my $class = shift;
2722 2974
2723 $class->SUPER::new ( 2975 $class->SUPER::new (
2976 visible => 1,
2724 @_, 2977 @_,
2725 ) 2978 )
2726} 2979}
2727 2980
2728sub configure { 2981sub configure {
… …
2746} 2999}
2747 3000
2748sub size_allocate { 3001sub size_allocate {
2749 my ($self, $w, $h) = @_; 3002 my ($self, $w, $h) = @_;
2750 3003
2751 my $old_w = $self->{old_w};
2752 my $old_h = $self->{old_h};
2753
2754 if ($old_w && $old_h) {
2755 for my $child ($self->children) {
2756 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2757 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2758 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2759 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2760 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2761 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2762 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2763 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2764 }
2765 }
2766
2767 for my $child ($self->children) { 3004 for my $child ($self->children) {
2768 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2769 3006
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3008 if exists $child->{req_x};
3009
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3011 if exists $child->{req_y};
3012
3013 delete @$child{qw(req_x req_y)};
3014
2770 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2771 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017
2772 $child->configure ($X, $Y, $W, $H); 3018 $child->configure ($X, $Y, $W, $H);
2773 } 3019 }
2774
2775 $self->{old_w} = $w;
2776 $self->{old_h} = $h;
2777} 3020}
2778 3021
2779sub coord2local { 3022sub coord2local {
2780 my ($self, $x, $y) = @_; 3023 my ($self, $x, $y) = @_;
2781 3024
… …
2794 $self->check_size; 3037 $self->check_size;
2795 $::WANT_REFRESH++; 3038 $::WANT_REFRESH++;
2796} 3039}
2797 3040
2798sub add { 3041sub add {
2799 my ($self, $child) = @_; 3042 my ($self, @children) = @_;
2800 3043
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1;
3046
2801 # integerise window positions 3047 # integerise window positions
2802 $child->{x} = int $child->{x}; 3048 $child->{x} = int $child->{x};
2803 $child->{y} = int $child->{y}; 3049 $child->{y} = int $child->{y};
3050 }
2804 3051
2805 $self->SUPER::add ($child); 3052 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3059}
3060
3061sub remove {
3062 my ($self, @children) = @_;
3063
3064 $self->SUPER::remove (@children);
3065
3066 while (@children) {
3067 my $w = pop @children;
3068 push @children, $w->children;
3069 $w->set_invisible;
3070 }
2806} 3071}
2807 3072
2808sub on_refresh { 3073sub on_refresh {
2809 my ($self, $id, $cb) = @_; 3074 my ($self, $id, $cb) = @_;
2810 3075
2811 $self->{refresh_hook}{$id} = $cb; 3076 $self->{refresh_hook}{$id} = $cb;
2812} 3077}
2813 3078
3079sub on_post_alloc {
3080 my ($self, $id, $cb) = @_;
3081
3082 $self->{post_alloc_hook}{$id} = $cb;
3083}
3084
2814sub draw { 3085sub draw {
2815 my ($self) = @_; 3086 my ($self) = @_;
2816 3087
3088 while ($self->{refresh_hook}) {
3089 $_->()
3090 for values %{delete $self->{refresh_hook}};
3091 }
3092
2817 if ($self->{check_size}) { 3093 if ($self->{check_size}) {
2818 my @queue = ([], []); 3094 my @queue;
2819 3095
2820 for (;;) { 3096 for (;;) {
2821 if ($self->{check_size}) { 3097 if ($self->{check_size}) {
2822 # heuristic: check containers last 3098 #TODO use array-of-depth approach
2823 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3099
3100 @queue = sort { $a->{visible} <=> $b->{visible} }
2824 for values %{delete $self->{check_size}} 3101 @queue, values %{delete $self->{check_size}};
2825 } 3102 }
2826 3103
2827 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3104 my $widget = pop @queue || last;
2828 3105
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
2829 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2830 ? @$widget{qw(user_w user_h)} 3109 ? @$widget{qw(def_w def_h)}
2831 : $widget->size_request; 3110 : $widget->size_request;
2832 3111
3112 if (delete $widget->{force_alloc}
2833 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2834 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2835 3115
2836 $widget->{req_w} = $w; 3116 $widget->{req_w} = $w;
2837 $widget->{req_h} = $h; 3117 $widget->{req_h} = $h;
2838 3118
2839 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2840 3120
2841 $widget->{parent}->check_size 3121 $widget->{parent}->check_size
2842 if $widget->{parent}; 3122 if $widget->{parent};
2843 } 3123 }
2844 } 3124 }
… …
2851 $w = 0 if $w < 0; 3131 $w = 0 if $w < 0;
2852 $h = 0 if $h < 0; 3132 $h = 0 if $h < 0;
2853 3133
2854 $widget->{w} = $w; 3134 $widget->{w} = $w;
2855 $widget->{h} = $h; 3135 $widget->{h} = $h;
2856 $widget->size_allocate ($w, $h);
2857 $widget->emit (size_allocate => $w, $h); 3136 $widget->emit (size_allocate => $w, $h);
2858 } 3137 }
2859 } 3138 }
2860 3139
2861 while ($self->{refresh_hook}) { 3140 while ($self->{post_alloc_hook}) {
2862 $_->() 3141 $_->()
2863 for values %{delete $self->{refresh_hook}}; 3142 for values %{delete $self->{post_alloc_hook}};
2864 } 3143 }
2865 3144
2866 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3145 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2867 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3146 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2868 glClear GL_COLOR_BUFFER_BIT; 3147 glClear GL_COLOR_BUFFER_BIT;
2869 3148
2870 glMatrixMode GL_PROJECTION; 3149 glMatrixMode GL_PROJECTION;
2871 glLoadIdentity; 3150 glLoadIdentity;
2872 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3151 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2873 glMatrixMode GL_MODELVIEW; 3152 glMatrixMode GL_MODELVIEW;
2874 glLoadIdentity; 3153 glLoadIdentity;
2875 3154
2876 $self->_draw; 3155 $self->_draw;
2877} 3156}
… …
2879############################################################################# 3158#############################################################################
2880 3159
2881package CFClient::UI; 3160package CFClient::UI;
2882 3161
2883$ROOT = new CFClient::UI::Root; 3162$ROOT = new CFClient::UI::Root;
2884$TOOLTIP = new CFClient::UI::Tooltip; 3163$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2885 3164
28861 31651
2887 3166

Diff Legend

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