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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $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}
15 38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
23 46
24 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
25 48
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 50
28 $TOOLTIP->set_markup ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29
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->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
185 }
186 }
187
188 reconfigure_widgets;
136} 189}
137 190
138############################################################################# 191#############################################################################
139 192
140package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
153 can_events => 1, 206 can_events => 1,
154 @_ 207 @_
155 }, $class; 208 }, $class;
156 209
157 for (keys %$self) { 210 for (keys %$self) {
158 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
160 } 213 }
161 } 214 }
162 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
163 $self 225 $self
164} 226}
165 227
166sub destroy { 228sub destroy {
167 my ($self) = @_; 229 my ($self) = @_;
… …
170 %$self = (); 232 %$self = ();
171} 233}
172 234
173sub show { 235sub show {
174 my ($self) = @_; 236 my ($self) = @_;
175
176 return if $self->{parent}; 237 return if $self->{parent};
177 238
178 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
179} 240}
180 241
181sub hide { 242sub show_centered {
182 my ($self) = @_; 243 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247
248 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 },
252 );
253}
254
255sub set_invisible {
256 my ($self) = @_;
257
258 return unless $self->{visible};
259
260 # broken show/hide model
261
262 delete $self->{root};
263 delete $self->{visible};
183 264
184 undef $GRAB if $GRAB == $self; 265 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 266 undef $HOVER if $HOVER == $self;
267
268 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self;
270
271 $self->focus_out;
272
273 $self->emit (visibility_change => 0);
274}
275
276sub hide {
277 my ($self) = @_;
278
279 $self->set_invisible;
186 280
187 $self->{parent}->remove ($self) 281 $self->{parent}->remove ($self)
188 if $self->{parent}; 282 if $self->{parent};
189} 283}
190 284
… …
240 334
241sub size_allocate { 335sub size_allocate {
242 # nothing to be done 336 # nothing to be done
243} 337}
244 338
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
245sub children { 346sub 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} 347}
259 348
260sub set_max_size { 349sub set_max_size {
261 my ($self, $w, $h) = @_; 350 my ($self, $w, $h) = @_;
262 351
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 352 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 353 delete $self->{max_h}; $self->{max_h} = $h if $h;
354}
355
356sub set_tooltip {
357 my ($self, $tooltip) = @_;
358
359 $tooltip =~ s/^\s+//;
360 $tooltip =~ s/\s+$//;
361
362 return if $self->{tooltip} eq $tooltip;
363
364 $self->{tooltip} = $tooltip;
365
366 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
367 delete $CFClient::UI::TOOLTIP->{owner};
368 CFClient::UI::check_tooltip;
369 }
265} 370}
266 371
267# translate global coordinates to local coordinate system 372# translate global coordinates to local coordinate system
268sub coord2local { 373sub coord2local {
269 my ($self, $x, $y) = @_; 374 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 389 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 390 return unless $self->{can_focus};
286 391
287 my $focus = $FOCUS; $FOCUS = $self; 392 my $focus = $FOCUS; $FOCUS = $self;
288 393
289 $self->emit (focus_in => $focus); 394 $self->_emit (focus_in => $focus);
290 395
291 $focus->update if $focus; 396 $focus->update if $focus;
292 $FOCUS->update; 397 $FOCUS->update;
293} 398}
294 399
… …
297 402
298 return unless $FOCUS == $self; 403 return unless $FOCUS == $self;
299 404
300 my $focus = $FOCUS; undef $FOCUS; 405 my $focus = $FOCUS; undef $FOCUS;
301 406
302 $self->emit (focus_out => $focus); 407 $self->_emit (focus_out => $focus);
303 408
304 $focus->update if $focus; #? 409 $focus->update if $focus; #?
410
411 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
412 unless $FOCUS;
305} 413}
306 414
307sub mouse_motion { } 415sub mouse_motion { }
308sub button_up { } 416sub button_up { }
309sub key_down { } 417sub key_down { }
310sub key_up { } 418sub key_up { }
311 419
312sub button_down { 420sub button_down {
313 my ($self, $ev, $x, $y) = @_; 421 my ($self, $ev, $x, $y) = @_;
314 422
315 $self->focus_in; 423 $self->focus_in;
… …
349 if ($ENV{PCLIENT_DEBUG}) { 457 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix; 458 glPushMatrix;
351 glColor 1, 1, 0, 1; 459 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 461 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 462 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 463 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 464 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 465 glVertex 0 , $self->{h} - 1;
358 glEnd; 466 glEnd;
359 glPopMatrix; 467 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 468 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 469 }
362} 470}
363 471
364sub _draw { 472sub _draw {
365 my ($self) = @_; 473 my ($self) = @_;
… …
382sub set_parent { 490sub set_parent {
383 my ($self, $parent) = @_; 491 my ($self, $parent) = @_;
384 492
385 Scalar::Util::weaken ($self->{parent} = $parent); 493 Scalar::Util::weaken ($self->{parent} = $parent);
386 494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
387 $self->check_size 504 $self->check_size
388 unless exists $self->{req_w}; 505 unless exists $self->{req_w};
506
507 $self->show;
389} 508}
390 509
391sub check_size { 510sub check_size {
392 my ($self) = @_; 511 my ($self, $forced) = @_;
393 512
513 $self->{force_alloc} = 1 if $forced;
394 $CFClient::UI::ROOT->{check_size}{$self} = $self; 514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395} 515}
396 516
397sub update { 517sub update {
398 my ($self) = @_; 518 my ($self) = @_;
… …
405 my ($self, $signal, $cb) = @_; 525 my ($self, $signal, $cb) = @_;
406 526
407 push @{ $self->{signal_cb}{$signal} }, $cb; 527 push @{ $self->{signal_cb}{$signal} }, $cb;
408} 528}
409 529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
410sub emit { 536sub emit {
411 my ($self, $signal, @args) = @_; 537 my ($self, $signal, @args) = @_;
412 538
413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
414} 545}
415 546
416sub DESTROY { 547sub DESTROY {
417 my ($self) = @_; 548 my ($self) = @_;
418 549
550 delete $WIDGET{$self+0};
419 #$self->deactivate; 551 #$self->deactivate;
420} 552}
421 553
422############################################################################# 554#############################################################################
423 555
… …
432 my $class = shift; 564 my $class = shift;
433 565
434 # range [value, low, high, page] 566 # range [value, low, high, page]
435 567
436 $class->SUPER::new ( 568 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 569 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 570 #active_bg => [1, 1, 1, 0.5],
439 @_ 571 @_
440 ) 572 )
441} 573}
442 574
443sub _draw { 575sub _draw {
444 my ($self) = @_; 576 my ($self) = @_;
445 577
578 my $color = $FOCUS == $self && $self->{active_bg}
579 ? $self->{active_bg}
580 : $self->{bg};
581
582 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 583 my ($w, $h) = @$self{qw(w h)};
447 584
448 glEnable GL_BLEND; 585 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 587 glColor @$color;
451 588
452 glBegin GL_QUADS; 589 glBegin GL_QUADS;
453 glVertex 0 , 0; 590 glVertex 0 , 0;
454 glVertex 0 , $h; 591 glVertex 0 , $h;
455 glVertex $w, $h; 592 glVertex $w, $h;
456 glVertex $w, 0; 593 glVertex $w, 0;
457 glEnd; 594 glEnd;
458 595
459 glDisable GL_BLEND; 596 glDisable GL_BLEND;
597 }
460} 598}
461 599
462############################################################################# 600#############################################################################
463 601
464package CFClient::UI::Empty; 602package CFClient::UI::Empty;
… …
508 $self->{children} = [ 646 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 647 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 648 @{$self->{children}}, @widgets
511 ]; 649 ];
512 650
513 $self->check_size; 651 $self->check_size (1);
514 $self->update; 652 $self->update;
515} 653}
516 654
517sub children { 655sub children {
518 @{ $_[0]{children} } 656 @{ $_[0]{children} }
… …
524 delete $child->{parent}; 662 delete $child->{parent};
525 $child->hide; 663 $child->hide;
526 664
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 666
529 $self->check_size; 667 $self->check_size (1);
530 $self->update; 668 $self->update;
531} 669}
532 670
533sub clear { 671sub clear {
534 my ($self) = @_; 672 my ($self) = @_;
… …
625} 763}
626 764
627sub update { 765sub update {
628 my ($self) = @_; 766 my ($self) = @_;
629 767
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 768 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 769 $self->SUPER::update;
632} 770}
633 771
634sub size_allocate { 772sub size_allocate {
635 my ($self, $w, $h) = @_; 773 my ($self, $w, $h) = @_;
… …
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 786 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 787 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 788 glClear GL_COLOR_BUFFER_BIT;
651 789
652 $self->_render; 790 $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 }; 791 };
661} 792}
662 793
663sub _draw { 794sub _draw {
664 my ($self) = @_; 795 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 797 my ($w, $h) = ($self->w, $self->h);
667 798
668 my $tex = $self->{texture} 799 my $tex = $self->{texture}
669 or return; 800 or return;
670 801
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 802 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 804 glColor 1, 1, 1, 1;
676 805
677 $tex->draw_quad (0, 0, $w, $h); 806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 807
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 808 glDisable GL_TEXTURE_2D;
681} 809}
682 810
683############################################################################# 811#############################################################################
684 812
685package CFClient::UI::ViewPort; 813package CFClient::UI::ViewPort;
686 814
687our @ISA = CFClient::UI::Window::; 815our @ISA = CFClient::UI::Window::;
688 816
817sub new {
818 my $class = shift;
819
820 $class->SUPER::new (
821 scroll_x => 0,
822 scroll_y => 1,
823 @_,
824 )
825}
826
689sub size_request { 827sub size_request {
690 my ($self) = @_; 828 my ($self) = @_;
691 829
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 831
695 @$self{qw(child_w child_h)} 832 @$self{qw(child_w child_h)}
696} 833}
697 834
698sub size_allocate { 835sub size_allocate {
699 my ($self, $w, $h) = @_; 836 my ($self, $w, $h) = @_;
700 837
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
840
841 $self->child->configure (0, 0, $w, $h);
701 $self->update; 842 $self->update;
702} 843}
703 844
704sub set_offset { 845sub set_offset {
705 my ($self, $x, $y) = @_; 846 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 897 my $class = shift;
757 898
758 my $self; 899 my $self;
759 900
760 my $slider = new CFClient::UI::Slider 901 my $slider = new CFClient::UI::Slider
761 vertical => 1, 902 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 903 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 904 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 905 $self->{vp}->set_offset (0, $_[1]);
765 }, 906 },
766 ; 907 ;
767 908
768 $self = $class->SUPER::new ( 909 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 910 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 911 slider => $slider,
771 @_, 912 @_,
772 ); 913 );
773 914
774 $self->{vp}->add ($self->{scrolled}); 915 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 917 $self->add ($self->{slider});
777 918
778 $self 919 $self
779} 920}
780 921
922sub update {
923 my ($self) = @_;
924
925 $self->SUPER::update;
926
927 # todo: overwrite size_allocate of child
928 my $child = $self->{vp}->child;
929 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
930}
931
932sub size_allocate {
933 my ($self, $w, $h) = @_;
934
935 $self->SUPER::size_allocate ($w, $h);
936
937 my $child = $self->{vp}->child;
938 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
939}
940
781#TODO# update range on size_allocate depeneing on child 941#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 942# update viewport offset on scroll
783 943
784############################################################################# 944#############################################################################
785 945
786package CFClient::UI::Frame; 946package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 950use CFClient::OpenGL;
791 951
792sub new { 952sub new {
793 my $class = shift; 953 my $class = shift;
794 954
795 my $self = $class->SUPER::new ( 955 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 956 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 957 @_,
800 ); 958 )
801
802 $self
803} 959}
804 960
805sub _draw { 961sub _draw {
806 my ($self) = @_; 962 my ($self) = @_;
807 963
808 my ($w, $h) = ($self->{w}, $self->{h}); 964 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)};
809 966
810 glEnable GL_BLEND; 967 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 969 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 970
815# glBegin GL_QUADS; 971 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 972 glVertex 0 , 0;
818# glVertex 0 , $h; 973 glVertex 0 , $h;
819# glVertex $w, $h; 974 glVertex $w, $h;
820# glVertex $w, 0; 975 glVertex $w, 0;
821# glEnd; 976 glEnd;
822 977
823
824 $self->child->draw;
825 glDisable GL_BLEND; 978 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 979 }
980
981 $self->SUPER::_draw;
827} 982}
828 983
829############################################################################# 984#############################################################################
830 985
831package CFClient::UI::FancyFrame; 986package CFClient::UI::FancyFrame;
… …
842 my $class = shift; 997 my $class = shift;
843 998
844 # TODO: user_x, user_y, overwrite moveto? 999 # TODO: user_x, user_y, overwrite moveto?
845 1000
846 my $self = $class->SUPER::new ( 1001 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 1002 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 1003 border_bg => [1, 1, 1, 1],
849 border => 0.6, 1004 border => 0.6,
1005 is_toplevel => 1,
850 can_events => 1, 1006 can_events => 1,
851 @_ 1007 @_
852 ); 1008 );
853 1009
854 $self->{title} &&= new CFClient::UI::Label 1010 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 1011 align => 0,
… …
879 my ($self, $w, $h) = @_; 1035 my ($self, $w, $h) = @_;
880 1036
881 $h -= List::Util::max 0, $self->border * 2; 1037 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1038 $w -= List::Util::max 0, $self->border * 2;
883 1039
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1040 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
885 if $self->{title}; 1041 if $self->{title};
886 1042
887 $self->child->configure ($self->border, $self->border, $w, $h); 1043 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1044}
889 1045
… …
908 my ($ev, $x, $y) = @_; 1064 my ($ev, $x, $y) = @_;
909 1065
910 my $dx = $ev->{x} - $ox; 1066 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1067 my $dy = $ev->{y} - $oy;
912 1068
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1073 $self->move ($self->{user_x}, $self->{user_y});
916 $self->check_size; 1074 $self->check_size;
917 }; 1075 };
918 1076
919 } elsif ($lr ^ $td) { 1077 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1078 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
923 $self->{motion} = sub { 1081 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
925 1083
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1084 ($x, $y) = ($ev->{x}, $ev->{y});
927 1085
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1086 $self->{user_x} = $bx + $x - $ox;
1087 $self->{user_y} = $by + $y - $oy;
1088 $self->move ($self->{user_x}, $self->{user_y});
929 $self->update; 1089 $self->update;
930 }; 1090 };
931 } 1091 }
932} 1092}
933 1093
… …
947 my ($self) = @_; 1107 my ($self) = @_;
948 1108
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1109 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1111
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1112 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1114
957 my $border = $self->border; 1115 my $border = $self->border;
958 1116
959 glColor @{ $self->{border_bg} }; 1117 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1122
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1124 my $bg = $tex[0];
967 1125
968 # TODO: repeat texture not scale 1126 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 1130 glColor @{ $self->{bg} };
973 1131
974 $bg->{s} = $rep_x; 1132 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1133 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1134 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 }
978 1137
979 glDisable GL_TEXTURE_2D; 1138 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1139
983 $self->{title}->draw if $self->{title}; 1140 $self->{title}->draw if $self->{title};
984 1141
985 $self->child->draw; 1142 $self->child->draw;
986} 1143}
… …
998sub new { 1155sub new {
999 my $class = shift; 1156 my $class = shift;
1000 1157
1001 $class->SUPER::new ( 1158 $class->SUPER::new (
1002 col_expand => [], 1159 col_expand => [],
1003 @_ 1160 @_,
1004 ) 1161 )
1162}
1163
1164sub children {
1165 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1166}
1006 1167
1007sub add { 1168sub add {
1008 my ($self, $x, $y, $child) = @_; 1169 my ($self, $x, $y, $child) = @_;
1009 1170
1010 $child->set_parent ($self); 1171 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1172 $self->{children}[$y][$x] = $child;
1012 1173
1013 $child->check_size; 1174 $self->check_size (1);
1014} 1175}
1015 1176
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# TODO: move to container class maybe? send childs a signal on removal? 1177# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1178sub clear {
1022 my ($self) = @_; 1179 my ($self) = @_;
1023 1180
1024 my @children = $self->children; 1181 my @children = $self->children;
1025 delete $self->{children}; 1182 delete $self->{children};
… …
1027 for (@children) { 1184 for (@children) {
1028 delete $_->{parent}; 1185 delete $_->{parent};
1029 $_->hide; 1186 $_->hide;
1030 } 1187 }
1031 1188
1189 $self->check_size (1);
1032 $self->update; 1190 $self->update;
1033} 1191}
1034 1192
1035sub get_wh { 1193sub get_wh {
1036 my ($self) = @_; 1194 my ($self) = @_;
… …
1068sub size_allocate { 1226sub size_allocate {
1069 my ($self, $w, $h) = @_; 1227 my ($self, $w, $h) = @_;
1070 1228
1071 my ($ws, $hs) = $self->get_wh; 1229 my ($ws, $hs) = $self->get_wh;
1072 1230
1073 my $req_w = sum @$ws; 1231 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1232 my $req_h = (sum @$hs) || 1;
1075 1233
1076 # TODO: nicer code && do row_expand 1234 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1235 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1236 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1237 my $col_expand = (sum @col_expand) || 1;
… …
1253 1411
1254############################################################################# 1412#############################################################################
1255 1413
1256package CFClient::UI::Label; 1414package CFClient::UI::Label;
1257 1415
1258our @ISA = CFClient::UI::Base::; 1416our @ISA = CFClient::UI::DrawBG::;
1259 1417
1260use CFClient::OpenGL; 1418use CFClient::OpenGL;
1261 1419
1262sub new { 1420sub new {
1263 my ($class, %arg) = @_; 1421 my ($class, %arg) = @_;
1264 1422
1265 my $self = $class->SUPER::new ( 1423 my $self = $class->SUPER::new (
1266 fg => [1, 1, 1], 1424 fg => [1, 1, 1],
1425 #bg => none
1426 #active_bg => none
1267 #font => default_font 1427 #font => default_font
1428 #text => initial text
1429 #markup => initial narkup
1430 #max_w => maximum pixel width
1431 ellipsise => 3, # end
1432 layout => (new CFClient::Layout),
1268 fontsize => 1, 1433 fontsize => 1,
1269 text => "",
1270 align => -1, 1434 align => -1,
1271 valign => -1, 1435 valign => -1,
1272 padding => 2, 1436 padding => 2,
1273 layout => new CFClient::Layout,
1274 can_events => 0, 1437 can_events => 0,
1275 %arg 1438 %arg
1276 ); 1439 );
1277 1440
1278 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
1279 my $layout = new CFClient::Layout; 1442 my $layout = new CFClient::Layout;
1280 $layout->set_text (delete $self->{template}); 1443 $layout->set_text (delete $self->{template});
1281 $self->{template} = $layout; 1444 $self->{template} = $layout;
1282 } 1445 }
1283 1446
1284 $self->set_text (delete $self->{text}) if exists $self->{text}; 1447 if (exists $self->{markup}) {
1285 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1448 $self->set_markup (delete $self->{markup});
1449 } else {
1450 $self->set_text (delete $self->{text});
1451 }
1286 1452
1287 $self 1453 $self
1288} 1454}
1289 1455
1290sub escape { 1456sub escape($) {
1291 local $_ = $_[1]; 1457 local $_ = $_[0];
1292 1458
1293 s/&/&amp;/g; 1459 s/&/&amp;/g;
1294 s/>/&gt;/g; 1460 s/>/&gt;/g;
1295 s/</&lt;/g; 1461 s/</&lt;/g;
1296 1462
1297 $_[1] 1463 $_
1298} 1464}
1299 1465
1300sub update { 1466sub update {
1301 my ($self) = @_; 1467 my ($self) = @_;
1302 1468
… …
1308 my ($self, $text) = @_; 1474 my ($self, $text) = @_;
1309 1475
1310 return if $self->{text} eq "T$text"; 1476 return if $self->{text} eq "T$text";
1311 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1312 1478
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1313 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1314 1481
1315 $self->update; 1482 $self->update;
1316 $self->check_size; 1483 $self->check_size;
1317} 1484}
… …
1320 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1321 1488
1322 return if $self->{text} eq "M$markup"; 1489 return if $self->{text} eq "M$markup";
1323 $self->{text} = "M$markup"; 1490 $self->{text} = "M$markup";
1324 1491
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1325 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1326 1496
1327 $self->update; 1497 $self->update;
1328 $self->check_size; 1498 $self->check_size;
1329} 1499}
… …
1331sub size_request { 1501sub size_request {
1332 my ($self) = @_; 1502 my ($self) = @_;
1333 1503
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $self->{layout}->set_width ($self->{max_w} || -1); 1505 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1509
1338 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1339 1511
1340 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1370} 1542}
1371 1543
1372sub _draw { 1544sub _draw {
1373 my ($self) = @_; 1545 my ($self) = @_;
1374 1546
1547 $self->SUPER::_draw; # draw background, if applicable
1548
1375 my $tex = $self->{texture} ||= do { 1549 my $tex = $self->{texture} ||= do {
1550 $self->{layout}->set_foreground (@{$self->{fg}});
1376 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1551 $self->{layout}->set_font ($self->{font}) if $self->{font};
1377 $self->{layout}->set_width ($self->{w}); 1552 $self->{layout}->set_width ($self->{w});
1553 $self->{layout}->set_ellipsise ($self->{ellipsise});
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1378 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556
1379 new_from_layout CFClient::Texture $self->{layout} 1557 my $tex = new_from_layout CFClient::Texture $self->{layout};
1558
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1561 : ($self->{w} - $tex->{w}) * 0.5);
1562
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1565 : ($self->{h} - $tex->{h}) * 0.5);
1566
1567 $tex
1380 }; 1568 };
1381 1569
1382 glEnable GL_BLEND;
1383 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1384 glEnable GL_TEXTURE_2D; 1570 glEnable GL_TEXTURE_2D;
1385 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1386 1572
1573 if ($tex->{format} == GL_ALPHA) {
1387 glColor @{$self->{fg}}; 1574 glColor @{$self->{fg}};
1388
1389 $self->{ox} = int (
1390 $self->{align} < 0 ? $self->{padding}
1391 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1392 : ($self->{w} - $tex->{w}) * 0.5
1393 );
1394
1395 $self->{oy} = int (
1396 $self->{valign} < 0 ? $self->{padding}
1397 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1398 : ($self->{h} - $tex->{h}) * 0.5
1399 );
1400
1401 $tex->draw_quad ($self->{ox}, $self->{oy}); 1575 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1576 } else {
1577 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1578 }
1402 1579
1403 glDisable GL_TEXTURE_2D; 1580 glDisable GL_TEXTURE_2D;
1404 glDisable GL_BLEND;
1405} 1581}
1406 1582
1407############################################################################# 1583#############################################################################
1408 1584
1409package CFClient::UI::EntryBase; 1585package CFClient::UI::EntryBase;
… …
1422 active_fg => [0, 0, 0], 1598 active_fg => [0, 0, 0],
1423 can_hover => 1, 1599 can_hover => 1,
1424 can_focus => 1, 1600 can_focus => 1,
1425 valign => 0, 1601 valign => 0,
1426 can_events => 1, 1602 can_events => 1,
1603 #text => ...
1427 @_ 1604 @_
1428 ) 1605 )
1429} 1606}
1430 1607
1431sub _set_text { 1608sub _set_text {
… …
1441 $self->{text} = $text; 1618 $self->{text} = $text;
1442 1619
1443 $text =~ s/./*/g if $self->{hidden}; 1620 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1621 $self->{layout}->set_text ("$text ");
1445 1622
1446 $self->emit (changed => $self->{text}); 1623 $self->_emit (changed => $self->{text});
1447}
1448
1449sub get_text {
1450 $_[0]{text}
1451}
1452
1453sub size_request {
1454 my ($self) = @_;
1455
1456 my ($w, $h) = $self->SUPER::size_request;
1457
1458 ($w + 1, $h) # add 1 for cursor
1459}
1460
1461sub size_allocate {
1462 my ($self, $w, $h) = @_;
1463
1464 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1465} 1624}
1466 1625
1467sub set_text { 1626sub set_text {
1468 my ($self, $text) = @_; 1627 my ($self, $text) = @_;
1469 1628
1470 $self->{cursor} = length $text; 1629 $self->{cursor} = length $text;
1471 $self->_set_text ($text); 1630 $self->_set_text ($text);
1472 $self->update; 1631 $self->update;
1632 $self->check_size;
1633}
1634
1635sub get_text {
1636 $_[0]{text}
1637}
1638
1639sub size_request {
1640 my ($self) = @_;
1641
1642 my ($w, $h) = $self->SUPER::size_request;
1643
1644 ($w + 1, $h) # add 1 for cursor
1473} 1645}
1474 1646
1475sub key_down { 1647sub key_down {
1476 my ($self, $ev) = @_; 1648 my ($self, $ev) = @_;
1477 1649
… …
1479 my $sym = $ev->{sym}; 1651 my $sym = $ev->{sym};
1480 my $uni = $ev->{unicode}; 1652 my $uni = $ev->{unicode};
1481 1653
1482 my $text = $self->get_text; 1654 my $text = $self->get_text;
1483 1655
1484 if ($sym == 8) { 1656 if ($uni == 8) {
1485 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1657 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1486 } elsif ($sym == 127) { 1658 } elsif ($uni == 127) {
1487 substr $text, $self->{cursor}, 1, ""; 1659 substr $text, $self->{cursor}, 1, "";
1488 } elsif ($sym == CFClient::SDLK_LEFT) { 1660 } elsif ($sym == CFClient::SDLK_LEFT) {
1489 --$self->{cursor} if $self->{cursor}; 1661 --$self->{cursor} if $self->{cursor};
1490 } elsif ($sym == CFClient::SDLK_RIGHT) { 1662 } elsif ($sym == CFClient::SDLK_RIGHT) {
1491 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1663 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1492 } elsif ($sym == CFClient::SDLK_HOME) { 1664 } elsif ($sym == CFClient::SDLK_HOME) {
1493 $self->{cursor} = 0; 1665 $self->{cursor} = 0;
1494 } elsif ($sym == CFClient::SDLK_END) { 1666 } elsif ($sym == CFClient::SDLK_END) {
1495 $self->{cursor} = length $text; 1667 $self->{cursor} = length $text;
1496 } elsif ($sym == 27) { 1668 } elsif ($uni == 27) {
1497 $self->emit ('escape'); 1669 $self->_emit ('escape');
1498 } elsif ($uni) { 1670 } elsif ($uni) {
1499 substr $text, $self->{cursor}++, 0, chr $uni; 1671 substr $text, $self->{cursor}++, 0, chr $uni;
1500 } 1672 }
1501 1673
1502 $self->_set_text ($text); 1674 $self->_set_text ($text);
1503 $self->update; 1675 $self->update;
1676 $self->check_size;
1504} 1677}
1505 1678
1506sub focus_in { 1679sub focus_in {
1507 my ($self) = @_; 1680 my ($self) = @_;
1508 1681
… …
1588 if ($sym == 13) { 1761 if ($sym == 13) {
1589 unshift @{$self->{history}}, 1762 unshift @{$self->{history}},
1590 my $txt = $self->get_text; 1763 my $txt = $self->get_text;
1591 $self->{history_pointer} = -1; 1764 $self->{history_pointer} = -1;
1592 $self->{history_saveback} = ''; 1765 $self->{history_saveback} = '';
1593 $self->emit (activate => $txt); 1766 $self->_emit (activate => $txt);
1594 $self->update; 1767 $self->update;
1595 1768
1596 } elsif ($sym == CFClient::SDLK_UP) { 1769 } elsif ($sym == CFClient::SDLK_UP) {
1597 if ($self->{history_pointer} < 0) { 1770 if ($self->{history_pointer} < 0) {
1598 $self->{history_saveback} = $self->get_text; 1771 $self->{history_saveback} = $self->get_text;
… …
1637 my $class = shift; 1810 my $class = shift;
1638 1811
1639 $class->SUPER::new ( 1812 $class->SUPER::new (
1640 padding => 4, 1813 padding => 4,
1641 fg => [1, 1, 1], 1814 fg => [1, 1, 1],
1642 bg => [1, 1, 1, 0.2],
1643 active_fg => [0, 0, 1], 1815 active_fg => [0, 0, 1],
1644 can_hover => 1, 1816 can_hover => 1,
1645 align => 0, 1817 align => 0,
1646 valign => 0, 1818 valign => 0,
1647 can_events => 1, 1819 can_events => 1,
1648 @_ 1820 @_
1649 ) 1821 )
1650} 1822}
1651 1823
1824sub activate { }
1825
1652sub button_up { 1826sub button_up {
1653 my ($self, $ev, $x, $y) = @_; 1827 my ($self, $ev, $x, $y) = @_;
1654 1828
1829 $self->emit ("activate")
1655 if ($x >= 0 && $x < $self->{w} 1830 if $x >= 0 && $x < $self->{w}
1656 && $y >= 0 && $y < $self->{h}) { 1831 && $y >= 0 && $y < $self->{h};
1657 $self->emit ("activate");
1658 }
1659} 1832}
1660 1833
1661sub _draw { 1834sub _draw {
1662 my ($self) = @_; 1835 my ($self) = @_;
1663 1836
… …
1665 1838
1666 if ($GRAB == $self) { 1839 if ($GRAB == $self) {
1667 $self->{fg} = $self->{active_fg}; 1840 $self->{fg} = $self->{active_fg};
1668 } 1841 }
1669 1842
1670 glEnable GL_BLEND;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672 glEnable GL_TEXTURE_2D; 1843 glEnable GL_TEXTURE_2D;
1673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1674 glColor 0, 0, 0, 1; 1845 glColor 0, 0, 0, 1;
1675 1846
1676 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1847 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1677 1848
1678 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1679 glDisable GL_BLEND;
1680 1850
1681 $self->SUPER::_draw; 1851 $self->SUPER::_draw;
1682} 1852}
1683 1853
1684############################################################################# 1854#############################################################################
… …
1698 1868
1699 $class->SUPER::new ( 1869 $class->SUPER::new (
1700 padding => 2, 1870 padding => 2,
1701 fg => [1, 1, 1], 1871 fg => [1, 1, 1],
1702 active_fg => [1, 1, 0], 1872 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5],
1703 state => 0, 1875 state => 0,
1704 can_hover => 1, 1876 can_hover => 1,
1705 @_ 1877 @_
1706 ) 1878 )
1707} 1879}
… …
1716 my ($self, $ev, $x, $y) = @_; 1888 my ($self, $ev, $x, $y) = @_;
1717 1889
1718 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1719 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1720 $self->{state} = !$self->{state}; 1892 $self->{state} = !$self->{state};
1721 $self->emit (changed => $self->{state}); 1893 $self->_emit (changed => $self->{state});
1722 } 1894 }
1723} 1895}
1724 1896
1725sub _draw { 1897sub _draw {
1726 my ($self) = @_; 1898 my ($self) = @_;
… …
1731 1903
1732 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1904 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1733 1905
1734 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1735 1907
1736 glEnable GL_BLEND; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1737 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1739
1740 my $tex = $self->{state} ? $tex[1] : $tex[0];
1741
1742 $tex->draw_quad (0, 0, $s, $s); 1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1743
1744 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1745 glDisable GL_BLEND;
1746} 1913}
1747 1914
1748############################################################################# 1915#############################################################################
1749 1916
1750package CFClient::UI::Image; 1917package CFClient::UI::Image;
… …
1793 glTranslate 0, -$self->{w}, 0; 1960 glTranslate 0, -$self->{w}, 0;
1794 1961
1795 ($w, $h) = ($h, $w); 1962 ($w, $h) = ($h, $w);
1796 } 1963 }
1797 1964
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 1967
1803 $tex->draw_quad (0, 0, $w, $h); 1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1804 1969
1805 glDisable GL_BLEND;
1806 glDisable GL_TEXTURE_2D; 1970 glDisable GL_TEXTURE_2D;
1807} 1971}
1808 1972
1809############################################################################# 1973#############################################################################
1810 1974
… …
1999 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
2000 2164
2001sub new { 2165sub new {
2002 my $class = shift; 2166 my $class = shift;
2003 2167
2004 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
2005 2169
2006 # TODO: 0-width page 2170 # TODO: 0-width page
2007 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
2008 # TODO: calculations are off 2172 # TODO: calculations are off
2009 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2010 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2011 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5],
2012 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2013 req_w => $::WIDTH / 80, 2179 req_w => $::WIDTH / 80,
2014 req_h => $::WIDTH / 80, 2180 req_h => $::WIDTH / 80,
2015 vertical => 0, 2181 vertical => 0,
2016 can_hover => 1, 2182 can_hover => 1,
2017 inner_pad => 5, 2183 inner_pad => 0.02,
2018 @_ 2184 @_
2019 ); 2185 );
2020 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
2021 $self 2190 $self
2191}
2192
2193sub set_range {
2194 my ($self, $range) = @_;
2195
2196 ($range, $self->{range}) = ($self->{range}, $range);
2197
2198 $self->update
2199 if "@$range" ne "@{$self->{range}}";
2200}
2201
2202sub set_value {
2203 my ($self, $value) = @_;
2204
2205 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2206
2207 $hi = $lo + 1 if $hi <= $lo;
2208
2209 $page = $hi - $lo if $page > $hi - $lo;
2210
2211 $value = $lo if $value < $lo;
2212 $value = $hi - $page if $value > $hi - $page;
2213
2214 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2215 if $unit;
2216
2217 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2218
2219 if ($value != $old_value) {
2220 $self->_emit (changed => $value);
2221 $self->update;
2222 }
2022} 2223}
2023 2224
2024sub size_request { 2225sub size_request {
2025 my ($self) = @_; 2226 my ($self) = @_;
2026 2227
… …
2032 2233
2033sub button_down { 2234sub button_down {
2034 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2035 2236
2036 $self->SUPER::button_down ($ev, $x, $y); 2237 $self->SUPER::button_down ($ev, $x, $y);
2238
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240
2037 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2038} 2242}
2039 2243
2040sub mouse_motion { 2244sub mouse_motion {
2041 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2042 2246
2043 if ($GRAB == $self) { 2247 if ($GRAB == $self) {
2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2249
2250 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2255 }
2256}
2257
2258sub update {
2259 my ($self) = @_;
2260
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2262 $self->set_value ($self->{range}[0]);
2263
2044 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2045 2266
2046 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2047 2268
2048 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2049 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2050 2271
2051 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
2052 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
2053 $x = $lo if $x < $lo;
2054 $x = $hi - $page if $x > $hi - $page;
2055 $self->{range}[0] = $x;
2056 2274
2057 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2058 $self->update; 2276 $self->{knob_w} = $knob_w;
2059 } 2277 });
2060}
2061 2278
2062# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
2063# so that the handle doesn't leave the texture. This calculation isn't 100%
2064# correct propably, but it does the job for now
2065sub _calc_inner_pad_px {
2066 my ($self, $w) = @_;
2067 ($w / 100) * $self->{inner_pad} # % to pixels
2068} 2280}
2069 2281
2070sub _draw { 2282sub _draw {
2071 my ($self) = @_; 2283 my ($self) = @_;
2072 2284
2073 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
2074 2286
2075 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
2076 2288
2077 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
2078 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
2079 2291
2292 glTranslate 1, 0, 0;
2080 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
2081 glTranslate 0, -$self->{w}, 0;
2082
2083 ($w, $h) = ($h, $w);
2084 } 2294 }
2085 2295
2086 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2087 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2088 2298
2089 my ($value, $lo, $hi, $page) = @{$self->{range}};
2090
2091 $hi = $value + 1 if $lo == $hi;
2092
2093 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2094 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2095
2096 $page = int $page * $inner_w / ($hi - $lo);
2097 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2098
2099 $w -= $page;
2100 $page &= ~1;
2101 glTranslate $page * 0.5, 0, 0;
2102 $page ||= 2;
2103
2104 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2105 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2106
2107 glEnable GL_BLEND;
2108 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2109 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
2110 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2111 2301
2112 # draw background 2302 # draw background
2113 $tex[1]->draw_quad (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2114 2304
2115 # draw handle 2305 # draw handle
2116 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2306 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2117 2307
2118 glDisable GL_BLEND;
2119 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2120} 2309}
2310
2311#############################################################################
2312
2313package CFClient::UI::ValSlider;
2314
2315our @ISA = CFClient::UI::HBox::;
2316
2317sub new {
2318 my ($class, %arg) = @_;
2319
2320 my $range = delete $arg{range};
2321
2322 my $self = $class->SUPER::new (
2323 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2324 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2325 to_value => sub { shift },
2326 from_value => sub { shift },
2327 %arg,
2328 );
2329
2330 $self->{slider}->connect (changed => sub {
2331 my ($self, $value) = @_;
2332 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2333 $self->{parent}->emit (changed => $value);
2334 });
2335
2336# $self->{entry}->connect (changed => sub {
2337# my ($self, $value) = @_;
2338# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2339# $self->{parent}->emit (changed => $value);
2340# });
2341
2342 $self->add ($self->{slider}, $self->{entry});
2343
2344 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2345
2346 $self
2347}
2348
2349sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) }
2121 2351
2122############################################################################# 2352#############################################################################
2123 2353
2124package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2125 2355
… …
2134 fontsize => 1, 2364 fontsize => 1,
2135 can_events => 0, 2365 can_events => 0,
2136 #font => default_font 2366 #font => default_font
2137 @_, 2367 @_,
2138 2368
2139 layout => (new CFClient::Layout), 2369 layout => (new CFClient::Layout 1),
2140 par => [], 2370 par => [],
2141 height => 0, 2371 height => 0,
2142 children => [ 2372 children => [
2143 (new CFClient::UI::Empty expand => 1), 2373 (new CFClient::UI::Empty expand => 1),
2144 (new CFClient::UI::Slider vertical => 1), 2374 (new CFClient::UI::Slider vertical => 1),
… …
2155 2385
2156 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2157 $self->reflow; 2387 $self->reflow;
2158} 2388}
2159 2389
2160sub text_height {
2161 my ($self, $text) = @_;
2162
2163 my $layout = $self->{layout};
2164
2165 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2166 $layout->set_width ($self->{children}[0]{w});
2167 $layout->set_text ($text);
2168
2169 ($layout->size)[1]
2170}
2171
2172sub reflow {
2173 my ($self) = @_;
2174
2175 $self->{need_reflow}++;
2176 $self->update;
2177}
2178
2179sub size_allocate { 2390sub size_allocate {
2180 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2181 2392
2182 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2183 2394
… …
2186 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2187 2398
2188 $self->reflow; 2399 $self->reflow;
2189} 2400}
2190 2401
2402sub text_size {
2403 my ($self, $text, $indent) = @_;
2404
2405 my $layout = $self->{layout};
2406
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent);
2409 $layout->set_markup ($text);
2410
2411 $layout->size
2412}
2413
2414sub reflow {
2415 my ($self) = @_;
2416
2417 $self->{need_reflow}++;
2418 $self->update;
2419}
2420
2421sub set_offset {
2422 my ($self, $offset) = @_;
2423
2424 # todo: base offset on lines or so, not on pixels
2425 $self->{children}[1]->set_value ($offset);
2426}
2427
2428sub clear {
2429 my ($self) = @_;
2430
2431 $self->{par} = [];
2432 $self->{height} = 0;
2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2434}
2435
2191sub add_paragraph { 2436sub add_paragraph {
2192 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2193 2438
2194 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2195 2440 my ($w, $h) = $self->text_size ($line);
2196 my $height = $self->text_height ($text);
2197
2198 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2199 2444
2200 push @{$self->{par}}, [$height, $color, $text];
2201
2202 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2203 $self->{children}[1]->update;
2204} 2446}
2205 2447
2206sub update { 2448sub update {
2207 my ($self) = @_; 2449 my ($self) = @_;
2208 2450
… …
2210 2452
2211 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2212 2454
2213 delete $self->{texture}; 2455 delete $self->{texture};
2214 2456
2215 $ROOT->on_refresh ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2216 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2217 my $height = 0; 2461 my $height = 0;
2218 2462
2219 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2220 for @{$self->{par}}; 2467 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]);
2470 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h;
2474 }
2475
2476 $height += $_->[1];
2477 }
2221 2478
2222 $self->{height} = $height; 2479 $self->{height} = $height;
2223 2480
2224 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2225 2482
2226 delete $self->{texture}; 2483 delete $self->{texture};
2227 } 2484 }
2228 2485
2229 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2230 glClearColor 0, 0, 0, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2231 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2232 2489
2490 my $top = int $self->{children}[1]{range}[0];
2491
2492 my $y0 = $top;
2493 my $y1 = $top + $H;
2494
2495 my $y = 0;
2496
2497 my $layout = $self->{layout};
2498
2499 $layout->set_font ($self->{font}) if $self->{font};
2500
2233 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2234 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2235 glEnable GL_TEXTURE_2D;
2236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2237
2238 my $top = int $self->{children}[1]{range}[0];
2239
2240 my $y0 = $top;
2241 my $y1 = $top + $self->{h};
2242
2243 my $y = 0;
2244
2245 my $layout = $self->{layout};
2246
2247 $layout->set_font ($self->{font}) if $self->{font};
2248 2504
2249 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2250 my $h = $par->[0]; 2506 my $h = $par->[1];
2251 2507
2252 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2253 $layout->set_text ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2254 2512
2255 glColor @{ $par->[1] }; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2256 my ($W, $H) = $layout->size; 2514
2257 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2515 glRasterPos $par->[3], $y - $y0;
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2258 } 2517 }
2259 2518
2260 $y += $h; 2519 $y += $h;
2261 } 2520 }
2262 2521
2263 glDisable GL_TEXTURE_2D;
2264 glDisable GL_BLEND; 2522 glDisable GL_BLEND;
2265 }; 2523 };
2266 }); 2524 });
2267} 2525}
2268 2526
2269sub _draw { 2527sub _draw {
2270 my ($self) = @_; 2528 my ($self) = @_;
2271 2529
2272 glEnable GL_BLEND;
2273 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2274 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2276 glColor 1, 1, 1, 1; 2532 glColor 1, 1, 1, 1;
2277 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2278 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2279 glDisable GL_BLEND;
2280 2535
2281 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2282 2537
2283} 2538}
2284 2539
… …
2332 2587
2333sub new { 2588sub new {
2334 my $class = shift; 2589 my $class = shift;
2335 2590
2336 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2337 state => 0, 2592 state => 0,
2338 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2339 @_ 2594 @_
2340 ); 2595 );
2341 2596
2342 if ($self->{state}) { 2597 if ($self->{state}) {
2343 $self->{state} = 0; 2598 $self->{state} = 0;
… …
2352 2607
2353 # TODO: use animation 2608 # TODO: use animation
2354 if ($self->{state} = !$self->{state}) { 2609 if ($self->{state} = !$self->{state}) {
2355 $CFClient::UI::ROOT->add ($self->{other}); 2610 $CFClient::UI::ROOT->add ($self->{other});
2356 $self->{other}->move ($self->coord2global (0, $self->{h})); 2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2357 $self->emit ("open"); 2612 $self->_emit ("open");
2358 } else { 2613 } else {
2359 $CFClient::UI::ROOT->remove ($self->{other}); 2614 $CFClient::UI::ROOT->remove ($self->{other});
2360 $self->emit ("close"); 2615 $self->_emit ("close");
2361 } 2616 }
2362 2617
2363 $self->emit (changed => $self->{state}); 2618 $self->_emit (changed => $self->{state});
2364} 2619}
2365 2620
2366############################################################################# 2621#############################################################################
2367 2622
2368package CFClient::UI::Tooltip; 2623package CFClient::UI::Tooltip;
… …
2378 @_, 2633 @_,
2379 can_events => 0, 2634 can_events => 0,
2380 ) 2635 )
2381} 2636}
2382 2637
2383sub set_markup { 2638sub set_tooltip_from {
2384 my ($self, $text) = @_; 2639 my ($self, $widget) = @_;
2385 2640
2386 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2641 $self->add (new CFClient::UI::Label
2387 $self->{label}->set_markup ($text); 2642 markup => $widget->{tooltip},
2388 $self->add ($self->{label}); 2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8,
2645 fg => [0, 0, 0, 1],
2646 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP),
2648 );
2389} 2649}
2390 2650
2391sub size_request { 2651sub size_request {
2392 my ($self) = @_; 2652 my ($self) = @_;
2393
2394 $self->child->set_max_size ($::WIDTH * 0.3);
2395 2653
2396 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2654 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2397 2655
2398 ($w + 4, $h + 4) 2656 ($w + 4, $h + 4)
2399} 2657}
… …
2405} 2663}
2406 2664
2407sub _draw { 2665sub _draw {
2408 my ($self) = @_; 2666 my ($self) = @_;
2409 2667
2410 glPushMatrix;
2411 glTranslate 0.375, 0.375; 2668 glTranslate 0.375, 0.375;
2412 2669
2413 my ($w, $h) = @$self{qw(w h)}; 2670 my ($w, $h) = @$self{qw(w h)};
2414 2671
2415 glColor 1, 0.8, 0.4; 2672 glColor 1, 0.8, 0.4;
… …
2426 glVertex 0 , $h; 2683 glVertex 0 , $h;
2427 glVertex $w, $h; 2684 glVertex $w, $h;
2428 glVertex $w, 0; 2685 glVertex $w, 0;
2429 glEnd; 2686 glEnd;
2430 2687
2431 glPopMatrix; 2688 glTranslate 2 - 0.375, 2 - 0.375;
2432
2433 glTranslate 2, 2;
2434 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2435} 2690}
2436 2691
2437############################################################################# 2692#############################################################################
2438 2693
… …
2443use CFClient::OpenGL; 2698use CFClient::OpenGL;
2444 2699
2445sub new { 2700sub new {
2446 my $class = shift; 2701 my $class = shift;
2447 2702
2448 $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2449 aspect => 1, 2704 aspect => 1,
2705 can_events => 0,
2450 @_, 2706 @_,
2451 ) 2707 );
2708
2709 if ($self->{anim} && $self->{animspeed}) {
2710 Scalar::Util::weaken (my $widget = $self);
2711
2712 $self->{timer} = Event->timer (
2713 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2714 hard => 1,
2715 interval => $self->{animspeed},
2716 cb => sub {
2717 ++$widget->{frame};
2718 $widget->update;
2719 },
2720 );
2721 }
2722
2723 $self
2452} 2724}
2453 2725
2454sub size_request { 2726sub size_request {
2455 (32, 8) 2727 (32, 8)
2456} 2728}
2457 2729
2730sub update {
2731 my ($self) = @_;
2732
2733 return unless $self->{visible};
2734
2735 $self->SUPER::update;
2736}
2737
2458sub _draw { 2738sub _draw {
2459 my ($self) = @_; 2739 my ($self) = @_;
2460 2740
2461 return unless $::CONN;#d# manage and cache textures differently 2741 return unless $::CONN;
2742
2743 my $face;
2744
2745 if ($self->{frame}) {
2746 my $anim = $::CONN->{anim}[$self->{anim}];
2747
2748 $face = $anim->[ $self->{frame} % @$anim ]
2749 if $anim && @$anim;
2750 }
2751
2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2463 2753
2464 # TODO animation
2465 if ($tex) { 2754 if ($tex) {
2466 glEnable GL_BLEND;
2467 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2468 glEnable GL_TEXTURE_2D; 2755 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2757 glColor 1, 1, 1, 1;
2471 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2473 glDisable GL_BLEND;
2474 } 2760 }
2761}
2762
2763sub DESTROY {
2764 my ($self) = @_;
2765
2766 $self->{timer}->cancel
2767 if $self->{timer};
2768
2769 $self->SUPER::DESTROY;
2475} 2770}
2476 2771
2477############################################################################# 2772#############################################################################
2478 2773
2479package CFClient::UI::InventoryItem; 2774package CFClient::UI::Inventory;
2480 2775
2481our @ISA = CFClient::UI::HBox::; 2776our @ISA = CFClient::UI::ScrolledWindow::;
2482 2777
2483sub new { 2778sub new {
2484 my $class = shift; 2779 my $class = shift;
2485 2780
2486 my %args = @_;
2487
2488 my $item = delete $args{item};
2489
2490 my $desc = $item->{nrof} < 2
2491 ? $item->{name}
2492 : "$item->{nrof} $item->{name_pl}";
2493
2494
2495 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2496 can_hover => 1, 2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2497 can_events => 1,
2498 tooltip => (CFClient::UI::Label->escape ($desc)
2499 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2500 connect_button_down => sub {
2501 my ($self, $ev, $x, $y) = @_;
2502
2503 # todo: maybe put examine on 1? but should just be a tooltip :(
2504 if ($ev->{button} == 1) {
2505 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2506 } elsif ($ev->{button} == 2) {
2507 $::CONN->send ("apply $item->{tag}");
2508 } elsif ($ev->{button} == 3) {
2509 CFClient::UI::Menu->new (
2510 items => [
2511 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2512 [
2513 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2514 sub { $::CONN->send ("lock $item->{tag}") },
2515 ],
2516 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2517 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2518 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2519 ],
2520 )->popup ($ev);
2521 }
2522
2523 1
2524 },
2525 %args
2526 );
2527
2528 $self->add (new CFClient::UI::Face
2529 can_events => 0,
2530 face => $item->{face},
2531 anim => $item->{anim},
2532 animspeed => $item->{animspeed},
2533 );
2534
2535 $self->add (new CFClient::UI::Label
2536 can_events => 0,
2537 text => $desc,
2538 );
2539
2540 $self
2541}
2542
2543#############################################################################
2544
2545package CFClient::UI::Inventory;
2546
2547our @ISA = CFClient::UI::ScrolledWindow::;
2548
2549sub new {
2550 my $class = shift;
2551
2552 my $self = $class->SUPER::new (
2553 scrolled => (new CFClient::UI::VBox),
2554 @_, 2783 @_,
2555 ); 2784 );
2556 2785
2557 $self 2786 $self
2558} 2787}
… …
2561 my ($self, $items) = @_; 2790 my ($self, $items) = @_;
2562 2791
2563 $self->{scrolled}->clear; 2792 $self->{scrolled}->clear;
2564 return unless $items; 2793 return unless $items;
2565 2794
2566 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2567 2799
2568 $self->{real_items} = \@items; 2800 $self->{real_items} = \@items;
2569 2801
2802 my $row = 0;
2570 for my $item (@items) { 2803 for my $item (@items) {
2571 my $desc = $item->{nrof} < 2 2804 CFClient::Item::update_widgets $item;
2572 ? $item->{name}
2573 : "$item->{nrof} $item->{name_pl}";
2574 2805
2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item); 2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2576 } 2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2577 2809
2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2810 $row++;
2811 }
2579} 2812}
2580 2813
2581sub size_request { 2814sub size_request {
2582 my ($self) = @_; 2815 my ($self) = @_;
2583 ($self->{req_w}, $self->{req_h}); 2816 ($self->{req_w}, $self->{req_h});
… …
2623 2856
2624# popup given the event (must be a mouse button down event currently) 2857# popup given the event (must be a mouse button down event currently)
2625sub popup { 2858sub popup {
2626 my ($self, $ev) = @_; 2859 my ($self, $ev) = @_;
2627 2860
2628 $self->emit ("popdown"); 2861 $self->_emit ("popdown");
2629 2862
2630 # maybe save $GRAB? must be careful about events... 2863 # maybe save $GRAB? must be careful about events...
2631 $GRAB = $self; 2864 $GRAB = $self;
2632 $self->{button} = $ev->{button}; 2865 $self->{button} = $ev->{button};
2633 2866
… …
2648 2881
2649 if ($ev->{button} == $self->{button}) { 2882 if ($ev->{button} == $self->{button}) {
2650 undef $GRAB; 2883 undef $GRAB;
2651 $self->hide; 2884 $self->hide;
2652 2885
2653 $self->emit ("popdown"); 2886 $self->_emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover}; 2887 $self->{hover}[1]->() if $self->{hover};
2655 } 2888 }
2656} 2889}
2657 2890
2658############################################################################# 2891#############################################################################
2659 2892
2660package CFClient::UI::Root; 2893package CFClient::UI::Statusbox;
2661 2894
2662our @ISA = CFClient::UI::Container::; 2895our @ISA = CFClient::UI::VBox::;
2663
2664use CFClient::OpenGL;
2665 2896
2666sub new { 2897sub new {
2667 my $class = shift; 2898 my $class = shift;
2668 2899
2669 $class->SUPER::new ( 2900 $class->SUPER::new (
2901 fontsize => 0.8,
2670 @_, 2902 @_,
2671 ) 2903 )
2672} 2904}
2673 2905
2906sub reorder {
2907 my ($self) = @_;
2908 my $NOW = time;
2909
2910 while (my ($k, $v) = each %{ $self->{item} }) {
2911 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2912 }
2913
2914 my @widgets;
2915
2916 my @items = sort {
2917 $a->{pri} <=> $b->{pri}
2918 or $b->{id} <=> $a->{id}
2919 } values %{ $self->{item} };
2920
2921 my $count = 10 + 1;
2922 for my $item (@items) {
2923 last unless --$count;
2924
2925 push @widgets, $item->{label} ||= do {
2926 # TODO: doesn't handle markup well (read as: at all)
2927 my $short = $item->{count} > 1
2928 ? "<b>$item->{count} ×</b> $item->{text}"
2929 : $item->{text};
2930
2931 for ($short) {
2932 s/^\s+//;
2933 s/\s+/ /g;
2934 }
2935
2936 new CFClient::UI::Label
2937 markup => $short,
2938 tooltip => $item->{tooltip},
2939 tooltip_font => $::FONT_PROP,
2940 tooltip_width => 0.67,
2941 fontsize => $item->{fontsize} || $self->{fontsize},
2942 max_w => $::WIDTH * 0.44,
2943 fg => $item->{fg},
2944 can_events => 1,
2945 can_hover => 1
2946 };
2947 }
2948
2949 $self->clear;
2950 $self->SUPER::add (reverse @widgets);
2951}
2952
2953sub add {
2954 my ($self, $text, %arg) = @_;
2955
2956 $text =~ s/^\s+//;
2957 $text =~ s/\s+$//;
2958
2959 return unless $text;
2960
2961 my $timeout = time + ((delete $arg{timeout}) || 60);
2962
2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2964
2965 if (my $item = $self->{item}{$group}) {
2966 if ($item->{text} eq $text) {
2967 $item->{count}++;
2968 } else {
2969 $item->{count} = 1;
2970 $item->{text} = $item->{tooltip} = $text;
2971 }
2972 $item->{id} = ++$self->{id};
2973 $item->{timeout} = $timeout;
2974 delete $item->{label};
2975 } else {
2976 $self->{item}{$group} = {
2977 id => ++$self->{id},
2978 text => $text,
2979 timeout => $timeout,
2980 tooltip => $text,
2981 fg => [0.8, 0.8, 0.8, 0.8],
2982 pri => 0,
2983 count => 1,
2984 %arg,
2985 };
2986 }
2987
2988 $self->reorder;
2989}
2990
2991sub reconfigure {
2992 my ($self) = @_;
2993
2994 delete $_->{label}
2995 for values %{ $self->{item} || {} };
2996
2997 $self->reorder;
2998 $self->SUPER::reconfigure;
2999}
3000
3001#############################################################################
3002
3003package CFClient::UI::Root;
3004
3005our @ISA = CFClient::UI::Container::;
3006
3007use CFClient::OpenGL;
3008
3009sub new {
3010 my $class = shift;
3011
3012 $class->SUPER::new (
3013 visible => 1,
3014 @_,
3015 )
3016}
3017
2674sub configure { 3018sub configure {
2675 my ($self, $x, $y, $w, $h) = @_; 3019 my ($self, $x, $y, $w, $h) = @_;
2676 3020
2677 $self->{w} = $w; 3021 $self->{w} = $w;
2678 $self->{h} = $h; 3022 $self->{h} = $h;
… …
2692} 3036}
2693 3037
2694sub size_allocate { 3038sub size_allocate {
2695 my ($self, $w, $h) = @_; 3039 my ($self, $w, $h) = @_;
2696 3040
2697 my $old_w = $self->{old_w};
2698 my $old_h = $self->{old_h};
2699
2700 if ($old_w && $old_h) {
2701 for my $child ($self->children) {
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712
2713 for my $child ($self->children) { 3041 for my $child ($self->children) {
2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715 3043
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3045 if exists $child->{req_x};
3046
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3048 if exists $child->{req_y};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
2716 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055
2718 $child->configure ($X, $Y, $W, $H); 3056 $child->configure ($X, $Y, $W, $H);
2719 } 3057 }
2720
2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723} 3058}
2724 3059
2725sub coord2local { 3060sub coord2local {
2726 my ($self, $x, $y) = @_; 3061 my ($self, $x, $y) = @_;
2727 3062
… …
2740 $self->check_size; 3075 $self->check_size;
2741 $::WANT_REFRESH++; 3076 $::WANT_REFRESH++;
2742} 3077}
2743 3078
2744sub add { 3079sub add {
2745 my ($self, $child) = @_; 3080 my ($self, @children) = @_;
2746 3081
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1;
3090
2747 # integerise window positions 3091 # integerise window positions
2748 $child->{x} = int $child->{x}; 3092 $child->{x} = int $child->{x};
2749 $child->{y} = int $child->{y}; 3093 $child->{y} = int $child->{y};
3094 }
2750 3095
2751 $self->SUPER::add ($child); 3096 $self->SUPER::add (@children);
3097}
3098
3099sub remove {
3100 my ($self, @children) = @_;
3101
3102 $self->SUPER::remove (@children);
3103
3104 while (@children) {
3105 my $w = pop @children;
3106 push @children, $w->children;
3107 $w->set_invisible;
3108 }
2752} 3109}
2753 3110
2754sub on_refresh { 3111sub on_refresh {
2755 my ($self, $id, $cb) = @_; 3112 my ($self, $id, $cb) = @_;
2756 3113
2757 $self->{refresh_hook}{$id} = $cb; 3114 $self->{refresh_hook}{$id} = $cb;
2758} 3115}
2759 3116
3117sub on_post_alloc {
3118 my ($self, $id, $cb) = @_;
3119
3120 $self->{post_alloc_hook}{$id} = $cb;
3121}
3122
2760sub draw { 3123sub draw {
2761 my ($self) = @_; 3124 my ($self) = @_;
2762 3125
3126 while ($self->{refresh_hook}) {
3127 $_->()
3128 for values %{delete $self->{refresh_hook}};
3129 }
3130
2763 if ($self->{check_size}) { 3131 if ($self->{check_size}) {
2764 my @queue = ([], []); 3132 my @queue;
2765 3133
2766 for (;;) { 3134 for (;;) {
2767 if ($self->{check_size}) { 3135 if ($self->{check_size}) {
2768 # heuristic: check containers last 3136 #TODO use array-of-depth approach
2769 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3137
3138 @queue = sort { $a->{visible} <=> $b->{visible} }
2770 for values %{delete $self->{check_size}} 3139 @queue, values %{delete $self->{check_size}};
2771 } 3140 }
2772 3141
2773 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3142 my $widget = pop @queue || last;
3143
3144 defined $widget->{visible} or last; # do not resize invisible widgets
2774 3145
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)} 3147 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request; 3148 : $widget->size_request;
2778 3149
3150 if (delete $widget->{force_alloc}
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) { 3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781 3153
2782 $widget->{req_w} = $w; 3154 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h; 3155 $widget->{req_h} = $h;
2784 3156
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}]; 3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2786 3158
2787 $widget->{parent}->check_size 3159 $widget->{parent}->check_size
2788 if $widget->{parent}; 3160 if $widget->{parent};
2789 } 3161 }
2790 } 3162 }
… …
2797 $w = 0 if $w < 0; 3169 $w = 0 if $w < 0;
2798 $h = 0 if $h < 0; 3170 $h = 0 if $h < 0;
2799 3171
2800 $widget->{w} = $w; 3172 $widget->{w} = $w;
2801 $widget->{h} = $h; 3173 $widget->{h} = $h;
2802 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h); 3174 $widget->emit (size_allocate => $w, $h);
2804 } 3175 }
2805 } 3176 }
2806 3177
2807 while ($self->{refresh_hook}) { 3178 while ($self->{post_alloc_hook}) {
2808 $_->() 3179 $_->()
2809 for values %{delete $self->{refresh_hook}}; 3180 for values %{delete $self->{post_alloc_hook}};
2810 } 3181 }
2811 3182
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3183 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT; 3185 glClear GL_COLOR_BUFFER_BIT;
2815 3186
2816 glMatrixMode GL_PROJECTION; 3187 glMatrixMode GL_PROJECTION;
2817 glLoadIdentity; 3188 glLoadIdentity;
2818 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2819 glMatrixMode GL_MODELVIEW; 3190 glMatrixMode GL_MODELVIEW;
2820 glLoadIdentity; 3191 glLoadIdentity;
2821 3192
2822 $self->_draw; 3193 $self->_draw;
2823} 3194}
… …
2825############################################################################# 3196#############################################################################
2826 3197
2827package CFClient::UI; 3198package CFClient::UI;
2828 3199
2829$ROOT = new CFClient::UI::Root; 3200$ROOT = new CFClient::UI::Root;
2830$TOOLTIP = new CFClient::UI::Tooltip; 3201$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2831 3202
28321 32031
2833 3204

Diff Legend

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