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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.226 by root, Tue May 23 23:14:46 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
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_text ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
39 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
40} 51}
41 52
42# class methods for events 53# class methods for events
43sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
45} 57}
46 58
47sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
49} 62}
50 63
51sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
52 my ($ev) = @_; 65 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 74 check_tooltip;
62 } 75 }
63 76
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 78
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
67} 83}
68 84
69sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
70 my ($ev) = @_; 86 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
72 88
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 90
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 92
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
78 97
79 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 100 $grab->update if $grab;
82 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 118
100 check_tooltip; 119 check_tooltip;
101 } 120 }
102 121
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
104} 126}
105 127
106# convert position array to integers 128# convert position array to integers
107sub harmonize { 129sub harmonize {
108 my ($vals) = @_; 130 my ($vals) = @_;
… …
114 $rem += $_ - $i; 136 $rem += $_ - $i;
115 $_ = $i; 137 $_ = $i;
116 } 138 }
117} 139}
118 140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
169 }
170}
171
119############################################################################# 172#############################################################################
120 173
121package CFClient::UI::Base; 174package CFClient::UI::Base;
122 175
123use strict; 176use strict;
… …
126 179
127sub new { 180sub new {
128 my $class = shift; 181 my $class = shift;
129 182
130 my $self = bless { 183 my $self = bless {
131 x => 0, 184 x => 0,
132 y => 0, 185 y => 0,
133 z => 0, 186 z => 0,
134 can_events => 1, 187 can_events => 1,
135 @_ 188 @_
136 }, $class; 189 }, $class;
137 190
138 for (keys %$self) { 191 for (keys %$self) {
139 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
141 } 194 }
142 } 195 }
143 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
144 $self 199 $self
145} 200}
146 201
147sub destroy { 202sub destroy {
148 my ($self) = @_; 203 my ($self) = @_;
… …
151 %$self = (); 206 %$self = ();
152} 207}
153 208
154sub show { 209sub show {
155 my ($self) = @_; 210 my ($self) = @_;
156
157 return if $self->{parent}; 211 return if $self->{parent};
158 212
159 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
160} 214}
161 215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
162sub hide { 229sub hide {
163 my ($self) = @_; 230 my ($self) = @_;
164 231
165 return unless $self->{parent}; 232 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self;
166 234
167 $self->{parent}->remove ($self); 235 $self->{parent}->remove ($self)
236 if $self->{parent};
168} 237}
169 238
170sub move { 239sub move {
171 my ($self, $x, $y, $z) = @_; 240 my ($self, $x, $y, $z) = @_;
172 241
… …
211 $self->{y} = $y; 280 $self->{y} = $y;
212 $self->update; 281 $self->update;
213 } 282 }
214 283
215 if ($self->{w} != $w || $self->{h} != $h) { 284 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 286 }
222} 287}
223 288
224sub size_allocate { 289sub size_allocate {
225 # nothing to be done 290 # nothing to be done
226} 291}
227 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children {
301}
302
228sub set_max_size { 303sub set_max_size {
229 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
230 305
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
233} 308}
234 309
235# return top left coordinates 310sub set_tooltip {
236sub _topleft {
237 my ($self, $x, $y) = @_; 311 my ($self, $tooltip) = @_;
238 312
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 313 $self->{tooltip} = $tooltip;
314
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
240} 319}
241 320
242# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
243sub coord2local { 322sub coord2local {
244 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
245 324
246 my ($X, $Y) = $self->_topleft; 325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 326}
249 327
250# translate local coordinates to global coordinate system 328# translate local coordinates to global coordinate system
251sub coord2global { 329sub coord2global {
252 my ($self, $x, $y) = @_; 330 my ($self, $x, $y) = @_;
253 331
254 my ($X, $Y) = $self->_topleft; 332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 333}
257 334
258sub focus_in { 335sub focus_in {
259 my ($self) = @_; 336 my ($self) = @_;
260 337
… …
320 glVertex $x + $self->{w}, $y + $self->{h}; 397 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 398 glVertex $x , $y + $self->{h};
322 glEnd; 399 glEnd;
323 glDisable GL_BLEND; 400 glDisable GL_BLEND;
324 } 401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0;
409 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h};
412 glEnd;
413 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 }
325} 416}
326 417
327sub _draw { 418sub _draw {
328 my ($self) = @_; 419 my ($self) = @_;
329 420
… …
344 435
345sub set_parent { 436sub set_parent {
346 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
347 438
348 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
349} 446}
350 447
351sub check_size { 448sub check_size {
352 my ($self) = @_; 449 my ($self, $forced) = @_;
353 450
354 $self->{parent} 451 $self->{force_alloc} = 1 if $forced;
355 or return 1; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
356
357 my ($w, $h) = $self->{user_w} && $self->{user_h}
358 ? @$self{qw(user_w user_h)}
359 : $self->size_request;
360
361 if ($w != $self->{req_w} || $h != $self->{req_h}) {
362 $self->{req_w} = $w;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else {
373 0
374 }
375} 453}
376 454
377sub update { 455sub update {
378 my ($self) = @_; 456 my ($self) = @_;
379 457
… …
388} 466}
389 467
390sub emit { 468sub emit {
391 my ($self, $signal, @args) = @_; 469 my ($self, $signal, @args) = @_;
392 470
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 472}
397 473
398sub DESTROY { 474sub DESTROY {
399 my ($self) = @_; 475 my ($self) = @_;
400 476
477 delete $WIDGET{$self+0};
401 #$self->deactivate; 478 #$self->deactivate;
402} 479}
403 480
404############################################################################# 481#############################################################################
405 482
… …
414 my $class = shift; 491 my $class = shift;
415 492
416 # range [value, low, high, page] 493 # range [value, low, high, page]
417 494
418 $class->SUPER::new ( 495 $class->SUPER::new (
419 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
420 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
421 @_ 498 @_
422 ) 499 )
423} 500}
424 501
425sub _draw { 502sub _draw {
426 my ($self) = @_; 503 my ($self) = @_;
427 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
428 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
429 511
430 glEnable GL_BLEND; 512 glEnable GL_BLEND;
431 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
432 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
433 515
434 glBegin GL_QUADS; 516 glBegin GL_QUADS;
435 glVertex 0 , 0; 517 glVertex 0 , 0;
436 glVertex 0 , $h; 518 glVertex 0 , $h;
437 glVertex $w, $h; 519 glVertex $w, $h;
438 glVertex $w, 0; 520 glVertex $w, 0;
439 glEnd; 521 glEnd;
440 522
441 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
442} 525}
443 526
444############################################################################# 527#############################################################################
445 528
446package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
467sub new { 550sub new {
468 my ($class, %arg) = @_; 551 my ($class, %arg) = @_;
469 552
470 my $children = delete $arg{children} || []; 553 my $children = delete $arg{children} || [];
471 554
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 555 my $self = $class->SUPER::new (
556 children => [],
557 can_events => 0,
558 %arg,
559 );
473 $self->add ($_) for @$children; 560 $self->add ($_) for @$children;
474 561
475 $self 562 $self
476} 563}
477 564
478sub add { 565sub add {
479 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
480 567
481 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
482 570
483 use sort 'stable'; 571 use sort 'stable';
484 572
485 $self->{children} = [ 573 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
488 ]; 576 ];
489 577
490 $child->check_size; 578 $self->check_size (1);
579 $self->update;
580}
581
582sub children {
583 @{ $_[0]{children} }
491} 584}
492 585
493sub remove { 586sub remove {
494 my ($self, $child) = @_; 587 my ($self, $child) = @_;
495 588
496 delete $child->{parent}; 589 delete $child->{parent};
590 $child->hide;
497 591
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593
594 $self->check_size;
595 $self->update;
596}
597
598sub clear {
599 my ($self) = @_;
600
601 my $children = delete $self->{children};
602 $self->{children} = [];
603
604 for (@$children) {
605 delete $_->{parent};
606 $_->hide;
607 }
499 608
500 $self->check_size; 609 $self->check_size;
501 $self->update; 610 $self->update;
502} 611}
503 612
… …
581} 690}
582 691
583sub update { 692sub update {
584 my ($self) = @_; 693 my ($self) = @_;
585 694
586 # we want to do this delayed... 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 696 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 697}
600 698
601sub size_allocate { 699sub size_allocate {
602 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
603 701
604 $self->child->configure (0, 0, $w, $h); 702 $self->SUPER::size_allocate ($w, $h);
703 $self->update;
704}
605 705
706sub _render {
707 $_[0]{children}[0]->draw;
708}
709
710sub render_child {
711 my ($self) = @_;
712
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT;
716
606 $self->render_chld; 717 $self->_render;
718 };
607} 719}
608 720
609sub _draw { 721sub _draw {
610 my ($self) = @_; 722 my ($self) = @_;
611 723
612 my ($w, $h) = ($self->w, $self->h); 724 my ($w, $h) = ($self->w, $self->h);
613 725
614 my $tex = $self->{texture} 726 my $tex = $self->{texture}
615 or return; 727 or return;
616 728
617 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1;
621 732
622 $tex->draw_quad (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623 734
624 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
626} 736}
627 737
628############################################################################# 738#############################################################################
629 739
630package CFClient::UI::ViewPort; 740package CFClient::UI::ViewPort;
631 741
632our @ISA = CFClient::UI::Window::; 742our @ISA = CFClient::UI::Window::;
633 743
634sub new { die }
635
636sub size_request { 744sub size_request {
637 my ($self) = @_; 745 my ($self) = @_;
638 746
639 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
641 748
642 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
643} 750}
644 751
645sub _draw { 752sub size_allocate {
646 my ($self) = @_; 753 my ($self, $w, $h) = @_;
647 754
648 $self->{children}[1]->draw; 755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
758 $self->update;
649} 759}
650 760
761sub set_offset {
762 my ($self, $x, $y) = @_;
651 763
652############################################################################# 764 $self->{view_x} = int $x;
765 $self->{view_y} = int $y;
653 766
767 $self->update;
768}
769
770# hmm, this does not work for topleft of $self... but we should not ask for that
771sub coord2local {
772 my ($self, $x, $y) = @_;
773
774 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
775}
776
777sub coord2global {
778 my ($self, $x, $y) = @_;
779
780 $x = List::Util::min $self->{w}, $x - $self->{view_x};
781 $y = List::Util::min $self->{h}, $y - $self->{view_y};
782
783 $self->SUPER::coord2global ($x, $y)
784}
785
786sub find_widget {
787 my ($self, $x, $y) = @_;
788
789 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
790 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
791 ) {
792 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
793 } else {
794 $self->CFClient::UI::Base::find_widget ($x, $y)
795 }
796}
797
798sub _render {
799 my ($self) = @_;
800
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802
803 $self->SUPER::_render;
804}
805
806#############################################################################
807
654package CFClient::UI::Frame; 808package CFClient::UI::ScrolledWindow;
655 809
656our @ISA = CFClient::UI::Bin::; 810our @ISA = CFClient::UI::HBox::;
657
658use CFClient::OpenGL;
659 811
660sub new { 812sub new {
661 my $class = shift; 813 my $class = shift;
662 814
815 my $self;
816
817 my $slider = new CFClient::UI::Slider
818 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
822 },
823 ;
824
663 my $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
664 bg => [1, 1, 1, 1], 826 vp => (new CFClient::UI::ViewPort expand => 1),
665 border_bg => [1, 1, 1, 1], 827 slider => $slider,
666 border => 0.8,
667 @_ 828 @_,
668 ); 829 );
669 830
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider});
834
670 $self 835 $self
671} 836}
672 837
838#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll
840
841#############################################################################
842
843package CFClient::UI::Frame;
844
845our @ISA = CFClient::UI::Bin::;
846
847use CFClient::OpenGL;
848
849sub new {
850 my $class = shift;
851
852 $class->SUPER::new (
853 bg => undef,
854 @_,
855 )
856}
857
673sub _draw { 858sub _draw {
674 my ($self) = @_; 859 my ($self) = @_;
675 860
676 my ($w, $h) = ($self->{w}, $self->{h}); 861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
677 863
678 glEnable GL_BLEND; 864 glEnable GL_BLEND;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680 glEnable GL_TEXTURE_2D; 866 glColor @{ $self->{bg} };
681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682 867
683# glBegin GL_QUADS; 868 glBegin GL_QUADS;
684# glColor 0, 0, 0, 0;
685# glVertex 0 , 0; 869 glVertex 0 , 0;
686# glVertex 0 , $h; 870 glVertex 0 , $h;
687# glVertex $w, $h; 871 glVertex $w, $h;
688# glVertex $w, 0; 872 glVertex $w, 0;
689# glEnd; 873 glEnd;
690 874
691
692 $self->child->draw;
693 glDisable GL_BLEND; 875 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 876 }
877
878 $self->SUPER::_draw;
695} 879}
696 880
697############################################################################# 881#############################################################################
698 882
699package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
… …
710 my $class = shift; 894 my $class = shift;
711 895
712 # TODO: user_x, user_y, overwrite moveto? 896 # TODO: user_x, user_y, overwrite moveto?
713 897
714 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
717 border => 0.8, 901 border => 0.6,
902 toplevel => 1,
718 can_events => 1, 903 can_events => 1,
719 @_ 904 @_
720 ); 905 );
721 906
722 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 908 align => 0,
724 valign => 1, 909 valign => 1,
725 text => $self->{title}, 910 text => $self->{title},
726 fontsize => 1; 911 fontsize => $self->{border};
727 912
728 $self 913 $self
729} 914}
730 915
731sub border { 916sub border {
… …
747 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
748 933
749 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
750 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
751 936
752 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
753 if $self->{title}; 938 if $self->{title};
754 939
755 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
756} 941}
757 942
758sub button_down { 943sub button_down {
759 my ($self, $ev, $x, $y) = @_; 944 my ($self, $ev, $x, $y) = @_;
760 945
946 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 947 my $border = $self->border;
762 948
763 if ($x < $self->{w} && $x >= $self->{w} - $border 949 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 950 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 951
952 if ($lr & $td) {
953 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 954 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 955 my ($bw, $bh) = ($self->{w}, $self->{h});
768 956
957 my $mx = $x < $border;
958 my $my = $y < $border;
959
769 $self->{motion} = sub { 960 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 961 my ($ev, $x, $y) = @_;
771 962
772 ($x, $y) = ($ev->{x}, $ev->{y}); 963 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy;
773 965
774 $self->{user_w} = $bw + $x - $ox; 966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 969 $self->check_size;
777 }; 970 };
778 971
779 } elsif ($x >= 0 && $x < $self->{w} 972 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 973 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 974 my ($bx, $by) = ($self->{x}, $self->{y});
784 975
785 $self->{motion} = sub { 976 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 977 my ($ev, $x, $y) = @_;
… …
809 my ($self) = @_; 1000 my ($self) = @_;
810 1001
811 my ($w, $h ) = ($self->{w}, $self->{h}); 1002 my ($w, $h ) = ($self->{w}, $self->{h});
812 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813 1004
814 glEnable GL_BLEND;
815 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816 glEnable GL_TEXTURE_2D; 1005 glEnable GL_TEXTURE_2D;
817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818 1007
819 my $border = $self->border; 1008 my $border = $self->border;
820 1009
821 glColor @{ $self->{border_bg} }; 1010 glColor @{ $self->{border_bg} };
822 $tex[1]->draw_quad (0, 0, $w, $border); 1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
826 1015
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 1017 my $bg = $tex[0];
828 1018
829 # TODO: repeat texture not scale 1019 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 1020 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 1021 my $rep_y = $ch / $bg->{h};
832 1022
833 glColor @{ $self->{bg} }; 1023 glColor @{ $self->{bg} };
834 1024
835 $bg->{s} = $rep_x; 1025 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 1026 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 1027 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 }
839 1030
840 glDisable GL_TEXTURE_2D; 1031 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND;
842 1032
843 $self->{title}->draw if $self->{title}; 1033 $self->{title}->draw if $self->{title};
1034
844 $self->child->draw; 1035 $self->child->draw;
845} 1036}
846 1037
847############################################################################# 1038#############################################################################
848 1039
… …
870 $self->{children}[$y][$x] = $child; 1061 $self->{children}[$y][$x] = $child;
871 1062
872 $child->check_size; 1063 $child->check_size;
873} 1064}
874 1065
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
875# TODO: move to container class maybe? send childs a signal on removal? 1070# TODO: move to container class maybe? send childs a signal on removal?
876sub clear { 1071sub clear {
877 my ($self) = @_; 1072 my ($self) = @_;
878 1073
1074 my @children = $self->children;
879 delete $self->{children}; 1075 delete $self->{children};
1076
1077 for (@children) {
1078 delete $_->{parent};
1079 $_->hide;
1080 }
1081
880 $self->update; 1082 $self->update;
881} 1083}
882 1084
883sub get_wh { 1085sub get_wh {
884 my ($self) = @_; 1086 my ($self) = @_;
… …
1061} 1263}
1062 1264
1063sub size_allocate { 1265sub size_allocate {
1064 my ($self, $w, $h) = @_; 1266 my ($self, $w, $h) = @_;
1065 1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1066 my $children = $self->{children}; 1270 my $children = $self->{children};
1067 1271
1068 my @h = map $_->{req_h}, @$children; 1272 my @h = map $_->{req_h}, @$children;
1069 1273
1070 my $req_h = List::Util::sum @h; 1274 my $req_h = List::Util::sum @h;
… …
1099 1303
1100############################################################################# 1304#############################################################################
1101 1305
1102package CFClient::UI::Label; 1306package CFClient::UI::Label;
1103 1307
1104our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1105 1309
1106use CFClient::OpenGL; 1310use CFClient::OpenGL;
1107 1311
1108sub new { 1312sub new {
1109 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1110 1314
1111 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1113 #font => default_font 1319 #font => default_font
1320 #text => initial text
1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1324 layout => (new CFClient::Layout),
1114 fontsize => 1, 1325 fontsize => 1,
1115 text => "",
1116 align => -1, 1326 align => -1,
1117 valign => -1, 1327 valign => -1,
1118 padding => 2, 1328 padding => 2,
1119 layout => new CFClient::Layout,
1120 can_events => 0, 1329 can_events => 0,
1121 %arg 1330 %arg
1122 ); 1331 );
1123 1332
1124 if (exists $self->{template}) { 1333 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1334 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1335 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1336 $self->{template} = $layout;
1128 } 1337 }
1129 1338
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1339 if (exists $self->{markup}) {
1131 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1340 $self->set_markup (delete $self->{markup});
1341 } else {
1342 $self->set_text (delete $self->{text});
1343 }
1132 1344
1133 $self 1345 $self
1134} 1346}
1135 1347
1136sub escape_text { 1348sub escape($) {
1137 local $_ = $_[1]; 1349 local $_ = $_[0];
1138 1350
1139 s/&/&amp;/g; 1351 s/&/&amp;/g;
1140 s/>/&gt;/g; 1352 s/>/&gt;/g;
1141 s/</&lt;/g; 1353 s/</&lt;/g;
1142 1354
1143 $_[1] 1355 $_
1356}
1357
1358sub update {
1359 my ($self) = @_;
1360
1361 delete $self->{texture};
1362 $self->SUPER::update;
1144} 1363}
1145 1364
1146sub set_text { 1365sub set_text {
1147 my ($self, $text) = @_; 1366 my ($self, $text) = @_;
1148 1367
1368 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text";
1370
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1149 $self->{layout}->set_text ($text); 1372 $self->{layout}->set_text ($text);
1150 1373
1151 delete $self->{texture}; 1374 $self->update;
1152 $self->check_size; 1375 $self->check_size;
1153 $self->update;
1154} 1376}
1155 1377
1156sub set_markup { 1378sub set_markup {
1157 my ($self, $markup) = @_; 1379 my ($self, $markup) = @_;
1158 1380
1381 return if $self->{text} eq "M$markup";
1382 $self->{text} = "M$markup";
1383
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1159 $self->{layout}->set_markup ($markup); 1387 $self->{layout}->set_markup ($markup);
1160 1388
1161 delete $self->{texture}; 1389 $self->update;
1162 $self->check_size; 1390 $self->check_size;
1163 $self->update;
1164} 1391}
1165 1392
1166sub size_request { 1393sub size_request {
1167 my ($self) = @_; 1394 my ($self) = @_;
1168 1395
1169 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1170 $self->{layout}->set_width ($self->{max_w} || -1); 1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1171 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1172 1401
1173 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1174 1403
1175 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1197sub set_fontsize { 1426sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1427 my ($self, $fontsize) = @_;
1199 1428
1200 $self->{fontsize} = $fontsize; 1429 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1430 delete $self->{texture};
1431
1432 $self->update;
1202 $self->check_size; 1433 $self->check_size;
1203 $self->update;
1204} 1434}
1205 1435
1206sub _draw { 1436sub _draw {
1207 my ($self) = @_; 1437 my ($self) = @_;
1208 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1209 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1212 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448
1213 new_from_layout CFClient::Texture $self->{layout} 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1450
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1453 : ($self->{w} - $tex->{w}) * 0.5);
1454
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1214 }; 1460 };
1215 1461
1216 glEnable GL_BLEND;
1217 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220 1464
1465 if ($tex->{format} == GL_ALPHA) {
1221 glColor @{$self->{fg}}; 1466 glColor @{$self->{fg}};
1222
1223 $self->{ox} = int (
1224 $self->{align} < 0 ? $self->{padding}
1225 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226 : ($self->{w} - $tex->{w}) * 0.5
1227 );
1228
1229 $self->{oy} = int (
1230 $self->{valign} < 0 ? $self->{padding}
1231 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232 : ($self->{h} - $tex->{h}) * 0.5
1233 );
1234
1235 $tex->draw_quad ($self->{ox}, $self->{oy}); 1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 }
1236 1471
1237 glDisable GL_TEXTURE_2D; 1472 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1473}
1240 1474
1241############################################################################# 1475#############################################################################
1242 1476
1243package CFClient::UI::EntryBase; 1477package CFClient::UI::EntryBase;
… …
1248 1482
1249sub new { 1483sub new {
1250 my $class = shift; 1484 my $class = shift;
1251 1485
1252 $class->SUPER::new ( 1486 $class->SUPER::new (
1253 fg => [1, 1, 1], 1487 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1488 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1489 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1257 can_hover => 1, 1491 can_hover => 1,
1258 can_focus => 1, 1492 can_focus => 1,
1259 valign => 0, 1493 valign => 0,
1260 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1261 @_ 1496 @_
1262 ) 1497 )
1263} 1498}
1264 1499
1265sub _set_text { 1500sub _set_text {
… …
1276 1511
1277 $text =~ s/./*/g if $self->{hidden}; 1512 $text =~ s/./*/g if $self->{hidden};
1278 $self->{layout}->set_text ("$text "); 1513 $self->{layout}->set_text ("$text ");
1279 1514
1280 $self->emit (changed => $self->{text}); 1515 $self->emit (changed => $self->{text});
1281}
1282
1283sub get_text {
1284 $_[0]{text}
1285}
1286
1287sub size_request {
1288 my ($self) = @_;
1289
1290 my ($w, $h) = $self->SUPER::size_request;
1291
1292 ($w + 1, $h) # add 1 for cursor
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1299} 1516}
1300 1517
1301sub set_text { 1518sub set_text {
1302 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1303 1520
1304 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1305 $self->_set_text ($text); 1522 $self->_set_text ($text);
1306 $self->update; 1523 $self->update;
1524 $self->check_size;
1525}
1526
1527sub get_text {
1528 $_[0]{text}
1529}
1530
1531sub size_request {
1532 my ($self) = @_;
1533
1534 my ($w, $h) = $self->SUPER::size_request;
1535
1536 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1307} 1543}
1308 1544
1309sub key_down { 1545sub key_down {
1310 my ($self, $ev) = @_; 1546 my ($self, $ev) = @_;
1311 1547
… …
1313 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1314 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1315 1551
1316 my $text = $self->get_text; 1552 my $text = $self->get_text;
1317 1553
1318 if ($sym == 8) { 1554 if ($uni == 8) {
1319 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1321 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1322 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1323 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1324 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1325 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1326 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1327 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1328 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1329 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1330 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1331 $self->emit ('escape'); 1567 $self->emit ('escape');
1332 } elsif ($uni) { 1568 } elsif ($uni) {
1333 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1334 } 1570 }
1335 1571
1336 $self->_set_text ($text); 1572 $self->_set_text ($text);
1337 $self->update; 1573 $self->update;
1574 $self->check_size;
1338} 1575}
1339 1576
1340sub focus_in { 1577sub focus_in {
1341 my ($self) = @_; 1578 my ($self) = @_;
1342 1579
… …
1418 my ($self, $ev) = @_; 1655 my ($self, $ev) = @_;
1419 1656
1420 my $sym = $ev->{sym}; 1657 my $sym = $ev->{sym};
1421 1658
1422 if ($sym == 13) { 1659 if ($sym == 13) {
1660 unshift @{$self->{history}},
1661 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = '';
1423 $self->emit (activate => $self->get_text); 1664 $self->emit (activate => $txt);
1424 $self->update; 1665 $self->update;
1666
1667 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text;
1670 }
1671 if (@{$self->{history} || []} > 0) {
1672 $self->{history_pointer}++;
1673 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1674 $self->{history_pointer} = @{$self->{history} || []} - 1;
1675 }
1676 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1677 }
1678
1679 } elsif ($sym == CFClient::SDLK_DOWN) {
1680 $self->{history_pointer}--;
1681 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1682
1683 if ($self->{history_pointer} >= 0) {
1684 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1685 } else {
1686 $self->set_text ($self->{history_saveback});
1687 }
1425 1688
1426 } else { 1689 } else {
1427 $self->SUPER::key_down ($ev); 1690 $self->SUPER::key_down ($ev);
1428 } 1691 }
1429 1692
… …
1443 1706
1444sub new { 1707sub new {
1445 my $class = shift; 1708 my $class = shift;
1446 1709
1447 $class->SUPER::new ( 1710 $class->SUPER::new (
1448 padding => 4, 1711 padding => 4,
1449 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1452 can_hover => 1, 1714 can_hover => 1,
1453 align => 0, 1715 align => 0,
1454 valign => 0, 1716 valign => 0,
1455 can_events => 1, 1717 can_events => 1,
1456 @_ 1718 @_
1457 ) 1719 )
1458} 1720}
1459 1721
… …
1473 1735
1474 if ($GRAB == $self) { 1736 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg}; 1737 $self->{fg} = $self->{active_fg};
1476 } 1738 }
1477 1739
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1742 glColor 0, 0, 0, 1;
1483 1743
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1744 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1745
1486 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1747
1489 $self->SUPER::_draw; 1748 $self->SUPER::_draw;
1490} 1749}
1491 1750
1492############################################################################# 1751#############################################################################
… …
1506 1765
1507 $class->SUPER::new ( 1766 $class->SUPER::new (
1508 padding => 2, 1767 padding => 2,
1509 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1510 active_fg => [1, 1, 0], 1769 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5],
1511 state => 0, 1772 state => 0,
1512 can_hover => 1, 1773 can_hover => 1,
1513 @_ 1774 @_
1514 ) 1775 )
1515} 1776}
… …
1539 1800
1540 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1541 1802
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 1804
1544 glEnable GL_BLEND; 1805 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806
1545 glEnable GL_TEXTURE_2D; 1807 glEnable GL_TEXTURE_2D;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548 my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550 $tex->draw_quad (0, 0, $s, $s); 1808 $tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552 glDisable GL_TEXTURE_2D; 1809 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 1810}
1555 1811
1556############################################################################# 1812#############################################################################
1557 1813
1558package CFClient::UI::Image; 1814package CFClient::UI::Image;
… …
1601 glTranslate 0, -$self->{w}, 0; 1857 glTranslate 0, -$self->{w}, 0;
1602 1858
1603 ($w, $h) = ($h, $w); 1859 ($w, $h) = ($h, $w);
1604 } 1860 }
1605 1861
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 1862 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 1864
1611 $tex->draw_quad (0, 0, $w, $h); 1865 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 1866
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1615} 1868}
1616 1869
1617############################################################################# 1870#############################################################################
1618 1871
… …
1666} 1919}
1667 1920
1668sub set_max { 1921sub set_max {
1669 my ($self, $max) = @_; 1922 my ($self, $max) = @_;
1670 1923
1924 return if $self->{max_val} == $max;
1925
1671 $self->{max_val} = $max; 1926 $self->{max_val} = $max;
1927 $self->update;
1672} 1928}
1673 1929
1674sub set_value { 1930sub set_value {
1675 my ($self, $val, $max) = @_; 1931 my ($self, $val, $max) = @_;
1676 1932
1677 $self->set_max ($max) 1933 $self->set_max ($max)
1678 if defined $max; 1934 if defined $max;
1679 1935
1680 $max = $self->{max_val}; 1936 return if $self->{val} == $val;
1937
1681 $self->{val} = $val; 1938 $self->{val} = $val;
1682
1683 $self->update; 1939 $self->update;
1684} 1940}
1685 1941
1686sub _draw { 1942sub _draw {
1687 my ($self) = @_; 1943 my ($self) = @_;
… …
1750 2006
1751sub new { 2007sub new {
1752 my ($class, %arg) = @_; 2008 my ($class, %arg) = @_;
1753 2009
1754 my $self = $class->SUPER::new ( 2010 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 2011 tooltip => $arg{type},
2012 can_hover => 1,
1756 can_events => 1, 2013 can_events => 1,
1757 can_hover => 1,
1758 %arg, 2014 %arg,
1759 ); 2015 );
1760 2016
1761 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2017 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1762 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2018 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1770 2026
1771 $self->{value}->set_fontsize ($fsize); 2027 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 2028 $self->{max} ->set_fontsize ($fsize);
1773} 2029}
1774 2030
2031sub set_max {
2032 my ($self, $max) = @_;
2033
2034 $self->{gauge}->set_max ($max);
2035 $self->{max}->set_text ($max);
2036}
2037
1775sub set_value { 2038sub set_value {
1776 my ($self, $val, $max) = @_; 2039 my ($self, $val, $max) = @_;
1777 2040
1778 $self->set_max ($max) 2041 $self->set_max ($max)
1779 if defined $max; 2042 if defined $max;
1780 2043
1781 $self->{gauge}->set_value ($val, $max); 2044 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 2045 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 2046}
1791 2047
1792############################################################################# 2048#############################################################################
1793 2049
1794package CFClient::UI::Slider; 2050package CFClient::UI::Slider;
… …
1804 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1805 2061
1806sub new { 2062sub new {
1807 my $class = shift; 2063 my $class = shift;
1808 2064
1809 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
1810 2066
1811 # TODO: 0-width page 2067 # TODO: 0-width page
1812 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
1813 # TODO: calculations are off 2069 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
1816 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5],
1817 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
1818 req_w => 20, 2076 req_w => $::WIDTH / 80,
1819 req_h => 20, 2077 req_h => $::WIDTH / 80,
1820 vertical => 0, 2078 vertical => 0,
1821 can_hover => 1, 2079 can_hover => 1,
1822 inner_pad => 5, 2080 inner_pad => 0.02,
1823 @_ 2081 @_
1824 ); 2082 );
1825 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
1826 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2098sub set_value {
2099 my ($self, $value) = @_;
2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102
2103 $hi = $lo + 1 if $hi <= $lo;
2104
2105 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi;
2107
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
1827} 2119}
1828 2120
1829sub size_request { 2121sub size_request {
1830 my ($self) = @_; 2122 my ($self) = @_;
1831 2123
… …
1844 2136
1845sub mouse_motion { 2137sub mouse_motion {
1846 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
1847 2139
1848 if ($GRAB == $self) { 2140 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142
2143 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2146
2147 $self->set_value ($x * ($hi - $lo) + $lo);
2148 }
2149}
2150
2151sub update {
2152 my ($self) = @_;
2153
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]);
2156
1849 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2157 my ($value, $lo, $hi, $page) = @{$self->{range}};
1850 2158
1851 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2159 my $inner_w = 1 - 2 * $self->{inner_pad};
1852 2160
1853 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1854 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1855 2162
1856 $x -= $inner_pad_px; # substract the padding 2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1857 $x = $x * ($hi - $lo) / $inner_w + $lo; 2164 $value = $self->{scale} * ($value - $lo);
1858 $x = $lo if $x < $lo;
1859 $x = $hi - $page if $x > $hi - $page;
1860 $self->{range}[0] = $x;
1861 2165
1862 $self->emit (changed => $x); 2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
1863 $self->update; 2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value;
2172 $self->{knob_w} = $page;
1864 } 2173 });
1865}
1866 2174
1867# the inner_* stuff is for generating a padding for the slider handle, 2175 $self->SUPER::update;
1868# so that the handle doesn't leave the texture. This calculation isn't 100%
1869# correct propably, but it does the job for now
1870sub _calc_inner_pad_px {
1871 my ($self, $w) = @_;
1872 ($w / 100) * $self->{inner_pad} # % to pixels
1873} 2176}
1874 2177
1875sub _draw { 2178sub _draw {
1876 my ($self) = @_; 2179 my ($self) = @_;
1877 2180
1878 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
1879 2182
1880 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
1881 2184
1882 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
1883 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
1884 2187
2188 glTranslate 1, 0, 0;
1885 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
1886 glTranslate 0, -$self->{w}, 0;
1887
1888 ($w, $h) = ($h, $w);
1889 } 2190 }
1890 2191
1891 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1892 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1893 2194
1894 my ($value, $lo, $hi, $page) = @{$self->{range}};
1895
1896 $hi = $value + 1 if $lo == $hi;
1897
1898 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1899 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1900
1901 $page = int $page * $inner_w / ($hi - $lo);
1902 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1903
1904 $w -= $page;
1905 $page &= ~1;
1906 glTranslate $page * 0.5, 0, 0;
1907 $page ||= 2;
1908
1909 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1910 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1911
1912 glEnable GL_BLEND;
1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1914 glEnable GL_TEXTURE_2D; 2195 glEnable GL_TEXTURE_2D;
1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916 2197
1917 # draw background 2198 # draw background
1918 $tex[1]->draw_quad (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1919 2200
1920 # draw handle 2201 # draw handle
1921 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1922 2203
1923 glDisable GL_BLEND;
1924 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
1925} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
1926 2247
1927############################################################################# 2248#############################################################################
1928 2249
1929package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
1930 2251
… …
1934 2255
1935sub new { 2256sub new {
1936 my $class = shift; 2257 my $class = shift;
1937 2258
1938 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
1939 fontsize => 1, 2260 fontsize => 1,
2261 can_events => 0,
1940 #font => default_font 2262 #font => default_font
1941 @_, 2263 @_,
1942 2264
1943 layout => (new CFClient::Layout), 2265 layout => (new CFClient::Layout 1),
1944 par => [], 2266 par => [],
1945 height => 0, 2267 height => 0,
1946 children => [ 2268 children => [
1947 (new CFClient::UI::Empty expand => 1), 2269 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2270 (new CFClient::UI::Slider vertical => 1),
1949 ], 2271 ],
1950 ); 2272 );
1951 2273
1952 $self->{children}[1]->connect (changed => sub { 2274 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2275
1956 $self 2276 $self
1957} 2277}
1958 2278
1959sub set_fontsize { 2279sub set_fontsize {
1960 my ($self, $fontsize) = @_; 2280 my ($self, $fontsize) = @_;
1961 2281
1962 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
1963 $self->reflow; 2283 $self->reflow;
1964}
1965
1966sub text_height {
1967 my ($self, $text) = @_;
1968
1969 my $layout = $self->{layout};
1970
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w});
1973 $layout->set_text ($text);
1974
1975 ($layout->size)[1]
1976}
1977
1978sub reflow {
1979 my ($self) = @_;
1980
1981 $self->{need_reflow}++;
1982 $self->update;
1983} 2284}
1984 2285
1985sub size_allocate { 2286sub size_allocate {
1986 my ($self, $w, $h) = @_; 2287 my ($self, $w, $h) = @_;
1987 2288
… …
1992 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
1993 2294
1994 $self->reflow; 2295 $self->reflow;
1995} 2296}
1996 2297
2298sub text_height {
2299 my ($self, $text, $indent) = @_;
2300
2301 my $layout = $self->{layout};
2302
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text);
2306
2307 ($layout->size)[1]
2308}
2309
2310sub reflow {
2311 my ($self) = @_;
2312
2313 $self->{need_reflow}++;
2314 $self->update;
2315}
2316
2317sub clear {
2318 my ($self) = @_;
2319
2320 $self->{par} = [];
2321 $self->{height} = 0;
2322
2323 $self->reflow;
2324}
2325
1997sub add_paragraph { 2326sub add_paragraph {
1998 my ($self, $color, $text) = @_; 2327 my ($self, $color, $text, $indent) = @_;
1999 2328
2000 #TODO: intelligently "reformat" paragraph 2329 for my $line (split /\n/, $text) {
2001
2002 my $height = $self->text_height ($text); 2330 my $height = $self->text_height ($line);
2003
2004 $self->{height} += $height; 2331 $self->{height} += $height;
2005
2006 push @{$self->{par}}, [$height, $color, $text]; 2332 push @{$self->{par}}, [$height, $color, $indent, $line];
2333 }
2007 2334
2008 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2009 $self->{children}[1]->update; 2336 $self->{children}[1]->update;
2010} 2337}
2011 2338
… …
2016 2343
2017 return unless $self->{h} > 0; 2344 return unless $self->{h} > 0;
2018 2345
2019 delete $self->{texture}; 2346 delete $self->{texture};
2020 2347
2021 $ROOT->on_refresh ($self, sub { 2348 $ROOT->on_post_alloc ($self, sub {
2022 if (delete $self->{need_reflow}) { 2349 if (delete $self->{need_reflow}) {
2023 my $height = 0; 2350 my $height = 0;
2024 2351
2025 $height += $_->[0] = $self->text_height ($_->[2]) 2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2026 for @{$self->{par}}; 2353 for @{$self->{par}};
2027 2354
2028 $self->{height} = $height; 2355 $self->{height} = $height;
2029 2356
2030 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2358 $self->{children}[1]->update;
2031 2359
2032 delete $self->{texture}; 2360 delete $self->{texture};
2033 } 2361 }
2034 2362
2035 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2036 glClearColor 0, 0, 0, 1; 2364 glClearColor 0.5, 0.5, 0.5, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2365 glClear GL_COLOR_BUFFER_BIT;
2038
2039 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2366
2044 my $top = int $self->{children}[1]{range}[0]; 2367 my $top = int $self->{children}[1]{range}[0];
2045 2368
2046 my $y0 = $top; 2369 my $y0 = $top;
2047 my $y1 = $top + $self->{h}; 2370 my $y1 = $top + $self->{h};
… …
2050 2373
2051 my $layout = $self->{layout}; 2374 my $layout = $self->{layout};
2052 2375
2053 $layout->set_font ($self->{font}) if $self->{font}; 2376 $layout->set_font ($self->{font}) if $self->{font};
2054 2377
2378 glEnable GL_BLEND;
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380
2055 for my $par (@{$self->{par}}) { 2381 for my $par (@{$self->{par}}) {
2056 my $h = $par->[0]; 2382 my $h = $par->[0];
2057 2383
2058 if ($y0 < $y + $h && $y < $y1) { 2384 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] });
2386 $layout->set_width ($self->{w} - $par->[2]);
2059 $layout->set_text ($par->[2]); 2387 $layout->set_markup ($par->[3]);
2060 2388
2061 glColor @{ $par->[1] }; 2389 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2062 my ($W, $H) = $layout->size; 2390
2063 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2391 glRasterPos $par->[2], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2064 } 2393 }
2065 2394
2066 $y += $h; 2395 $y += $h;
2067 } 2396 }
2068 2397
2069 glDisable GL_TEXTURE_2D;
2070 glDisable GL_BLEND; 2398 glDisable GL_BLEND;
2071 }; 2399 };
2072 }); 2400 });
2073} 2401}
2074 2402
2075sub _draw { 2403sub _draw {
2076 my ($self) = @_; 2404 my ($self) = @_;
2077 2405
2078 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2406 glEnable GL_TEXTURE_2D;
2080 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2407 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2408 glColor 1, 1, 1, 1;
2081 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2409 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2082 glDisable GL_TEXTURE_2D; 2410 glDisable GL_TEXTURE_2D;
2083 }
2084 2411
2085 $self->{children}[1]->draw; 2412 $self->{children}[1]->draw;
2086 2413
2087} 2414}
2088 2415
… …
2136 2463
2137sub new { 2464sub new {
2138 my $class = shift; 2465 my $class = shift;
2139 2466
2140 my $self = $class->SUPER::new ( 2467 my $self = $class->SUPER::new (
2141 state => 0, 2468 state => 0,
2142 connect_activate => \&toggle_flopper, 2469 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2470 @_
2145 ); 2471 );
2146 2472
2147 if ($self->{state}) { 2473 if ($self->{state}) {
2148 $self->{state} = 0; 2474 $self->{state} = 0;
… …
2183 @_, 2509 @_,
2184 can_events => 0, 2510 can_events => 0,
2185 ) 2511 )
2186} 2512}
2187 2513
2188sub set_text { 2514sub set_tooltip_from {
2189 my ($self, $text) = @_; 2515 my ($self, $widget) = @_;
2190 2516
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2517 $self->add (new CFClient::UI::Label
2192 $self->{label}->set_text ($text); 2518 markup => $widget->{tooltip},
2193 $self->add ($self->{label}); 2519 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2520 fontsize => 0.8,
2521 fg => [0, 0, 0, 1],
2522 ellipsise => 0,
2523 font => ($widget->{tooltip_font} || $::FONT_PROP),
2524 );
2194} 2525}
2195 2526
2196sub size_request { 2527sub size_request {
2197 my ($self) = @_; 2528 my ($self) = @_;
2198 2529
2199 $self->child->set_max_size ($::WIDTH * 0.3);
2200
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2530 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2531
2203 ($w + 4, $h + 4) 2532 ($w + 4, $h + 4)
2204} 2533}
2205 2534
2535sub size_allocate {
2536 my ($self, $w, $h) = @_;
2537
2538 $self->SUPER::size_allocate ($w - 4, $h - 4);
2539}
2540
2206sub _draw { 2541sub _draw {
2207 my ($self) = @_; 2542 my ($self) = @_;
2208 2543
2209 glPushMatrix;
2210 glTranslate 0.375, 0.375; 2544 glTranslate 0.375, 0.375;
2211 2545
2212 my ($w, $h) = @$self{qw(w h)}; 2546 my ($w, $h) = @$self{qw(w h)};
2213 2547
2214 glColor 1, 0.8, 0.4; 2548 glColor 1, 0.8, 0.4;
… …
2225 glVertex 0 , $h; 2559 glVertex 0 , $h;
2226 glVertex $w, $h; 2560 glVertex $w, $h;
2227 glVertex $w, 0; 2561 glVertex $w, 0;
2228 glEnd; 2562 glEnd;
2229 2563
2230 glPopMatrix; 2564 glTranslate 2 - 0.375, 2 - 0.375;
2231
2232 glTranslate 2, 2;
2233 $self->SUPER::_draw; 2565 $self->SUPER::_draw;
2234} 2566}
2235 2567
2236############################################################################# 2568#############################################################################
2237 2569
2570package CFClient::UI::Face;
2571
2572our @ISA = CFClient::UI::Base::;
2573
2574use CFClient::OpenGL;
2575
2576sub new {
2577 my $class = shift;
2578
2579 my $self = $class->SUPER::new (
2580 aspect => 1,
2581 @_,
2582 );
2583
2584 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self);
2586
2587 $self->{timer} = Event->timer (
2588 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2589 hard => 1,
2590 interval => $self->{animspeed},
2591 cb => sub {
2592 ++$widget->{frame};
2593 $widget->update;
2594 },
2595 );
2596 }
2597
2598 $self
2599}
2600
2601sub size_request {
2602 (32, 8)
2603}
2604
2605sub update {
2606 my ($self) = @_;
2607
2608 return unless $self->{visible};
2609
2610 $self->SUPER::update;
2611}
2612
2613sub _draw {
2614 my ($self) = @_;
2615
2616 return unless $::CONN;#d# manage and cache textures differently
2617
2618 my $face;
2619
2620 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}];
2622
2623 $face = $anim->[ $self->{frame} % @$anim ]
2624 if $anim && @$anim;
2625 }
2626
2627 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2628
2629 if ($tex) {
2630 glEnable GL_TEXTURE_2D;
2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2632 glColor 1, 1, 1, 1;
2633 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2634 glDisable GL_TEXTURE_2D;
2635 }
2636}
2637
2638sub DESTROY {
2639 my ($self) = @_;
2640
2641 $self->{timer}->cancel
2642 if $self->{timer};
2643
2644 $self->SUPER::DESTROY;
2645}
2646
2647#############################################################################
2648
2649package CFClient::UI::InventoryItem;
2650
2651our @ISA = CFClient::UI::HBox::;
2652
2653sub _item_to_desc {
2654 my ($item) = @_;
2655
2656 my $desc =
2657 $item->{nrof} < 2
2658 ? $item->{name}
2659 : "$item->{nrof} × $item->{name_pl}";
2660
2661 $item->{flags} & Crossfire::Protocol::F_OPEN
2662 and $desc .= " (open)";
2663 $item->{flags} & Crossfire::Protocol::F_APPLIED
2664 and $desc .= " (applied)";
2665 $item->{flags} & Crossfire::Protocol::F_UNPAID
2666 and $desc .= " (unpaid)";
2667 $item->{flags} & Crossfire::Protocol::F_MAGIC
2668 and $desc .= " (magic)";
2669 $item->{flags} & Crossfire::Protocol::F_CURSED
2670 and $desc .= " (cursed)";
2671 $item->{flags} & Crossfire::Protocol::F_DAMNED
2672 and $desc .= " (damned)";
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED
2674 and $desc .= " *";
2675
2676 $desc
2677}
2678
2679sub new {
2680 my $class = shift;
2681
2682 my %args = @_;
2683
2684 my $item = delete $args{item};
2685
2686 my $desc = _item_to_desc ($item);
2687
2688 my $self = $class->SUPER::new (
2689 can_hover => 1,
2690 can_events => 1,
2691 tooltip => ((CFClient::UI::Label::escape $desc)
2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2693 connect_button_down => sub {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2698 my $targ = $::CONN->{player}{tag};
2699
2700 if ($item->{container} == $::CONN->{player}{tag}) {
2701 $targ = $main::OPENCONT;
2702 }
2703
2704 $::CONN->send ("move $targ $item->{tag} 0");
2705 } elsif ($ev->{button} == 1) {
2706 $::CONN->send ("examine $item->{tag}");
2707 } elsif ($ev->{button} == 2) {
2708 $::CONN->send ("apply $item->{tag}");
2709 } elsif ($ev->{button} == 3) {
2710 my @menu_items = (
2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2712 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2713 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714 (
2715 $item->{flags} & Crossfire::Protocol::F_LOCKED
2716 ? (
2717 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718 )
2719 : (
2720 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2721 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2722 )
2723 ),
2724 );
2725
2726 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2727 }
2728
2729 1
2730 },
2731 %args
2732 );
2733
2734
2735 $self->add (new CFClient::UI::Face
2736 can_events => 0,
2737 face => $item->{face},
2738 anim => $item->{anim},
2739 animspeed => $item->{animspeed},
2740 );
2741
2742 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2743
2744 $self->{item} = $item;
2745
2746 $self->update_item;
2747
2748 $self
2749}
2750
2751sub update_item {
2752 my ($self) = @_;
2753
2754 my $desc = _item_to_desc ($self->{item});
2755
2756 $self->{name_lbl}->set_text ($desc);
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 for my $item (@items) {
2790 $item->{item} = $item;
2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792 $item->update_item ();
2793 }
2794
2795 my $i = 0;
2796 for (@items) {
2797 $self->{scrolled}->add (0, $i, $_);
2798 my $nrof = $_->{item}->{nrof} || 1;
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2800 }
2801
2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2803}
2804
2805sub size_request {
2806 my ($self) = @_;
2807 ($self->{req_w}, $self->{req_h});
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Menu;
2813
2814our @ISA = CFClient::UI::FancyFrame::;
2815
2816use CFClient::OpenGL;
2817
2818sub new {
2819 my $class = shift;
2820
2821 my $self = $class->SUPER::new (
2822 items => [],
2823 z => 100,
2824 @_,
2825 );
2826
2827 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2828
2829 for my $item (@{ $self->{items} }) {
2830 my ($widget, $cb) = @$item;
2831
2832 # handle various types of items, only text for now
2833 if (!ref $widget) {
2834 $widget = new CFClient::UI::Label
2835 can_hover => 1,
2836 can_events => 1,
2837 text => $widget;
2838 }
2839
2840 $self->{item}{$widget} = $item;
2841
2842 $self->{vbox}->add ($widget);
2843 }
2844
2845 $self
2846}
2847
2848# popup given the event (must be a mouse button down event currently)
2849sub popup {
2850 my ($self, $ev) = @_;
2851
2852 $self->emit ("popdown");
2853
2854 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self;
2856 $self->{button} = $ev->{button};
2857
2858 $self->show;
2859 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860}
2861
2862sub mouse_motion {
2863 my ($self, $ev, $x, $y) = @_;
2864
2865 # TODO: should use vbox->find_widget or so
2866 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867 $self->{hover} = $self->{item}{$HOVER};
2868}
2869
2870sub button_up {
2871 my ($self, $ev, $x, $y) = @_;
2872
2873 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB;
2875 $self->hide;
2876
2877 $self->emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover};
2879 }
2880}
2881
2882#############################################################################
2883
2884package CFClient::UI::Statusbox;
2885
2886our @ISA = CFClient::UI::VBox::;
2887
2888sub new {
2889 my $class = shift;
2890
2891 $class->SUPER::new (
2892 fontsize => 0.8,
2893 @_,
2894 )
2895}
2896
2897sub reorder {
2898 my ($self) = @_;
2899 my $NOW = time;
2900
2901 while (my ($k, $v) = each %{ $self->{item} }) {
2902 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2903 }
2904
2905 my @widgets;
2906
2907 my @items = sort {
2908 $a->{pri} <=> $b->{pri}
2909 or $b->{id} <=> $a->{id}
2910 } values %{ $self->{item} };
2911
2912 my $count = 10 + 1;
2913 for my $item (@items) {
2914 last unless --$count;
2915
2916 push @widgets, $item->{label} ||= do {
2917 # TODO: doesn't handle markup well (read as: at all)
2918 my $short = $item->{count} > 1
2919 ? "<b>$item->{count} ×</b> $item->{text}"
2920 : $item->{text};
2921
2922 for ($short) {
2923 s/^\s+//;
2924 s/\s+/ /g;
2925 }
2926
2927 new CFClient::UI::Label
2928 markup => $short,
2929 tooltip => $item->{tooltip},
2930 tooltip_font => $::FONT_PROP,
2931 tooltip_width => 0.67,
2932 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44,
2934 fg => $item->{fg},
2935 can_events => 1,
2936 can_hover => 1
2937 };
2938 }
2939
2940 $self->clear;
2941 $self->SUPER::add (reverse @widgets);
2942}
2943
2944sub add {
2945 my ($self, $text, %arg) = @_;
2946
2947 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//;
2949
2950 my $timeout = time + ((delete $arg{timeout}) || 60);
2951
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953
2954 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) {
2956 $item->{count}++;
2957 } else {
2958 $item->{count} = 1;
2959 $item->{text} = $item->{tooltip} = $text;
2960 }
2961 $item->{id} = ++$self->{id};
2962 $item->{timeout} = $timeout;
2963 delete $item->{label};
2964 } else {
2965 $self->{item}{$group} = {
2966 id => ++$self->{id},
2967 text => $text,
2968 timeout => $timeout,
2969 tooltip => $text,
2970 fg => [0.8, 0.8, 0.8, 0.8],
2971 pri => 0,
2972 count => 1,
2973 %arg,
2974 };
2975 }
2976
2977 $self->reorder;
2978}
2979
2980sub reconfigure {
2981 my ($self) = @_;
2982
2983 delete $_->{label}
2984 for values %{ $self->{item} || {} };
2985
2986 $self->reorder;
2987 $self->SUPER::reconfigure;
2988}
2989
2990#############################################################################
2991
2238package CFClient::UI::Root; 2992package CFClient::UI::Root;
2239 2993
2240our @ISA = CFClient::UI::Container::; 2994our @ISA = CFClient::UI::Container::;
2241 2995
2242use CFClient::OpenGL; 2996use CFClient::OpenGL;
2243 2997
2244sub check_size { 2998sub new {
2245 my ($self) = @_; 2999 my $class = shift;
2246 3000
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3001 $class->SUPER::new (
2248} 3002 @_,
2249 3003 )
2250sub size_request {
2251 ($::WIDTH, $::HEIGHT)
2252} 3004}
2253 3005
2254sub configure { 3006sub configure {
2255 my ($self, $x, $y, $w, $h) = @_; 3007 my ($self, $x, $y, $w, $h) = @_;
2256 3008
2257 $self->SUPER::configure ($x, $y, $w, $h); 3009 $self->{w} = $w;
3010 $self->{h} = $h;
3011}
2258 3012
3013sub check_size {
3014 my ($self) = @_;
3015
3016 $self->size_allocate ($self->{w}, $self->{h})
3017 if $self->{w};
3018}
3019
3020sub size_request {
3021 my ($self) = @_;
3022
3023 ($self->{w}, $self->{h})
3024}
3025
3026sub size_allocate {
3027 my ($self, $w, $h) = @_;
3028
3029 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3030 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3031
3032 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3033 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3034
2259 for my $child (@{$self->{children}}) { 3035 for my $child ($self->children) {
2260 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3036 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2261 3037
3038 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3039 if exists $child->{req_x};
3040
3041 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3042 if exists $child->{req_y};
3043
2262 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3044 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2263 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3045 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3046
2264 $child->configure ($X, $Y, $W,$H); 3047 $child->configure ($X, $Y, $W, $H);
2265 } 3048 }
2266} 3049}
2267 3050
2268sub _topleft { 3051sub coord2local {
2269 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2270 3053
2271 ($x, $y) 3054 ($x, $y)
2272} 3055}
2273 3056
3057sub coord2global {
3058 my ($self, $x, $y) = @_;
3059
3060 ($x, $y)
3061}
3062
2274sub update { 3063sub update {
2275 my ($self) = @_; 3064 my ($self) = @_;
2276 3065
2277 $self->check_size; 3066 $self->check_size;
2278 ::refresh (); 3067 $::WANT_REFRESH++;
2279} 3068}
2280 3069
2281sub add { 3070sub add {
2282 my ($self, $child) = @_; 3071 my ($self, @children) = @_;
2283 3072
3073 for my $child (@children) {
3074 $child->{toplevel} = 1;
3075
2284 # integerize window positions 3076 # integerise window positions
2285 $child->{x} = int $child->{x}; 3077 $child->{x} = int $child->{x};
2286 $child->{y} = int $child->{y}; 3078 $child->{y} = int $child->{y};
3079 }
2287 3080
2288 $self->SUPER::add ($child); 3081 $self->SUPER::add (@children);
3082
3083 while (@children) {
3084 my $w = pop @children;
3085 push @children, $w->children;
3086 $w->{visible} = 1;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 }
2289} 3100}
2290 3101
2291sub on_refresh { 3102sub on_refresh {
2292 my ($self, $id, $cb) = @_; 3103 my ($self, $id, $cb) = @_;
2293 3104
2294 $self->{refresh_hook}{$id} = $cb; 3105 $self->{refresh_hook}{$id} = $cb;
2295} 3106}
2296 3107
3108sub on_post_alloc {
3109 my ($self, $id, $cb) = @_;
3110
3111 $self->{post_alloc_hook}{$id} = $cb;
3112}
3113
2297sub draw { 3114sub draw {
2298 my ($self) = @_; 3115 my ($self) = @_;
2299 3116
2300 while (my $rcb = delete $self->{refresh_hook}) { 3117 while ($self->{refresh_hook}) {
2301 $_->() for values %$rcb; 3118 $_->()
3119 for values %{delete $self->{refresh_hook}};
3120 }
3121
3122 if ($self->{check_size}) {
3123 my @queue = ([], []);
3124
3125 for (;;) {
3126 if ($self->{check_size}) {
3127 # heuristic: check containers last
3128 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3129 for values %{delete $self->{check_size}}
3130 }
3131
3132 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3133
3134 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3135 ? @$widget{qw(user_w user_h)}
3136 : $widget->size_request;
3137
3138 if (delete $widget->{force_alloc}
3139 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3140 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3141
3142 $widget->{req_w} = $w;
3143 $widget->{req_h} = $h;
3144
3145 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3146
3147 $widget->{parent}->check_size
3148 if $widget->{parent};
3149 }
3150 }
3151 }
3152
3153 while ($self->{size_alloc}) {
3154 for (values %{delete $self->{size_alloc}}) {
3155 my ($widget, $w, $h) = @$_;
3156
3157 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0;
3159
3160 $widget->{w} = $w;
3161 $widget->{h} = $h;
3162 $widget->size_allocate ($w, $h);
3163 $widget->emit (size_allocate => $w, $h);
3164 }
3165 }
3166
3167 while ($self->{post_alloc_hook}) {
3168 $_->()
3169 for values %{delete $self->{post_alloc_hook}};
2302 } 3170 }
2303 3171
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3172 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3173 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2307 3175
2308 glMatrixMode GL_PROJECTION; 3176 glMatrixMode GL_PROJECTION;
2309 glLoadIdentity; 3177 glLoadIdentity;
2310 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3178 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2311 glMatrixMode GL_MODELVIEW; 3179 glMatrixMode GL_MODELVIEW;
2312 glLoadIdentity; 3180 glLoadIdentity;
2313 3181
2314 $self->_draw; 3182 $self->_draw;
2315} 3183}
… …
2317############################################################################# 3185#############################################################################
2318 3186
2319package CFClient::UI; 3187package CFClient::UI;
2320 3188
2321$ROOT = new CFClient::UI::Root; 3189$ROOT = new CFClient::UI::Root;
2322$TOOLTIP = new CFClient::UI::Tooltip; 3190$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2323 3191
23241 31921
2325 3193

Diff Legend

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