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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00:55 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_markup ($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
… …
332 glVertex $self->{w}, 0; 409 glVertex $self->{w}, 0;
333 glVertex $self->{w}, $self->{h}; 410 glVertex $self->{w}, $self->{h};
334 glVertex 0 , $self->{h}; 411 glVertex 0 , $self->{h};
335 glEnd; 412 glEnd;
336 glPopMatrix; 413 glPopMatrix;
337 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
338 } 415 }
339} 416}
340 417
341sub _draw { 418sub _draw {
342 my ($self) = @_; 419 my ($self) = @_;
… …
358 435
359sub set_parent { 436sub set_parent {
360 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
361 438
362 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;
363} 446}
364 447
365sub check_size { 448sub check_size {
366 my ($self) = @_; 449 my ($self, $forced) = @_;
367 450
368 $self->{parent} 451 $self->{force_alloc} = 1 if $forced;
369 or return 1; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
370
371 my ($w, $h) = $self->{user_w} && $self->{user_h}
372 ? @$self{qw(user_w user_h)}
373 : $self->size_request;
374
375 if ($w != $self->{req_w} || $h != $self->{req_h}) {
376 $self->{req_w} = $w;
377 $self->{req_h} = $h;
378
379 $self->{parent}->check_size
380 or $self->size_allocate (
381 (List::Util::max $self->{w}, $w),
382 (List::Util::max $self->{h}, $h),
383 );
384
385 1
386 } else {
387 0
388 }
389} 453}
390 454
391sub update { 455sub update {
392 my ($self) = @_; 456 my ($self) = @_;
393 457
… …
402} 466}
403 467
404sub emit { 468sub emit {
405 my ($self, $signal, @args) = @_; 469 my ($self, $signal, @args) = @_;
406 470
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 472}
411 473
412sub DESTROY { 474sub DESTROY {
413 my ($self) = @_; 475 my ($self) = @_;
414 476
477 delete $WIDGET{$self+0};
415 #$self->deactivate; 478 #$self->deactivate;
416} 479}
417 480
418############################################################################# 481#############################################################################
419 482
… …
428 my $class = shift; 491 my $class = shift;
429 492
430 # range [value, low, high, page] 493 # range [value, low, high, page]
431 494
432 $class->SUPER::new ( 495 $class->SUPER::new (
433 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
434 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
435 @_ 498 @_
436 ) 499 )
437} 500}
438 501
439sub _draw { 502sub _draw {
440 my ($self) = @_; 503 my ($self) = @_;
441 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
442 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
443 511
444 glEnable GL_BLEND; 512 glEnable GL_BLEND;
445 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
446 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
447 515
448 glBegin GL_QUADS; 516 glBegin GL_QUADS;
449 glVertex 0 , 0; 517 glVertex 0 , 0;
450 glVertex 0 , $h; 518 glVertex 0 , $h;
451 glVertex $w, $h; 519 glVertex $w, $h;
452 glVertex $w, 0; 520 glVertex $w, 0;
453 glEnd; 521 glEnd;
454 522
455 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
456} 525}
457 526
458############################################################################# 527#############################################################################
459 528
460package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
481sub new { 550sub new {
482 my ($class, %arg) = @_; 551 my ($class, %arg) = @_;
483 552
484 my $children = delete $arg{children} || []; 553 my $children = delete $arg{children} || [];
485 554
486 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 );
487 $self->add ($_) for @$children; 560 $self->add ($_) for @$children;
488 561
489 $self 562 $self
490} 563}
491 564
492sub add { 565sub add {
493 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
494 567
495 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
496 570
497 use sort 'stable'; 571 use sort 'stable';
498 572
499 $self->{children} = [ 573 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
502 ]; 576 ];
503 577
504 $child->check_size; 578 $self->check_size (1);
579 $self->update;
580}
581
582sub children {
583 @{ $_[0]{children} }
505} 584}
506 585
507sub remove { 586sub remove {
508 my ($self, $child) = @_; 587 my ($self, $child) = @_;
509 588
510 delete $child->{parent}; 589 delete $child->{parent};
590 $child->hide;
511 591
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 593
514 $self->check_size; 594 $self->check_size;
515 $self->update; 595 $self->update;
516} 596}
517 597
518sub clear { 598sub clear {
519 my ($self) = @_; 599 my ($self) = @_;
520 600
521 delete $_->{parent} 601 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 602 $self->{children} = [];
603
604 for (@$children) {
605 delete $_->{parent};
606 $_->hide;
607 }
608
609 $self->check_size;
610 $self->update;
525} 611}
526 612
527sub find_widget { 613sub find_widget {
528 my ($self, $x, $y) = @_; 614 my ($self, $x, $y) = @_;
529 615
… …
604} 690}
605 691
606sub update { 692sub update {
607 my ($self) = @_; 693 my ($self) = @_;
608 694
609 # we want to do this delayed... 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 696 $self->SUPER::update;
612}
613
614sub render_chld {
615 my ($self) = @_;
616
617 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618 glClearColor 0, 0, 0, 1;
619 glClear GL_COLOR_BUFFER_BIT;
620 $self->child->draw;
621 };
622} 697}
623 698
624sub size_allocate { 699sub size_allocate {
625 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
626 701
627 $self->child->configure (0, 0, $w, $h); 702 $self->SUPER::size_allocate ($w, $h);
703 $self->update;
704}
628 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
629 $self->render_chld; 717 $self->_render;
718 };
630} 719}
631 720
632sub _draw { 721sub _draw {
633 my ($self) = @_; 722 my ($self) = @_;
634 723
635 my ($w, $h) = ($self->w, $self->h); 724 my ($w, $h) = ($self->w, $self->h);
636 725
637 my $tex = $self->{texture} 726 my $tex = $self->{texture}
638 or return; 727 or return;
639 728
640 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
643 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;
644 732
645 $tex->draw_quad (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646 734
647 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
649} 736}
650 737
651############################################################################# 738#############################################################################
652 739
653package CFClient::UI::ViewPort; 740package CFClient::UI::ViewPort;
654 741
655our @ISA = CFClient::UI::Window::; 742our @ISA = CFClient::UI::Window::;
656 743
657sub new { die }
658
659sub size_request { 744sub size_request {
660 my ($self) = @_; 745 my ($self) = @_;
661 746
662 @$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)};
663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
664 749
665 @$self{qw(child_w child_h)} 750 @$self{qw(child_w child_h)}
666} 751}
667 752
668sub _draw { 753sub size_allocate {
669 my ($self) = @_; 754 my ($self, $w, $h) = @_;
670 755
671 $self->{children}[1]->draw; 756 $self->update;
672} 757}
673 758
759sub set_offset {
760 my ($self, $x, $y) = @_;
761
762 $self->{view_x} = int $x;
763 $self->{view_y} = int $y;
764
765 $self->update;
766}
767
768# hmm, this does not work for topleft of $self... but we should not ask for that
769sub coord2local {
770 my ($self, $x, $y) = @_;
771
772 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
773}
774
775sub coord2global {
776 my ($self, $x, $y) = @_;
777
778 $x = List::Util::min $self->{w}, $x - $self->{view_x};
779 $y = List::Util::min $self->{h}, $y - $self->{view_y};
780
781 $self->SUPER::coord2global ($x, $y)
782}
783
784sub find_widget {
785 my ($self, $x, $y) = @_;
786
787 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
788 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
789 ) {
790 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
791 } else {
792 $self->CFClient::UI::Base::find_widget ($x, $y)
793 }
794}
795
796sub _render {
797 my ($self) = @_;
798
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800
801 $self->SUPER::_render;
802}
674 803
675############################################################################# 804#############################################################################
676 805
677package CFClient::UI::Frame; 806package CFClient::UI::ScrolledWindow;
678 807
679our @ISA = CFClient::UI::Bin::; 808our @ISA = CFClient::UI::HBox::;
680
681use CFClient::OpenGL;
682 809
683sub new { 810sub new {
684 my $class = shift; 811 my $class = shift;
685 812
813 my $self;
814
815 my $slider = new CFClient::UI::Slider
816 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
820 },
821 ;
822
686 my $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
687 bg => [1, 1, 1, 1], 824 vp => (new CFClient::UI::ViewPort expand => 1),
688 border_bg => [1, 1, 1, 1], 825 slider => $slider,
689 border => 0.8,
690 @_ 826 @_,
691 ); 827 );
692 828
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider});
832
693 $self 833 $self
694} 834}
695 835
836#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll
838
839#############################################################################
840
841package CFClient::UI::Frame;
842
843our @ISA = CFClient::UI::Bin::;
844
845use CFClient::OpenGL;
846
847sub new {
848 my $class = shift;
849
850 $class->SUPER::new (
851 bg => undef,
852 @_,
853 )
854}
855
696sub _draw { 856sub _draw {
697 my ($self) = @_; 857 my ($self) = @_;
698 858
699 my ($w, $h) = ($self->{w}, $self->{h}); 859 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)};
700 861
701 glEnable GL_BLEND; 862 glEnable GL_BLEND;
702 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
703 glEnable GL_TEXTURE_2D; 864 glColor @{ $self->{bg} };
704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705 865
706# glBegin GL_QUADS; 866 glBegin GL_QUADS;
707# glColor 0, 0, 0, 0;
708# glVertex 0 , 0; 867 glVertex 0 , 0;
709# glVertex 0 , $h; 868 glVertex 0 , $h;
710# glVertex $w, $h; 869 glVertex $w, $h;
711# glVertex $w, 0; 870 glVertex $w, 0;
712# glEnd; 871 glEnd;
713 872
714
715 $self->child->draw;
716 glDisable GL_BLEND; 873 glDisable GL_BLEND;
717 glDisable GL_TEXTURE_2D; 874 }
875
876 $self->SUPER::_draw;
718} 877}
719 878
720############################################################################# 879#############################################################################
721 880
722package CFClient::UI::FancyFrame; 881package CFClient::UI::FancyFrame;
… …
733 my $class = shift; 892 my $class = shift;
734 893
735 # TODO: user_x, user_y, overwrite moveto? 894 # TODO: user_x, user_y, overwrite moveto?
736 895
737 my $self = $class->SUPER::new ( 896 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 897 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 898 border_bg => [1, 1, 1, 1],
740 border => 0.8, 899 border => 0.6,
900 toplevel => 1,
741 can_events => 1, 901 can_events => 1,
742 @_ 902 @_
743 ); 903 );
744 904
745 $self->{title} &&= new CFClient::UI::Label 905 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 906 align => 0,
747 valign => 1, 907 valign => 1,
748 text => $self->{title}, 908 text => $self->{title},
749 fontsize => 1; 909 fontsize => $self->{border};
750 910
751 $self 911 $self
752} 912}
753 913
754sub border { 914sub border {
… …
770 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
771 931
772 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
773 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
774 934
775 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
776 if $self->{title}; 936 if $self->{title};
777 937
778 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
779} 939}
780 940
781sub button_down { 941sub button_down {
782 my ($self, $ev, $x, $y) = @_; 942 my ($self, $ev, $x, $y) = @_;
783 943
944 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 945 my $border = $self->border;
785 946
786 if ($x < $self->{w} && $x >= $self->{w} - $border 947 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 948 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 949
950 if ($lr & $td) {
951 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 952 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 953 my ($bw, $bh) = ($self->{w}, $self->{h});
791 954
955 my $mx = $x < $border;
956 my $my = $y < $border;
957
792 $self->{motion} = sub { 958 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 959 my ($ev, $x, $y) = @_;
794 960
795 ($x, $y) = ($ev->{x}, $ev->{y}); 961 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy;
796 963
797 $self->{user_w} = $bw + $x - $ox; 964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
799 $self->check_size; 967 $self->check_size;
800 }; 968 };
801 969
802 } elsif ($x >= 0 && $x < $self->{w} 970 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 971 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 972 my ($bx, $by) = ($self->{x}, $self->{y});
807 973
808 $self->{motion} = sub { 974 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 975 my ($ev, $x, $y) = @_;
… …
832 my ($self) = @_; 998 my ($self) = @_;
833 999
834 my ($w, $h ) = ($self->{w}, $self->{h}); 1000 my ($w, $h ) = ($self->{w}, $self->{h});
835 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
836 1002
837 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 1003 glEnable GL_TEXTURE_2D;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841 1005
842 my $border = $self->border; 1006 my $border = $self->border;
843 1007
844 glColor @{ $self->{border_bg} }; 1008 glColor @{ $self->{border_bg} };
845 $tex[1]->draw_quad (0, 0, $w, $border); 1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
849 1013
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850 my $bg = $tex[0]; 1015 my $bg = $tex[0];
851 1016
852 # TODO: repeat texture not scale 1017 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 1018 my $rep_x = $cw / $bg->{w};
854 my $rep_y = $ch / $bg->{h}; 1019 my $rep_y = $ch / $bg->{h};
855 1020
856 glColor @{ $self->{bg} }; 1021 glColor @{ $self->{bg} };
857 1022
858 $bg->{s} = $rep_x; 1023 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y; 1024 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1; 1025 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 }
862 1028
863 glDisable GL_TEXTURE_2D; 1029 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND;
865 1030
866 $self->{title}->draw if $self->{title}; 1031 $self->{title}->draw if $self->{title};
1032
867 $self->child->draw; 1033 $self->child->draw;
868} 1034}
869 1035
870############################################################################# 1036#############################################################################
871 1037
… …
893 $self->{children}[$y][$x] = $child; 1059 $self->{children}[$y][$x] = $child;
894 1060
895 $child->check_size; 1061 $child->check_size;
896} 1062}
897 1063
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
898# TODO: move to container class maybe? send childs a signal on removal? 1068# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 1069sub clear {
900 my ($self) = @_; 1070 my ($self) = @_;
901 1071
1072 my @children = $self->children;
902 delete $self->{children}; 1073 delete $self->{children};
1074
1075 for (@children) {
1076 delete $_->{parent};
1077 $_->hide;
1078 }
1079
903 $self->update; 1080 $self->update;
904} 1081}
905 1082
906sub get_wh { 1083sub get_wh {
907 my ($self) = @_; 1084 my ($self) = @_;
… …
1084} 1261}
1085 1262
1086sub size_allocate { 1263sub size_allocate {
1087 my ($self, $w, $h) = @_; 1264 my ($self, $w, $h) = @_;
1088 1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1089 my $children = $self->{children}; 1268 my $children = $self->{children};
1090 1269
1091 my @h = map $_->{req_h}, @$children; 1270 my @h = map $_->{req_h}, @$children;
1092 1271
1093 my $req_h = List::Util::sum @h; 1272 my $req_h = List::Util::sum @h;
… …
1122 1301
1123############################################################################# 1302#############################################################################
1124 1303
1125package CFClient::UI::Label; 1304package CFClient::UI::Label;
1126 1305
1127our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1128 1307
1129use CFClient::OpenGL; 1308use CFClient::OpenGL;
1130 1309
1131sub new { 1310sub new {
1132 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1133 1312
1134 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1136 #font => default_font 1317 #font => default_font
1318 #text => initial text
1319 #markup => initial narkup
1320 #max_w => maximum pixel width
1321 ellipsise => 3, # end
1322 layout => (new CFClient::Layout),
1137 fontsize => 1, 1323 fontsize => 1,
1138 text => "",
1139 align => -1, 1324 align => -1,
1140 valign => -1, 1325 valign => -1,
1141 padding => 2, 1326 padding => 2,
1142 layout => new CFClient::Layout,
1143 can_events => 0, 1327 can_events => 0,
1144 %arg 1328 %arg
1145 ); 1329 );
1146 1330
1147 if (exists $self->{template}) { 1331 if (exists $self->{template}) {
1148 my $layout = new CFClient::Layout; 1332 my $layout = new CFClient::Layout;
1149 $layout->set_text (delete $self->{template}); 1333 $layout->set_text (delete $self->{template});
1150 $self->{template} = $layout; 1334 $self->{template} = $layout;
1151 } 1335 }
1152 1336
1153 $self->set_text (delete $self->{text}) if exists $self->{text}; 1337 if (exists $self->{markup}) {
1154 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1338 $self->set_markup (delete $self->{markup});
1339 } else {
1340 $self->set_text (delete $self->{text});
1341 }
1155 1342
1156 $self 1343 $self
1157} 1344}
1158 1345
1159sub escape { 1346sub escape($) {
1160 local $_ = $_[1]; 1347 local $_ = $_[0];
1161 1348
1162 s/&/&amp;/g; 1349 s/&/&amp;/g;
1163 s/>/&gt;/g; 1350 s/>/&gt;/g;
1164 s/</&lt;/g; 1351 s/</&lt;/g;
1165 1352
1166 $_[1] 1353 $_
1354}
1355
1356sub update {
1357 my ($self) = @_;
1358
1359 delete $self->{texture};
1360 $self->SUPER::update;
1167} 1361}
1168 1362
1169sub set_text { 1363sub set_text {
1170 my ($self, $text) = @_; 1364 my ($self, $text) = @_;
1171 1365
1366 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text";
1368
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1172 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1173 1371
1174 delete $self->{texture}; 1372 $self->update;
1175 $self->check_size; 1373 $self->check_size;
1176 $self->update;
1177} 1374}
1178 1375
1179sub set_markup { 1376sub set_markup {
1180 my ($self, $markup) = @_; 1377 my ($self, $markup) = @_;
1181 1378
1379 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup";
1381
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1182 $self->{layout}->set_markup ($markup); 1385 $self->{layout}->set_markup ($markup);
1183 1386
1184 delete $self->{texture}; 1387 $self->update;
1185 $self->check_size; 1388 $self->check_size;
1186 $self->update;
1187} 1389}
1188 1390
1189sub size_request { 1391sub size_request {
1190 my ($self) = @_; 1392 my ($self) = @_;
1191 1393
1192 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $self->{layout}->set_width ($self->{max_w} || -1); 1395 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1194 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1195 1399
1196 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1197 1401
1198 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1220sub set_fontsize { 1424sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1425 my ($self, $fontsize) = @_;
1222 1426
1223 $self->{fontsize} = $fontsize; 1427 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1428 delete $self->{texture};
1429
1430 $self->update;
1225 $self->check_size; 1431 $self->check_size;
1226 $self->update;
1227} 1432}
1228 1433
1229sub _draw { 1434sub _draw {
1230 my ($self) = @_; 1435 my ($self) = @_;
1231 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1232 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1440 $self->{layout}->set_foreground (@{$self->{fg}});
1233 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1234 $self->{layout}->set_width ($self->{w}); 1442 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1235 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446
1236 new_from_layout CFClient::Texture $self->{layout} 1447 my $tex = new_from_layout CFClient::Texture $self->{layout};
1448
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5);
1452
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1455 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1237 }; 1458 };
1238 1459
1239 glEnable GL_BLEND;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
1242 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243 1462
1463 if ($tex->{format} == GL_ALPHA) {
1244 glColor @{$self->{fg}}; 1464 glColor @{$self->{fg}};
1245
1246 $self->{ox} = int (
1247 $self->{align} < 0 ? $self->{padding}
1248 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1249 : ($self->{w} - $tex->{w}) * 0.5
1250 );
1251
1252 $self->{oy} = int (
1253 $self->{valign} < 0 ? $self->{padding}
1254 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1255 : ($self->{h} - $tex->{h}) * 0.5
1256 );
1257
1258 $tex->draw_quad ($self->{ox}, $self->{oy}); 1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1466 } else {
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1468 }
1259 1469
1260 glDisable GL_TEXTURE_2D; 1470 glDisable GL_TEXTURE_2D;
1261 glDisable GL_BLEND;
1262} 1471}
1263 1472
1264############################################################################# 1473#############################################################################
1265 1474
1266package CFClient::UI::EntryBase; 1475package CFClient::UI::EntryBase;
… …
1271 1480
1272sub new { 1481sub new {
1273 my $class = shift; 1482 my $class = shift;
1274 1483
1275 $class->SUPER::new ( 1484 $class->SUPER::new (
1276 fg => [1, 1, 1], 1485 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1486 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1487 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1488 active_fg => [0, 0, 0],
1280 can_hover => 1, 1489 can_hover => 1,
1281 can_focus => 1, 1490 can_focus => 1,
1282 valign => 0, 1491 valign => 0,
1283 can_events => 1, 1492 can_events => 1,
1284 @_ 1493 @_
1285 ) 1494 )
1286} 1495}
1287 1496
… …
1301 $self->{layout}->set_text ("$text "); 1510 $self->{layout}->set_text ("$text ");
1302 1511
1303 $self->emit (changed => $self->{text}); 1512 $self->emit (changed => $self->{text});
1304} 1513}
1305 1514
1306sub get_text {
1307 $_[0]{text}
1308}
1309
1310sub size_request {
1311 my ($self) = @_;
1312
1313 my ($w, $h) = $self->SUPER::size_request;
1314
1315 ($w + 1, $h) # add 1 for cursor
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1322}
1323
1324sub set_text { 1515sub set_text {
1325 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1326 1517
1327 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1328 $self->_set_text ($text); 1519 $self->_set_text ($text);
1329 $self->update; 1520 $self->update;
1521 $self->check_size;
1522}
1523
1524sub get_text {
1525 $_[0]{text}
1526}
1527
1528sub size_request {
1529 my ($self) = @_;
1530
1531 my ($w, $h) = $self->SUPER::size_request;
1532
1533 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1330} 1540}
1331 1541
1332sub key_down { 1542sub key_down {
1333 my ($self, $ev) = @_; 1543 my ($self, $ev) = @_;
1334 1544
… …
1336 my $sym = $ev->{sym}; 1546 my $sym = $ev->{sym};
1337 my $uni = $ev->{unicode}; 1547 my $uni = $ev->{unicode};
1338 1548
1339 my $text = $self->get_text; 1549 my $text = $self->get_text;
1340 1550
1341 if ($sym == 8) { 1551 if ($uni == 8) {
1342 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1552 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343 } elsif ($sym == 127) { 1553 } elsif ($uni == 127) {
1344 substr $text, $self->{cursor}, 1, ""; 1554 substr $text, $self->{cursor}, 1, "";
1345 } elsif ($sym == CFClient::SDLK_LEFT) { 1555 } elsif ($sym == CFClient::SDLK_LEFT) {
1346 --$self->{cursor} if $self->{cursor}; 1556 --$self->{cursor} if $self->{cursor};
1347 } elsif ($sym == CFClient::SDLK_RIGHT) { 1557 } elsif ($sym == CFClient::SDLK_RIGHT) {
1348 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1558 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1349 } elsif ($sym == CFClient::SDLK_HOME) { 1559 } elsif ($sym == CFClient::SDLK_HOME) {
1350 $self->{cursor} = 0; 1560 $self->{cursor} = 0;
1351 } elsif ($sym == CFClient::SDLK_END) { 1561 } elsif ($sym == CFClient::SDLK_END) {
1352 $self->{cursor} = length $text; 1562 $self->{cursor} = length $text;
1353 } elsif ($sym == 27) { 1563 } elsif ($uni == 27) {
1354 $self->emit ('escape'); 1564 $self->emit ('escape');
1355 } elsif ($uni) { 1565 } elsif ($uni) {
1356 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1357 } 1567 }
1358 1568
1359 $self->_set_text ($text); 1569 $self->_set_text ($text);
1360 $self->update; 1570 $self->update;
1571 $self->check_size;
1361} 1572}
1362 1573
1363sub focus_in { 1574sub focus_in {
1364 my ($self) = @_; 1575 my ($self) = @_;
1365 1576
… …
1441 my ($self, $ev) = @_; 1652 my ($self, $ev) = @_;
1442 1653
1443 my $sym = $ev->{sym}; 1654 my $sym = $ev->{sym};
1444 1655
1445 if ($sym == 13) { 1656 if ($sym == 13) {
1657 unshift @{$self->{history}},
1658 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1661 $self->emit (activate => $txt);
1447 $self->update; 1662 $self->update;
1663
1664 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text;
1667 }
1668 if (@{$self->{history} || []} > 0) {
1669 $self->{history_pointer}++;
1670 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1671 $self->{history_pointer} = @{$self->{history} || []} - 1;
1672 }
1673 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1674 }
1675
1676 } elsif ($sym == CFClient::SDLK_DOWN) {
1677 $self->{history_pointer}--;
1678 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1679
1680 if ($self->{history_pointer} >= 0) {
1681 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1682 } else {
1683 $self->set_text ($self->{history_saveback});
1684 }
1448 1685
1449 } else { 1686 } else {
1450 $self->SUPER::key_down ($ev); 1687 $self->SUPER::key_down ($ev);
1451 } 1688 }
1452 1689
… …
1466 1703
1467sub new { 1704sub new {
1468 my $class = shift; 1705 my $class = shift;
1469 1706
1470 $class->SUPER::new ( 1707 $class->SUPER::new (
1471 padding => 4, 1708 padding => 4,
1472 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1475 can_hover => 1, 1711 can_hover => 1,
1476 align => 0, 1712 align => 0,
1477 valign => 0, 1713 valign => 0,
1478 can_events => 1, 1714 can_events => 1,
1479 @_ 1715 @_
1480 ) 1716 )
1481} 1717}
1482 1718
… …
1496 1732
1497 if ($GRAB == $self) { 1733 if ($GRAB == $self) {
1498 $self->{fg} = $self->{active_fg}; 1734 $self->{fg} = $self->{active_fg};
1499 } 1735 }
1500 1736
1501 glEnable GL_BLEND;
1502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503 glEnable GL_TEXTURE_2D; 1737 glEnable GL_TEXTURE_2D;
1504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505 glColor 0, 0, 0, 1; 1739 glColor 0, 0, 0, 1;
1506 1740
1507 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1741 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508 1742
1509 glDisable GL_TEXTURE_2D; 1743 glDisable GL_TEXTURE_2D;
1510 glDisable GL_BLEND;
1511 1744
1512 $self->SUPER::_draw; 1745 $self->SUPER::_draw;
1513} 1746}
1514 1747
1515############################################################################# 1748#############################################################################
… …
1529 1762
1530 $class->SUPER::new ( 1763 $class->SUPER::new (
1531 padding => 2, 1764 padding => 2,
1532 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1533 active_fg => [1, 1, 0], 1766 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5],
1534 state => 0, 1769 state => 0,
1535 can_hover => 1, 1770 can_hover => 1,
1536 @_ 1771 @_
1537 ) 1772 )
1538} 1773}
… …
1562 1797
1563 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1564 1799
1565 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566 1801
1567 glEnable GL_BLEND; 1802 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803
1568 glEnable GL_TEXTURE_2D; 1804 glEnable GL_TEXTURE_2D;
1569 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570
1571 my $tex = $self->{state} ? $tex[1] : $tex[0];
1572
1573 $tex->draw_quad (0, 0, $s, $s); 1805 $tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575 glDisable GL_TEXTURE_2D; 1806 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577} 1807}
1578 1808
1579############################################################################# 1809#############################################################################
1580 1810
1581package CFClient::UI::Image; 1811package CFClient::UI::Image;
… …
1624 glTranslate 0, -$self->{w}, 0; 1854 glTranslate 0, -$self->{w}, 0;
1625 1855
1626 ($w, $h) = ($h, $w); 1856 ($w, $h) = ($h, $w);
1627 } 1857 }
1628 1858
1629 glEnable GL_BLEND;
1630 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631 glEnable GL_TEXTURE_2D; 1859 glEnable GL_TEXTURE_2D;
1632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633 1861
1634 $tex->draw_quad (0, 0, $w, $h); 1862 $tex->draw_quad_alpha (0, 0, $w, $h);
1635 1863
1636 glDisable GL_BLEND;
1637 glDisable GL_TEXTURE_2D; 1864 glDisable GL_TEXTURE_2D;
1638} 1865}
1639 1866
1640############################################################################# 1867#############################################################################
1641 1868
… …
1689} 1916}
1690 1917
1691sub set_max { 1918sub set_max {
1692 my ($self, $max) = @_; 1919 my ($self, $max) = @_;
1693 1920
1921 return if $self->{max_val} == $max;
1922
1694 $self->{max_val} = $max; 1923 $self->{max_val} = $max;
1924 $self->update;
1695} 1925}
1696 1926
1697sub set_value { 1927sub set_value {
1698 my ($self, $val, $max) = @_; 1928 my ($self, $val, $max) = @_;
1699 1929
1700 $self->set_max ($max) 1930 $self->set_max ($max)
1701 if defined $max; 1931 if defined $max;
1702 1932
1703 $max = $self->{max_val}; 1933 return if $self->{val} == $val;
1934
1704 $self->{val} = $val; 1935 $self->{val} = $val;
1705
1706 $self->update; 1936 $self->update;
1707} 1937}
1708 1938
1709sub _draw { 1939sub _draw {
1710 my ($self) = @_; 1940 my ($self) = @_;
… …
1773 2003
1774sub new { 2004sub new {
1775 my ($class, %arg) = @_; 2005 my ($class, %arg) = @_;
1776 2006
1777 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 2008 tooltip => $arg{type},
2009 can_hover => 1,
1779 can_events => 1, 2010 can_events => 1,
1780 can_hover => 1,
1781 %arg, 2011 %arg,
1782 ); 2012 );
1783 2013
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2014 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2015 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 2023
1794 $self->{value}->set_fontsize ($fsize); 2024 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 2025 $self->{max} ->set_fontsize ($fsize);
1796} 2026}
1797 2027
2028sub set_max {
2029 my ($self, $max) = @_;
2030
2031 $self->{gauge}->set_max ($max);
2032 $self->{max}->set_text ($max);
2033}
2034
1798sub set_value { 2035sub set_value {
1799 my ($self, $val, $max) = @_; 2036 my ($self, $val, $max) = @_;
1800 2037
1801 $self->set_max ($max) 2038 $self->set_max ($max)
1802 if defined $max; 2039 if defined $max;
1803 2040
1804 $self->{gauge}->set_value ($val, $max); 2041 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 2042 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813} 2043}
1814 2044
1815############################################################################# 2045#############################################################################
1816 2046
1817package CFClient::UI::Slider; 2047package CFClient::UI::Slider;
… …
1827 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
1828 2058
1829sub new { 2059sub new {
1830 my $class = shift; 2060 my $class = shift;
1831 2061
1832 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
1833 2063
1834 # TODO: 0-width page 2064 # TODO: 0-width page
1835 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
1836 # TODO: calculations are off 2066 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 2069 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5],
1840 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
1841 req_w => 20, 2073 req_w => $::WIDTH / 80,
1842 req_h => 20, 2074 req_h => $::WIDTH / 80,
1843 vertical => 0, 2075 vertical => 0,
1844 can_hover => 1, 2076 can_hover => 1,
1845 inner_pad => 5, 2077 inner_pad => 0.02,
1846 @_ 2078 @_
1847 ); 2079 );
1848 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
1849 $self 2084 $self
2085}
2086
2087sub set_value {
2088 my ($self, $value) = @_;
2089
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091
2092 $hi = $lo + 1 if $hi <= $lo;
2093
2094 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi;
2096
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit;
2099
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103
2104 if ($value != $old_value) {
2105 $self->emit (changed => $value);
2106 $self->update;
2107 }
1850} 2108}
1851 2109
1852sub size_request { 2110sub size_request {
1853 my ($self) = @_; 2111 my ($self) = @_;
1854 2112
… …
1867 2125
1868sub mouse_motion { 2126sub mouse_motion {
1869 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
1870 2128
1871 if ($GRAB == $self) { 2129 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131
2132 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2135
2136 $self->set_value ($x * ($hi - $lo) + $lo);
2137 }
2138}
2139
2140sub update {
2141 my ($self) = @_;
2142
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144 $self->set_value ($self->{range}[0]);
2145
1872 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
1873 2147
1874 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
1875 2149
1876 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1877 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1878 2151
1879 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1880 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
1881 $x = $lo if $x < $lo;
1882 $x = $hi - $page if $x > $hi - $page;
1883 $self->{range}[0] = $x;
1884 2154
1885 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
1886 $self->update; 2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value;
2161 $self->{knob_w} = $page;
1887 } 2162 });
1888}
1889 2163
1890# the inner_* stuff is for generating a padding for the slider handle, 2164 $self->SUPER::update;
1891# so that the handle doesn't leave the texture. This calculation isn't 100%
1892# correct propably, but it does the job for now
1893sub _calc_inner_pad_px {
1894 my ($self, $w) = @_;
1895 ($w / 100) * $self->{inner_pad} # % to pixels
1896} 2165}
1897 2166
1898sub _draw { 2167sub _draw {
1899 my ($self) = @_; 2168 my ($self) = @_;
1900 2169
1901 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
1902 2171
1903 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
1904 2173
1905 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
1906 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
1907 2176
2177 glTranslate 1, 0, 0;
1908 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
1909 glTranslate 0, -$self->{w}, 0;
1910
1911 ($w, $h) = ($h, $w);
1912 } 2179 }
1913 2180
1914 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1915 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1916 2183
1917 my ($value, $lo, $hi, $page) = @{$self->{range}};
1918
1919 $hi = $value + 1 if $lo == $hi;
1920
1921 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1922 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1923
1924 $page = int $page * $inner_w / ($hi - $lo);
1925 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1926
1927 $w -= $page;
1928 $page &= ~1;
1929 glTranslate $page * 0.5, 0, 0;
1930 $page ||= 2;
1931
1932 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934
1935 glEnable GL_BLEND;
1936 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
1938 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939 2186
1940 # draw background 2187 # draw background
1941 $tex[1]->draw_quad (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1942 2189
1943 # draw handle 2190 # draw handle
1944 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1945 2192
1946 glDisable GL_BLEND;
1947 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
1948} 2194}
1949 2195
1950############################################################################# 2196#############################################################################
1951 2197
… …
1957 2203
1958sub new { 2204sub new {
1959 my $class = shift; 2205 my $class = shift;
1960 2206
1961 my $self = $class->SUPER::new ( 2207 my $self = $class->SUPER::new (
1962 fontsize => 1, 2208 fontsize => 1,
2209 can_events => 0,
1963 #font => default_font 2210 #font => default_font
1964 @_, 2211 @_,
1965 2212
1966 layout => (new CFClient::Layout), 2213 layout => (new CFClient::Layout 1),
1967 par => [], 2214 par => [],
1968 height => 0, 2215 height => 0,
1969 children => [ 2216 children => [
1970 (new CFClient::UI::Empty expand => 1), 2217 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2218 (new CFClient::UI::Slider vertical => 1),
1972 ], 2219 ],
1973 ); 2220 );
1974 2221
1975 $self->{children}[1]->connect (changed => sub { 2222 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2223
1979 $self 2224 $self
1980} 2225}
1981 2226
1982sub set_fontsize { 2227sub set_fontsize {
1983 my ($self, $fontsize) = @_; 2228 my ($self, $fontsize) = @_;
1984 2229
1985 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
1986 $self->reflow; 2231 $self->reflow;
1987}
1988
1989sub text_height {
1990 my ($self, $text) = @_;
1991
1992 my $layout = $self->{layout};
1993
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w});
1996 $layout->set_text ($text);
1997
1998 ($layout->size)[1]
1999}
2000
2001sub reflow {
2002 my ($self) = @_;
2003
2004 $self->{need_reflow}++;
2005 $self->update;
2006} 2232}
2007 2233
2008sub size_allocate { 2234sub size_allocate {
2009 my ($self, $w, $h) = @_; 2235 my ($self, $w, $h) = @_;
2010 2236
… …
2015 $self->{layout}->set_width ($self->{children}[0]{w}); 2241 $self->{layout}->set_width ($self->{children}[0]{w});
2016 2242
2017 $self->reflow; 2243 $self->reflow;
2018} 2244}
2019 2245
2246sub text_height {
2247 my ($self, $text, $indent) = @_;
2248
2249 my $layout = $self->{layout};
2250
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text);
2254
2255 ($layout->size)[1]
2256}
2257
2258sub reflow {
2259 my ($self) = @_;
2260
2261 $self->{need_reflow}++;
2262 $self->update;
2263}
2264
2020sub add_paragraph { 2265sub add_paragraph {
2021 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
2022 2267
2023 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2024 2269
2270 for my $line (split /\n/, $text) {
2025 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2026
2027 $self->{height} += $height; 2272 $self->{height} += $height;
2028
2029 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2030 2275
2031 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2032 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2033} 2278}
2034 2279
… …
2039 2284
2040 return unless $self->{h} > 0; 2285 return unless $self->{h} > 0;
2041 2286
2042 delete $self->{texture}; 2287 delete $self->{texture};
2043 2288
2044 $ROOT->on_refresh ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2045 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2046 my $height = 0; 2291 my $height = 0;
2047 2292
2048 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2049 for @{$self->{par}}; 2294 for @{$self->{par}};
2050 2295
2051 $self->{height} = $height; 2296 $self->{height} = $height;
2052 2297
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2299 $self->{children}[1]->update;
2054 2300
2055 delete $self->{texture}; 2301 delete $self->{texture};
2056 } 2302 }
2057 2303
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059 glClearColor 0, 0, 0, 1; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2061
2062 glEnable GL_BLEND;
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D;
2065 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066 2307
2067 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2068 2309
2069 my $y0 = $top; 2310 my $y0 = $top;
2070 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2073 2314
2074 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2075 2316
2076 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2077 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2078 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2079 my $h = $par->[0]; 2323 my $h = $par->[0];
2080 2324
2081 if ($y0 < $y + $h && $y < $y1) { 2325 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] });
2327 $layout->set_width ($self->{w} - $par->[2]);
2082 $layout->set_text ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2083 2329
2084 glColor @{ $par->[1] }; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2085 my ($W, $H) = $layout->size; 2331
2086 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2332 glRasterPos $par->[2], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2087 } 2334 }
2088 2335
2089 $y += $h; 2336 $y += $h;
2090 } 2337 }
2091 2338
2092 glDisable GL_TEXTURE_2D;
2093 glDisable GL_BLEND; 2339 glDisable GL_BLEND;
2094 }; 2340 };
2095 }); 2341 });
2096} 2342}
2097 2343
2098sub _draw { 2344sub _draw {
2099 my ($self) = @_; 2345 my ($self) = @_;
2100 2346
2101 if ($self->{texture}) {
2102 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2106 }
2107 2352
2108 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2109 2354
2110} 2355}
2111 2356
… …
2159 2404
2160sub new { 2405sub new {
2161 my $class = shift; 2406 my $class = shift;
2162 2407
2163 my $self = $class->SUPER::new ( 2408 my $self = $class->SUPER::new (
2164 state => 0, 2409 state => 0,
2165 connect_activate => \&toggle_flopper, 2410 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2411 @_
2168 ); 2412 );
2169 2413
2170 if ($self->{state}) { 2414 if ($self->{state}) {
2171 $self->{state} = 0; 2415 $self->{state} = 0;
… …
2206 @_, 2450 @_,
2207 can_events => 0, 2451 can_events => 0,
2208 ) 2452 )
2209} 2453}
2210 2454
2211sub set_markup { 2455sub set_tooltip_from {
2212 my ($self, $text) = @_; 2456 my ($self, $widget) = @_;
2213 2457
2214 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2458 $self->add (new CFClient::UI::Label
2215 $self->{label}->set_markup ($text); 2459 markup => $widget->{tooltip},
2216 $self->add ($self->{label}); 2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8,
2462 fg => [0, 0, 0, 1],
2463 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP),
2465 );
2217} 2466}
2218 2467
2219sub size_request { 2468sub size_request {
2220 my ($self) = @_; 2469 my ($self) = @_;
2221
2222 $self->child->set_max_size ($::WIDTH * 0.3);
2223 2470
2224 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2471 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225 2472
2226 ($w + 4, $h + 4) 2473 ($w + 4, $h + 4)
2227} 2474}
… …
2233} 2480}
2234 2481
2235sub _draw { 2482sub _draw {
2236 my ($self) = @_; 2483 my ($self) = @_;
2237 2484
2238 glPushMatrix;
2239 glTranslate 0.375, 0.375; 2485 glTranslate 0.375, 0.375;
2240 2486
2241 my ($w, $h) = @$self{qw(w h)}; 2487 my ($w, $h) = @$self{qw(w h)};
2242 2488
2243 glColor 1, 0.8, 0.4; 2489 glColor 1, 0.8, 0.4;
… …
2254 glVertex 0 , $h; 2500 glVertex 0 , $h;
2255 glVertex $w, $h; 2501 glVertex $w, $h;
2256 glVertex $w, 0; 2502 glVertex $w, 0;
2257 glEnd; 2503 glEnd;
2258 2504
2259 glPopMatrix; 2505 glTranslate 2 - 0.375, 2 - 0.375;
2260
2261 glTranslate 2, 2;
2262 $self->SUPER::_draw; 2506 $self->SUPER::_draw;
2263} 2507}
2264 2508
2265############################################################################# 2509#############################################################################
2266 2510
… …
2271use CFClient::OpenGL; 2515use CFClient::OpenGL;
2272 2516
2273sub new { 2517sub new {
2274 my $class = shift; 2518 my $class = shift;
2275 2519
2276 $class->SUPER::new ( 2520 my $self = $class->SUPER::new (
2277 aspect => 1, 2521 aspect => 1,
2278 @_, 2522 @_,
2279 ) 2523 );
2524
2525 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self);
2527
2528 $self->{timer} = Event->timer (
2529 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2530 hard => 1,
2531 interval => $self->{animspeed},
2532 cb => sub {
2533 ++$widget->{frame};
2534 $widget->update;
2535 },
2536 );
2537 }
2538
2539 $self
2280} 2540}
2281 2541
2282sub size_request { 2542sub size_request {
2283 (32, 8) 2543 (32, 8)
2284} 2544}
2285 2545
2546sub update {
2547 my ($self) = @_;
2548
2549 return unless $self->{visible};
2550
2551 $self->SUPER::update;
2552}
2553
2286sub draw { 2554sub _draw {
2287 my ($self) = @_; 2555 my ($self) = @_;
2288 2556
2557 return unless $::CONN;#d# manage and cache textures differently
2558
2559 my $face;
2560
2561 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}];
2563
2564 $face = $anim->[ $self->{frame} % @$anim ]
2565 if $anim && @$anim;
2566 }
2567
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2290 2569
2291 if ($tex) { 2570 if ($tex) {
2292 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2571 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2573 glColor 1, 1, 1, 1;
2297 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298 glDisable GL_TEXTURE_2D; 2575 glDisable GL_TEXTURE_2D;
2299 glDisable GL_BLEND;
2300 } 2576 }
2577}
2578
2579sub DESTROY {
2580 my ($self) = @_;
2581
2582 $self->{timer}->cancel
2583 if $self->{timer};
2584
2585 $self->SUPER::DESTROY;
2301} 2586}
2302 2587
2303############################################################################# 2588#############################################################################
2304 2589
2590package CFClient::UI::InventoryItem;
2591
2592our @ISA = CFClient::UI::HBox::;
2593
2594sub _item_to_desc {
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749}
2750
2751#############################################################################
2752
2753package CFClient::UI::Menu;
2754
2755our @ISA = CFClient::UI::FancyFrame::;
2756
2757use CFClient::OpenGL;
2758
2759sub new {
2760 my $class = shift;
2761
2762 my $self = $class->SUPER::new (
2763 items => [],
2764 z => 100,
2765 @_,
2766 );
2767
2768 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2769
2770 for my $item (@{ $self->{items} }) {
2771 my ($widget, $cb) = @$item;
2772
2773 # handle various types of items, only text for now
2774 if (!ref $widget) {
2775 $widget = new CFClient::UI::Label
2776 can_hover => 1,
2777 can_events => 1,
2778 text => $widget;
2779 }
2780
2781 $self->{item}{$widget} = $item;
2782
2783 $self->{vbox}->add ($widget);
2784 }
2785
2786 $self
2787}
2788
2789# popup given the event (must be a mouse button down event currently)
2790sub popup {
2791 my ($self, $ev) = @_;
2792
2793 $self->emit ("popdown");
2794
2795 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self;
2797 $self->{button} = $ev->{button};
2798
2799 $self->show;
2800 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2801}
2802
2803sub mouse_motion {
2804 my ($self, $ev, $x, $y) = @_;
2805
2806 # TODO: should use vbox->find_widget or so
2807 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808 $self->{hover} = $self->{item}{$HOVER};
2809}
2810
2811sub button_up {
2812 my ($self, $ev, $x, $y) = @_;
2813
2814 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB;
2816 $self->hide;
2817
2818 $self->emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover};
2820 }
2821}
2822
2823#############################################################################
2824
2825package CFClient::UI::Statusbox;
2826
2827our @ISA = CFClient::UI::VBox::;
2828
2829sub new {
2830 my $class = shift;
2831
2832 $class->SUPER::new (
2833 fontsize => 0.8,
2834 @_,
2835 )
2836}
2837
2838sub reorder {
2839 my ($self) = @_;
2840 my $NOW = time;
2841
2842 while (my ($k, $v) = each %{ $self->{item} }) {
2843 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2844 }
2845
2846 my @widgets;
2847
2848 my @items = sort {
2849 $a->{pri} <=> $b->{pri}
2850 or $b->{id} <=> $a->{id}
2851 } values %{ $self->{item} };
2852
2853 my $count = 10 + 1;
2854 for my $item (@items) {
2855 last unless --$count;
2856
2857 push @widgets, $item->{label} ||= do {
2858 # TODO: doesn't handle markup well (read as: at all)
2859 my $short = $item->{count} > 1
2860 ? "<b>$item->{count} ×</b> $item->{text}"
2861 : $item->{text};
2862
2863 for ($short) {
2864 s/^\s+//;
2865 s/\s+/ /g;
2866 }
2867
2868 new CFClient::UI::Label
2869 markup => $short,
2870 tooltip => $item->{tooltip},
2871 tooltip_font => $::FONT_PROP,
2872 tooltip_width => 0.67,
2873 fontsize => $item->{fontsize} || $self->{fontsize},
2874 max_w => $::WIDTH * 0.44,
2875 fg => $item->{fg},
2876 can_events => 1,
2877 can_hover => 1
2878 };
2879 }
2880
2881 $self->clear;
2882 $self->SUPER::add (reverse @widgets);
2883}
2884
2885sub add {
2886 my ($self, $text, %arg) = @_;
2887
2888 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//;
2890
2891 my $timeout = time + ((delete $arg{timeout}) || 60);
2892
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894
2895 if (my $item = $self->{item}{$group}) {
2896 if ($item->{text} eq $text) {
2897 $item->{count}++;
2898 } else {
2899 $item->{count} = 1;
2900 $item->{text} = $item->{tooltip} = $text;
2901 }
2902 $item->{id} = ++$self->{id};
2903 $item->{timeout} = $timeout;
2904 delete $item->{label};
2905 } else {
2906 $self->{item}{$group} = {
2907 id => ++$self->{id},
2908 text => $text,
2909 timeout => $timeout,
2910 tooltip => $text,
2911 fg => [0.8, 0.8, 0.8, 0.8],
2912 pri => 0,
2913 count => 1,
2914 %arg,
2915 };
2916 }
2917
2918 $self->reorder;
2919}
2920
2921sub reconfigure {
2922 my ($self) = @_;
2923
2924 delete $_->{label}
2925 for values %{ $self->{item} || {} };
2926
2927 $self->reorder;
2928 $self->SUPER::reconfigure;
2929}
2930
2931#############################################################################
2932
2305package CFClient::UI::Root; 2933package CFClient::UI::Root;
2306 2934
2307our @ISA = CFClient::UI::Container::; 2935our @ISA = CFClient::UI::Container::;
2308 2936
2309use CFClient::OpenGL; 2937use CFClient::OpenGL;
2310 2938
2311sub check_size { 2939sub new {
2312 my ($self) = @_; 2940 my $class = shift;
2313 2941
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2942 $class->SUPER::new (
2315} 2943 @_,
2316 2944 )
2317sub size_request {
2318 ($::WIDTH, $::HEIGHT)
2319} 2945}
2320 2946
2321sub configure { 2947sub configure {
2322 my ($self, $x, $y, $w, $h) = @_; 2948 my ($self, $x, $y, $w, $h) = @_;
2323 2949
2324 $self->SUPER::configure ($x, $y, $w, $h); 2950 $self->{w} = $w;
2951 $self->{h} = $h;
2952}
2325 2953
2954sub check_size {
2955 my ($self) = @_;
2956
2957 $self->size_allocate ($self->{w}, $self->{h})
2958 if $self->{w};
2959}
2960
2961sub size_request {
2962 my ($self) = @_;
2963
2964 ($self->{w}, $self->{h})
2965}
2966
2967sub size_allocate {
2968 my ($self, $w, $h) = @_;
2969
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2326 for my $child (@{$self->{children}}) { 2976 for my $child ($self->children) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328 2978
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2980 if exists $child->{req_x};
2981
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2983 if exists $child->{req_y};
2984
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987
2331 $child->configure ($X, $Y, $W,$H); 2988 $child->configure ($X, $Y, $W, $H);
2332 } 2989 }
2333} 2990}
2334 2991
2335sub _topleft { 2992sub coord2local {
2336 my ($self, $x, $y) = @_; 2993 my ($self, $x, $y) = @_;
2337 2994
2338 ($x, $y) 2995 ($x, $y)
2339} 2996}
2340 2997
2998sub coord2global {
2999 my ($self, $x, $y) = @_;
3000
3001 ($x, $y)
3002}
3003
2341sub update { 3004sub update {
2342 my ($self) = @_; 3005 my ($self) = @_;
2343 3006
2344 $self->check_size; 3007 $self->check_size;
2345 ::refresh (); 3008 $::WANT_REFRESH++;
2346} 3009}
2347 3010
2348sub add { 3011sub add {
2349 my ($self, $child) = @_; 3012 my ($self, @children) = @_;
2350 3013
3014 for my $child (@children) {
3015 $child->{toplevel} = 1;
3016
2351 # integerize window positions 3017 # integerise window positions
2352 $child->{x} = int $child->{x}; 3018 $child->{x} = int $child->{x};
2353 $child->{y} = int $child->{y}; 3019 $child->{y} = int $child->{y};
3020 }
2354 3021
2355 $self->SUPER::add ($child); 3022 $self->SUPER::add (@children);
3023
3024 while (@children) {
3025 my $w = pop @children;
3026 push @children, $w->children;
3027 $w->{visible} = 1;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 }
2356} 3041}
2357 3042
2358sub on_refresh { 3043sub on_refresh {
2359 my ($self, $id, $cb) = @_; 3044 my ($self, $id, $cb) = @_;
2360 3045
2361 $self->{refresh_hook}{$id} = $cb; 3046 $self->{refresh_hook}{$id} = $cb;
2362} 3047}
2363 3048
3049sub on_post_alloc {
3050 my ($self, $id, $cb) = @_;
3051
3052 $self->{post_alloc_hook}{$id} = $cb;
3053}
3054
2364sub draw { 3055sub draw {
2365 my ($self) = @_; 3056 my ($self) = @_;
2366 3057
2367 while (my $rcb = delete $self->{refresh_hook}) { 3058 while ($self->{refresh_hook}) {
2368 $_->() for values %$rcb; 3059 $_->()
3060 for values %{delete $self->{refresh_hook}};
3061 }
3062
3063 if ($self->{check_size}) {
3064 my @queue = ([], []);
3065
3066 for (;;) {
3067 if ($self->{check_size}) {
3068 # heuristic: check containers last
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3070 for values %{delete $self->{check_size}}
3071 }
3072
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3074
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3076 ? @$widget{qw(user_w user_h)}
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082
3083 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h;
3085
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3087
3088 $widget->{parent}->check_size
3089 if $widget->{parent};
3090 }
3091 }
3092 }
3093
3094 while ($self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) {
3096 my ($widget, $w, $h) = @$_;
3097
3098 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0;
3100
3101 $widget->{w} = $w;
3102 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h);
3104 $widget->emit (size_allocate => $w, $h);
3105 }
3106 }
3107
3108 while ($self->{post_alloc_hook}) {
3109 $_->()
3110 for values %{delete $self->{post_alloc_hook}};
2369 } 3111 }
2370 3112
2371 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3113 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373 glClear GL_COLOR_BUFFER_BIT; 3115 glClear GL_COLOR_BUFFER_BIT;
2374 3116
2375 glMatrixMode GL_PROJECTION; 3117 glMatrixMode GL_PROJECTION;
2376 glLoadIdentity; 3118 glLoadIdentity;
2377 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2378 glMatrixMode GL_MODELVIEW; 3120 glMatrixMode GL_MODELVIEW;
2379 glLoadIdentity; 3121 glLoadIdentity;
2380 3122
2381 $self->_draw; 3123 $self->_draw;
2382} 3124}
… …
2384############################################################################# 3126#############################################################################
2385 3127
2386package CFClient::UI; 3128package CFClient::UI;
2387 3129
2388$ROOT = new CFClient::UI::Root; 3130$ROOT = new CFClient::UI::Root;
2389$TOOLTIP = new CFClient::UI::Tooltip; 3131$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2390 3132
23911 31331
2392 3134

Diff Legend

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