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

Diff Legend

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