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

Diff Legend

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