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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.221 by root, Mon May 22 03:48:50 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
… …
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
15 16
17our %WIDGET; # all widgets, weak-referenced
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 (exists $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
20 23
21 if ($TOOLTIP->{owner} != $widget) { 24 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 25 $TOOLTIP->{owner} = $widget;
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
202sub destroy {
203 my ($self) = @_;
204
205 $self->hide;
206 %$self = ();
207}
208
147sub show { 209sub show {
148 my ($self) = @_; 210 my ($self) = @_;
149 211
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
150 return if $self->{parent}; 218 return if $self->{parent};
151 219
152 $CFClient::UI::ROOT->add ($self); 220 $CFClient::UI::ROOT->add ($self);
153} 221}
154 222
155sub hide { 223sub hide {
156 my ($self) = @_; 224 my ($self) = @_;
157 225
158 return unless $self->{parent}; 226 for (my @w = $self; @w; ) {
227 my $w = pop @w;
228 push @w, $w->children;
229 $w->{visible} = 1;
230 }
159 231
232 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self;
234
160 $self->{parent}->remove ($self); 235 $self->{parent}->remove ($self)
236 if $self->{parent};
161} 237}
162 238
163sub move { 239sub move {
164 my ($self, $x, $y, $z) = @_; 240 my ($self, $x, $y, $z) = @_;
165 241
… …
204 $self->{y} = $y; 280 $self->{y} = $y;
205 $self->update; 281 $self->update;
206 } 282 }
207 283
208 if ($self->{w} != $w || $self->{h} != $h) { 284 if ($self->{w} != $w || $self->{h} != $h) {
209 $self->{w} = $w; 285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
210 $self->{h} = $h;
211
212 $self->size_allocate ($w, $h);
213 $self->update;
214 } 286 }
215} 287}
216 288
217sub size_allocate { 289sub size_allocate {
218 # nothing to be done 290 # nothing to be done
219} 291}
220 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children {
301}
302
221sub set_max_size { 303sub set_max_size {
222 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
223 305
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
226} 308}
227 309
228# return top left coordinates 310sub set_tooltip {
229sub _topleft {
230 my ($self, $x, $y) = @_; 311 my ($self, $tooltip) = @_;
231 312
232 $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 }
233} 319}
234 320
235# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
236sub coord2local { 322sub coord2local {
237 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
238 324
239 my ($X, $Y) = $self->_topleft; 325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240 ($x - $X, $y - $Y)
241} 326}
242 327
243# translate local coordinates to global coordinate system 328# translate local coordinates to global coordinate system
244sub coord2global { 329sub coord2global {
245 my ($self, $x, $y) = @_; 330 my ($self, $x, $y) = @_;
246 331
247 my ($X, $Y) = $self->_topleft; 332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248 ($x + $X, $y + $Y)
249} 333}
250 334
251sub focus_in { 335sub focus_in {
252 my ($self) = @_; 336 my ($self) = @_;
253 337
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 397 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 398 glVertex $x , $y + $self->{h};
315 glEnd; 399 glEnd;
316 glDisable GL_BLEND; 400 glDisable GL_BLEND;
317 } 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 }
318} 416}
319 417
320sub _draw { 418sub _draw {
321 my ($self) = @_; 419 my ($self) = @_;
322 420
… …
337 435
338sub set_parent { 436sub set_parent {
339 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
340 438
341 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;
342} 446}
343 447
344sub check_size { 448sub check_size {
345 my ($self) = @_; 449 my ($self, $forced) = @_;
346 450
347 $self->{parent} 451 $self->{force_alloc} = 1 if $forced;
348 or return 1; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
349
350 my ($w, $h) = $self->{user_w} && $self->{user_h}
351 ? @$self{qw(user_w user_h)}
352 : $self->size_request;
353
354 if ($w != $self->{req_w} || $h != $self->{req_h}) {
355 $self->{req_w} = $w;
356 $self->{req_h} = $h;
357
358 $self->{parent}->check_size
359 or $self->size_allocate (
360 (List::Util::max $self->{w}, $w),
361 (List::Util::max $self->{h}, $h),
362 );
363
364 1
365 } else {
366 0
367 }
368} 453}
369 454
370sub update { 455sub update {
371 my ($self) = @_; 456 my ($self) = @_;
372 457
… …
381} 466}
382 467
383sub emit { 468sub emit {
384 my ($self, $signal, @args) = @_; 469 my ($self, $signal, @args) = @_;
385 470
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
387 $cb->($self, @args);
388 }
389} 472}
390 473
391sub DESTROY { 474sub DESTROY {
392 my ($self) = @_; 475 my ($self) = @_;
393 476
477 delete $WIDGET{$self+0};
394 #$self->deactivate; 478 #$self->deactivate;
395} 479}
396 480
397############################################################################# 481#############################################################################
398 482
… …
407 my $class = shift; 491 my $class = shift;
408 492
409 # range [value, low, high, page] 493 # range [value, low, high, page]
410 494
411 $class->SUPER::new ( 495 $class->SUPER::new (
412 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
413 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
414 @_ 498 @_
415 ) 499 )
416} 500}
417 501
418sub _draw { 502sub _draw {
419 my ($self) = @_; 503 my ($self) = @_;
420 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
421 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
422 511
423 glEnable GL_BLEND; 512 glEnable GL_BLEND;
424 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
425 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
426 515
427 glBegin GL_QUADS; 516 glBegin GL_QUADS;
428 glVertex 0 , 0; 517 glVertex 0 , 0;
429 glVertex 0 , $h; 518 glVertex 0 , $h;
430 glVertex $w, $h; 519 glVertex $w, $h;
431 glVertex $w, 0; 520 glVertex $w, 0;
432 glEnd; 521 glEnd;
433 522
434 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
435} 525}
436 526
437############################################################################# 527#############################################################################
438 528
439package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
460sub new { 550sub new {
461 my ($class, %arg) = @_; 551 my ($class, %arg) = @_;
462 552
463 my $children = delete $arg{children} || []; 553 my $children = delete $arg{children} || [];
464 554
465 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 );
466 $self->add ($_) for @$children; 560 $self->add ($_) for @$children;
467 561
468 $self 562 $self
469} 563}
470 564
471sub add { 565sub add {
472 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
473 567
474 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
475 570
476 use sort 'stable'; 571 use sort 'stable';
477 572
478 $self->{children} = [ 573 $self->{children} = [
479 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
480 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
481 ]; 576 ];
482 577
483 $child->check_size; 578 $self->check_size (1);
579 $self->update;
580}
581
582sub children {
583 @{ $_[0]{children} }
484} 584}
485 585
486sub remove { 586sub remove {
487 my ($self, $child) = @_; 587 my ($self, $child) = @_;
488 588
489 delete $child->{parent}; 589 delete $child->{parent};
590 $child->hide;
490 591
491 $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 }
492 608
493 $self->check_size; 609 $self->check_size;
494 $self->update; 610 $self->update;
495} 611}
496 612
… …
574} 690}
575 691
576sub update { 692sub update {
577 my ($self) = @_; 693 my ($self) = @_;
578 694
579 # we want to do this delayed... 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 696 $self->SUPER::update;
582}
583
584sub render_chld {
585 my ($self) = @_;
586
587 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588 glClearColor 0, 0, 0, 1;
589 glClear GL_COLOR_BUFFER_BIT;
590 $self->child->draw;
591 };
592} 697}
593 698
594sub size_allocate { 699sub size_allocate {
595 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
596 701
597 $self->child->configure (0, 0, $w, $h); 702 $self->SUPER::size_allocate ($w, $h);
703 $self->update;
704}
598 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
599 $self->render_chld; 717 $self->_render;
718 };
600} 719}
601 720
602sub _draw { 721sub _draw {
603 my ($self) = @_; 722 my ($self) = @_;
604 723
605 my ($w, $h) = ($self->w, $self->h); 724 my ($w, $h) = ($self->w, $self->h);
606 725
607 my $tex = $self->{texture} 726 my $tex = $self->{texture}
608 or return; 727 or return;
609 728
610 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
613 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;
614 732
615 $tex->draw_quad (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616 734
617 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
619} 736}
620 737
621############################################################################# 738#############################################################################
622 739
623package CFClient::UI::ViewPort; 740package CFClient::UI::ViewPort;
624 741
625our @ISA = CFClient::UI::Window::; 742our @ISA = CFClient::UI::Window::;
626 743
627sub new { die }
628
629sub size_request { 744sub size_request {
630 my ($self) = @_; 745 my ($self) = @_;
631 746
632 @$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)};
633 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
634 749
635 @$self{qw(child_w child_h)} 750 @$self{qw(child_w child_h)}
636} 751}
637 752
638sub _draw { 753sub size_allocate {
639 my ($self) = @_; 754 my ($self, $w, $h) = @_;
640 755
641 $self->{children}[1]->draw; 756 $self->update;
642} 757}
643 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}
644 803
645############################################################################# 804#############################################################################
646 805
647package CFClient::UI::Frame; 806package CFClient::UI::ScrolledWindow;
648 807
649our @ISA = CFClient::UI::Bin::; 808our @ISA = CFClient::UI::HBox::;
650
651use CFClient::OpenGL;
652 809
653sub new { 810sub new {
654 my $class = shift; 811 my $class = shift;
655 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
656 my $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
657 bg => [1, 1, 1, 1], 824 vp => (new CFClient::UI::ViewPort expand => 1),
658 border_bg => [1, 1, 1, 1], 825 slider => $slider,
659 border => 0.8,
660 @_ 826 @_,
661 ); 827 );
662 828
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider});
832
663 $self 833 $self
664} 834}
665 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
666sub _draw { 856sub _draw {
667 my ($self) = @_; 857 my ($self) = @_;
668 858
669 my ($w, $h) = ($self->{w}, $self->{h}); 859 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)};
670 861
671 glEnable GL_BLEND; 862 glEnable GL_BLEND;
672 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 864 glColor @{ $self->{bg} };
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 865
676# glBegin GL_QUADS; 866 glBegin GL_QUADS;
677# glColor 0, 0, 0, 0;
678# glVertex 0 , 0; 867 glVertex 0 , 0;
679# glVertex 0 , $h; 868 glVertex 0 , $h;
680# glVertex $w, $h; 869 glVertex $w, $h;
681# glVertex $w, 0; 870 glVertex $w, 0;
682# glEnd; 871 glEnd;
683 872
684
685 $self->child->draw;
686 glDisable GL_BLEND; 873 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 874 }
875
876 $self->SUPER::_draw;
688} 877}
689 878
690############################################################################# 879#############################################################################
691 880
692package CFClient::UI::FancyFrame; 881package CFClient::UI::FancyFrame;
… …
703 my $class = shift; 892 my $class = shift;
704 893
705 # TODO: user_x, user_y, overwrite moveto? 894 # TODO: user_x, user_y, overwrite moveto?
706 895
707 my $self = $class->SUPER::new ( 896 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 897 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 898 border_bg => [1, 1, 1, 1],
710 border => 0.8, 899 border => 0.6,
900 toplevel => 1,
711 can_events => 1, 901 can_events => 1,
712 @_ 902 @_
713 ); 903 );
714 904
715 $self->{title} &&= new CFClient::UI::Label 905 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 906 align => 0,
717 valign => 1, 907 valign => 1,
718 text => $self->{title}, 908 text => $self->{title},
719 fontsize => 1; 909 fontsize => $self->{border};
720 910
721 $self 911 $self
722} 912}
723 913
724sub border { 914sub border {
… …
740 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
741 931
742 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
743 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
744 934
745 $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)
746 if $self->{title}; 936 if $self->{title};
747 937
748 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
749} 939}
750 940
751sub button_down { 941sub button_down {
752 my ($self, $ev, $x, $y) = @_; 942 my ($self, $ev, $x, $y) = @_;
753 943
944 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 945 my $border = $self->border;
755 946
756 if ($x < $self->{w} && $x >= $self->{w} - $border 947 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 948 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 949
950 if ($lr & $td) {
951 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 952 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 953 my ($bw, $bh) = ($self->{w}, $self->{h});
761 954
955 my $mx = $x < $border;
956 my $my = $y < $border;
957
762 $self->{motion} = sub { 958 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 959 my ($ev, $x, $y) = @_;
764 960
765 ($x, $y) = ($ev->{x}, $ev->{y}); 961 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy;
766 963
767 $self->{user_w} = $bw + $x - $ox; 964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
768 $self->{user_h} = $bh + $y - $oy; 965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
769 $self->check_size; 967 $self->check_size;
770 }; 968 };
771 969
772 } elsif ($x >= 0 && $x < $self->{w} 970 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 971 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 972 my ($bx, $by) = ($self->{x}, $self->{y});
777 973
778 $self->{motion} = sub { 974 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 975 my ($ev, $x, $y) = @_;
… …
802 my ($self) = @_; 998 my ($self) = @_;
803 999
804 my ($w, $h ) = ($self->{w}, $self->{h}); 1000 my ($w, $h ) = ($self->{w}, $self->{h});
805 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806 1002
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 1003 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811 1005
812 my $border = $self->border; 1006 my $border = $self->border;
813 1007
814 glColor @{ $self->{border_bg} }; 1008 glColor @{ $self->{border_bg} };
815 $tex[1]->draw_quad (0, 0, $w, $border); 1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
819 1013
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820 my $bg = $tex[0]; 1015 my $bg = $tex[0];
821 1016
822 # TODO: repeat texture not scale 1017 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 1018 my $rep_x = $cw / $bg->{w};
824 my $rep_y = $ch / $bg->{h}; 1019 my $rep_y = $ch / $bg->{h};
825 1020
826 glColor @{ $self->{bg} }; 1021 glColor @{ $self->{bg} };
827 1022
828 $bg->{s} = $rep_x; 1023 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y; 1024 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1; 1025 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 }
832 1028
833 glDisable GL_TEXTURE_2D; 1029 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND;
835 1030
836 $self->{title}->draw if $self->{title}; 1031 $self->{title}->draw if $self->{title};
1032
837 $self->child->draw; 1033 $self->child->draw;
838} 1034}
839 1035
840############################################################################# 1036#############################################################################
841 1037
… …
863 $self->{children}[$y][$x] = $child; 1059 $self->{children}[$y][$x] = $child;
864 1060
865 $child->check_size; 1061 $child->check_size;
866} 1062}
867 1063
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
868# 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?
869sub clear { 1069sub clear {
870 my ($self) = @_; 1070 my ($self) = @_;
871 1071
1072 my @children = $self->children;
872 delete $self->{children}; 1073 delete $self->{children};
1074
1075 for (@children) {
1076 delete $_->{parent};
1077 $_->hide;
1078 }
1079
873 $self->update; 1080 $self->update;
874} 1081}
875 1082
876sub get_wh { 1083sub get_wh {
877 my ($self) = @_; 1084 my ($self) = @_;
… …
1054} 1261}
1055 1262
1056sub size_allocate { 1263sub size_allocate {
1057 my ($self, $w, $h) = @_; 1264 my ($self, $w, $h) = @_;
1058 1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1059 my $children = $self->{children}; 1268 my $children = $self->{children};
1060 1269
1061 my @h = map $_->{req_h}, @$children; 1270 my @h = map $_->{req_h}, @$children;
1062 1271
1063 my $req_h = List::Util::sum @h; 1272 my $req_h = List::Util::sum @h;
… …
1092 1301
1093############################################################################# 1302#############################################################################
1094 1303
1095package CFClient::UI::Label; 1304package CFClient::UI::Label;
1096 1305
1097our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1098 1307
1099use CFClient::OpenGL; 1308use CFClient::OpenGL;
1100 1309
1101sub new { 1310sub new {
1102 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1103 1312
1104 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1106 #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),
1107 fontsize => 1, 1323 fontsize => 1,
1108 text => "",
1109 align => -1, 1324 align => -1,
1110 valign => -1, 1325 valign => -1,
1111 padding => 2, 1326 padding => 2,
1112 layout => new CFClient::Layout,
1113 can_events => 0, 1327 can_events => 0,
1114 %arg 1328 %arg
1115 ); 1329 );
1116 1330
1117 if (exists $self->{template}) { 1331 if (exists $self->{template}) {
1118 my $layout = new CFClient::Layout; 1332 my $layout = new CFClient::Layout;
1119 $layout->set_text (delete $self->{template}); 1333 $layout->set_text (delete $self->{template});
1120 $self->{template} = $layout; 1334 $self->{template} = $layout;
1121 } 1335 }
1122 1336
1123 $self->set_text (delete $self->{text}) if exists $self->{text}; 1337 if (exists $self->{markup}) {
1124 $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 }
1125 1342
1126 $self 1343 $self
1127} 1344}
1128 1345
1129sub escape_text { 1346sub escape($) {
1130 local $_ = $_[1]; 1347 local $_ = $_[0];
1131 1348
1132 s/&/&amp;/g; 1349 s/&/&amp;/g;
1133 s/>/&gt;/g; 1350 s/>/&gt;/g;
1134 s/</&lt;/g; 1351 s/</&lt;/g;
1135 1352
1136 $_[1] 1353 $_
1354}
1355
1356sub update {
1357 my ($self) = @_;
1358
1359 delete $self->{texture};
1360 $self->SUPER::update;
1137} 1361}
1138 1362
1139sub set_text { 1363sub set_text {
1140 my ($self, $text) = @_; 1364 my ($self, $text) = @_;
1141 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;
1142 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1143 1371
1144 delete $self->{texture}; 1372 $self->update;
1145 $self->check_size; 1373 $self->check_size;
1146 $self->update;
1147} 1374}
1148 1375
1149sub set_markup { 1376sub set_markup {
1150 my ($self, $markup) = @_; 1377 my ($self, $markup) = @_;
1151 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;
1152 $self->{layout}->set_markup ($markup); 1385 $self->{layout}->set_markup ($markup);
1153 1386
1154 delete $self->{texture}; 1387 $self->update;
1155 $self->check_size; 1388 $self->check_size;
1156 $self->update;
1157} 1389}
1158 1390
1159sub size_request { 1391sub size_request {
1160 my ($self) = @_; 1392 my ($self) = @_;
1161 1393
1162 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1163 $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});
1164 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165 1399
1166 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1167 1401
1168 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
… …
1190sub set_fontsize { 1424sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1425 my ($self, $fontsize) = @_;
1192 1426
1193 $self->{fontsize} = $fontsize; 1427 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1428 delete $self->{texture};
1429
1430 $self->update;
1195 $self->check_size; 1431 $self->check_size;
1196 $self->update;
1197} 1432}
1198 1433
1199sub _draw { 1434sub _draw {
1200 my ($self) = @_; 1435 my ($self) = @_;
1201 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1202 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1440 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $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});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446
1206 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
1207 }; 1458 };
1208 1459
1209 glEnable GL_BLEND;
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1462
1463 if ($tex->{format} == GL_ALPHA) {
1214 glColor @{$self->{fg}}; 1464 glColor @{$self->{fg}};
1215
1216 $self->{ox} = int (
1217 $self->{align} < 0 ? $self->{padding}
1218 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219 : ($self->{w} - $tex->{w}) * 0.5
1220 );
1221
1222 $self->{oy} = int (
1223 $self->{valign} < 0 ? $self->{padding}
1224 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225 : ($self->{h} - $tex->{h}) * 0.5
1226 );
1227
1228 $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 }
1229 1469
1230 glDisable GL_TEXTURE_2D; 1470 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1471}
1233 1472
1234############################################################################# 1473#############################################################################
1235 1474
1236package CFClient::UI::EntryBase; 1475package CFClient::UI::EntryBase;
… …
1241 1480
1242sub new { 1481sub new {
1243 my $class = shift; 1482 my $class = shift;
1244 1483
1245 $class->SUPER::new ( 1484 $class->SUPER::new (
1246 fg => [1, 1, 1], 1485 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1486 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1487 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1488 active_fg => [0, 0, 0],
1250 can_hover => 1, 1489 can_hover => 1,
1251 can_focus => 1, 1490 can_focus => 1,
1252 valign => 0, 1491 valign => 0,
1253 can_events => 1, 1492 can_events => 1,
1254 @_ 1493 @_
1255 ) 1494 )
1256} 1495}
1257 1496
… …
1271 $self->{layout}->set_text ("$text "); 1510 $self->{layout}->set_text ("$text ");
1272 1511
1273 $self->emit (changed => $self->{text}); 1512 $self->emit (changed => $self->{text});
1274} 1513}
1275 1514
1276sub get_text {
1277 $_[0]{text}
1278}
1279
1280sub size_request {
1281 my ($self) = @_;
1282
1283 my ($w, $h) = $self->SUPER::size_request;
1284
1285 ($w + 1, $h) # add 1 for cursor
1286}
1287
1288sub size_allocate {
1289 my ($self, $w, $h) = @_;
1290
1291 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292}
1293
1294sub set_text { 1515sub set_text {
1295 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1296 1517
1297 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1298 $self->_set_text ($text); 1519 $self->_set_text ($text);
1299 $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
1300} 1540}
1301 1541
1302sub key_down { 1542sub key_down {
1303 my ($self, $ev) = @_; 1543 my ($self, $ev) = @_;
1304 1544
… …
1306 my $sym = $ev->{sym}; 1546 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1547 my $uni = $ev->{unicode};
1308 1548
1309 my $text = $self->get_text; 1549 my $text = $self->get_text;
1310 1550
1311 if ($sym == 8) { 1551 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1552 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1553 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1554 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1555 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1556 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1557 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1558 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1559 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1560 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1561 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1562 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1563 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1564 $self->emit ('escape');
1325 } elsif ($uni) { 1565 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1327 } 1567 }
1328 1568
1329 $self->_set_text ($text); 1569 $self->_set_text ($text);
1330 $self->update; 1570 $self->update;
1571 $self->check_size;
1331} 1572}
1332 1573
1333sub focus_in { 1574sub focus_in {
1334 my ($self) = @_; 1575 my ($self) = @_;
1335 1576
… …
1411 my ($self, $ev) = @_; 1652 my ($self, $ev) = @_;
1412 1653
1413 my $sym = $ev->{sym}; 1654 my $sym = $ev->{sym};
1414 1655
1415 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} = '';
1416 $self->emit (activate => $self->get_text); 1661 $self->emit (activate => $txt);
1417 $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 }
1418 1685
1419 } else { 1686 } else {
1420 $self->SUPER::key_down ($ev); 1687 $self->SUPER::key_down ($ev);
1421 } 1688 }
1422 1689
… …
1436 1703
1437sub new { 1704sub new {
1438 my $class = shift; 1705 my $class = shift;
1439 1706
1440 $class->SUPER::new ( 1707 $class->SUPER::new (
1441 padding => 4, 1708 padding => 4,
1442 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1445 can_hover => 1, 1711 can_hover => 1,
1446 align => 0, 1712 align => 0,
1447 valign => 0, 1713 valign => 0,
1448 can_events => 1, 1714 can_events => 1,
1449 @_ 1715 @_
1450 ) 1716 )
1451} 1717}
1452 1718
… …
1466 1732
1467 if ($GRAB == $self) { 1733 if ($GRAB == $self) {
1468 $self->{fg} = $self->{active_fg}; 1734 $self->{fg} = $self->{active_fg};
1469 } 1735 }
1470 1736
1471 glEnable GL_BLEND;
1472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473 glEnable GL_TEXTURE_2D; 1737 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1739 glColor 0, 0, 0, 1;
1476 1740
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1741 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1742
1479 glDisable GL_TEXTURE_2D; 1743 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1744
1482 $self->SUPER::_draw; 1745 $self->SUPER::_draw;
1483} 1746}
1484 1747
1485############################################################################# 1748#############################################################################
… …
1499 1762
1500 $class->SUPER::new ( 1763 $class->SUPER::new (
1501 padding => 2, 1764 padding => 2,
1502 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1503 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],
1504 state => 0, 1769 state => 0,
1505 can_hover => 1, 1770 can_hover => 1,
1506 @_ 1771 @_
1507 ) 1772 )
1508} 1773}
… …
1532 1797
1533 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;
1534 1799
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 1801
1537 glEnable GL_BLEND; 1802 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803
1538 glEnable GL_TEXTURE_2D; 1804 glEnable GL_TEXTURE_2D;
1539 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541 my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543 $tex->draw_quad (0, 0, $s, $s); 1805 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 1806 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 1807}
1548 1808
1549############################################################################# 1809#############################################################################
1550 1810
1551package CFClient::UI::Image; 1811package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 1854 glTranslate 0, -$self->{w}, 0;
1595 1855
1596 ($w, $h) = ($h, $w); 1856 ($w, $h) = ($h, $w);
1597 } 1857 }
1598 1858
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1859 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 1861
1604 $tex->draw_quad (0, 0, $w, $h); 1862 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 1863
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 1864 glDisable GL_TEXTURE_2D;
1608} 1865}
1609 1866
1610############################################################################# 1867#############################################################################
1611 1868
… …
1659} 1916}
1660 1917
1661sub set_max { 1918sub set_max {
1662 my ($self, $max) = @_; 1919 my ($self, $max) = @_;
1663 1920
1921 return if $self->{max_val} == $max;
1922
1664 $self->{max_val} = $max; 1923 $self->{max_val} = $max;
1924 $self->update;
1665} 1925}
1666 1926
1667sub set_value { 1927sub set_value {
1668 my ($self, $val, $max) = @_; 1928 my ($self, $val, $max) = @_;
1669 1929
1670 $self->set_max ($max) 1930 $self->set_max ($max)
1671 if defined $max; 1931 if defined $max;
1672 1932
1673 $max = $self->{max_val}; 1933 return if $self->{val} == $val;
1934
1674 $self->{val} = $val; 1935 $self->{val} = $val;
1675
1676 $self->update; 1936 $self->update;
1677} 1937}
1678 1938
1679sub _draw { 1939sub _draw {
1680 my ($self) = @_; 1940 my ($self) = @_;
… …
1743 2003
1744sub new { 2004sub new {
1745 my ($class, %arg) = @_; 2005 my ($class, %arg) = @_;
1746 2006
1747 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 2008 tooltip => $arg{type},
2009 can_hover => 1,
2010 can_events => 1,
1749 %arg, 2011 %arg,
1750 ); 2012 );
1751 2013
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2014 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2015 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2016 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 2017
1756 $self 2018 $self
1757} 2019}
1758 2020
1759sub set_fontsize { 2021sub set_fontsize {
… …
1761 2023
1762 $self->{value}->set_fontsize ($fsize); 2024 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 2025 $self->{max} ->set_fontsize ($fsize);
1764} 2026}
1765 2027
2028sub set_max {
2029 my ($self, $max) = @_;
2030
2031 $self->{gauge}->set_max ($max);
2032 $self->{max}->set_text ($max);
2033}
2034
1766sub set_value { 2035sub set_value {
1767 my ($self, $val, $max) = @_; 2036 my ($self, $val, $max) = @_;
1768 2037
1769 $self->set_max ($max) 2038 $self->set_max ($max)
1770 if defined $max; 2039 if defined $max;
1771 2040
1772 $self->{gauge}->set_value ($val, $max); 2041 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 2042 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 2043}
1782 2044
1783############################################################################# 2045#############################################################################
1784 2046
1785package CFClient::UI::Slider; 2047package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
1796 2058
1797sub new { 2059sub new {
1798 my $class = shift; 2060 my $class = shift;
1799 2061
1800 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
1801 2063
1802 # TODO: 0-width page 2064 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2066 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
1807 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],
1808 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
1809 req_w => 20, 2073 req_w => $::WIDTH / 80,
1810 req_h => 20, 2074 req_h => $::WIDTH / 80,
1811 vertical => 0, 2075 vertical => 0,
1812 can_hover => 1, 2076 can_hover => 1,
1813 inner_pad => 5, 2077 inner_pad => 0.02,
1814 @_ 2078 @_
1815 ); 2079 );
1816 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
1817 $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 }
1818} 2108}
1819 2109
1820sub size_request { 2110sub size_request {
1821 my ($self) = @_; 2111 my ($self) = @_;
1822 2112
… …
1835 2125
1836sub mouse_motion { 2126sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
1838 2128
1839 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
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
1841 2147
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
1843 2149
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1845 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1846 2151
1847 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
1849 $x = $lo if $x < $lo;
1850 $x = $hi - $page if $x > $hi - $page;
1851 $self->{range}[0] = $x;
1852 2154
1853 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
1854 $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;
1855 } 2162 });
1856}
1857 2163
1858# the inner_* stuff is for generating a padding for the slider handle, 2164 $self->SUPER::update;
1859# so that the handle doesn't leave the texture. This calculation isn't 100%
1860# correct propably, but it does the job for now
1861sub _calc_inner_pad_px {
1862 my ($self, $w) = @_;
1863 ($w / 100) * $self->{inner_pad} # % to pixels
1864} 2165}
1865 2166
1866sub _draw { 2167sub _draw {
1867 my ($self) = @_; 2168 my ($self) = @_;
1868 2169
1869 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
1870 2171
1871 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
1872 2173
1873 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
1875 2176
2177 glTranslate 1, 0, 0;
1876 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2179 }
1881 2180
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2183
1885 my ($value, $lo, $hi, $page) = @{$self->{range}};
1886
1887 $hi = $value + 1 if $lo == $hi;
1888
1889 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1890 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1891
1892 $page = int $page * $inner_w / ($hi - $lo);
1893 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1894
1895 $w -= $page;
1896 $page &= ~1;
1897 glTranslate $page * 0.5, 0, 0;
1898 $page ||= 2;
1899
1900 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902
1903 glEnable GL_BLEND;
1904 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2186
1908 # draw background 2187 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2189
1911 # draw handle 2190 # draw handle
1912 $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);
1913 2192
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
1916} 2194}
1917 2195
1918############################################################################# 2196#############################################################################
1919 2197
… …
1925 2203
1926sub new { 2204sub new {
1927 my $class = shift; 2205 my $class = shift;
1928 2206
1929 my $self = $class->SUPER::new ( 2207 my $self = $class->SUPER::new (
1930 fontsize => 1, 2208 fontsize => 1,
2209 can_events => 0,
1931 #font => default_font 2210 #font => default_font
1932 @_, 2211 @_,
1933 2212
1934 layout => (new CFClient::Layout), 2213 layout => (new CFClient::Layout 1),
1935 par => [], 2214 par => [],
1936 height => 0, 2215 height => 0,
1937 children => [ 2216 children => [
1938 (new CFClient::UI::Empty expand => 1), 2217 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2218 (new CFClient::UI::Slider vertical => 1),
1940 ], 2219 ],
1941 ); 2220 );
1942 2221
1943 $self->{children}[1]->connect (changed => sub { 2222 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2223
1947 $self 2224 $self
1948} 2225}
1949 2226
1950sub set_fontsize { 2227sub set_fontsize {
1951 my ($self, $fontsize) = @_; 2228 my ($self, $fontsize) = @_;
1952 2229
1953 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
1954 $self->reflow; 2231 $self->reflow;
1955}
1956
1957sub text_height {
1958 my ($self, $text) = @_;
1959
1960 my $layout = $self->{layout};
1961
1962 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963 $layout->set_width ($self->{w});
1964 $layout->set_text ($text);
1965
1966 ($layout->size)[1]
1967}
1968
1969sub reflow {
1970 my ($self) = @_;
1971
1972 $self->{need_reflow}++;
1973 $self->update;
1974} 2232}
1975 2233
1976sub size_allocate { 2234sub size_allocate {
1977 my ($self, $w, $h) = @_; 2235 my ($self, $w, $h) = @_;
1978 2236
… …
1983 $self->{layout}->set_width ($self->{children}[0]{w}); 2241 $self->{layout}->set_width ($self->{children}[0]{w});
1984 2242
1985 $self->reflow; 2243 $self->reflow;
1986} 2244}
1987 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
1988sub add_paragraph { 2265sub add_paragraph {
1989 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
1990 2267
1991 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
1992 2269
2270 for my $line (split /\n/, $text) {
1993 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
1994
1995 $self->{height} += $height; 2272 $self->{height} += $height;
1996
1997 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
1998 2275
1999 $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}];
2000 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2001} 2278}
2002 2279
… …
2007 2284
2008 return unless $self->{h} > 0; 2285 return unless $self->{h} > 0;
2009 2286
2010 delete $self->{texture}; 2287 delete $self->{texture};
2011 2288
2012 $ROOT->on_refresh ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2013 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2291 my $height = 0;
2015 2292
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2017 for @{$self->{par}}; 2294 for @{$self->{par}};
2018 2295
2019 $self->{height} = $height; 2296 $self->{height} = $height;
2020 2297
2021 $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;
2022 2300
2023 delete $self->{texture}; 2301 delete $self->{texture};
2024 } 2302 }
2025 2303
2026 $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 {
2027 glClearColor 0, 0, 0, 1; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2029
2030 glEnable GL_BLEND;
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D;
2033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034 2307
2035 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2036 2309
2037 my $y0 = $top; 2310 my $y0 = $top;
2038 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
… …
2041 2314
2042 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2043 2316
2044 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2045 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2046 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2323 my $h = $par->[0];
2048 2324
2049 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]);
2050 $layout->set_text ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2051 2329
2052 glColor @{ $par->[1] }; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053 my ($W, $H) = $layout->size; 2331
2054 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;
2055 } 2334 }
2056 2335
2057 $y += $h; 2336 $y += $h;
2058 } 2337 }
2059 2338
2060 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND; 2339 glDisable GL_BLEND;
2062 }; 2340 };
2063 }); 2341 });
2064} 2342}
2065 2343
2066sub _draw { 2344sub _draw {
2067 my ($self) = @_; 2345 my ($self) = @_;
2068 2346
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2071 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;
2072 $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});
2073 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2074 }
2075 2352
2076 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2077 2354
2078} 2355}
2079 2356
… …
2127 2404
2128sub new { 2405sub new {
2129 my $class = shift; 2406 my $class = shift;
2130 2407
2131 my $self = $class->SUPER::new ( 2408 my $self = $class->SUPER::new (
2132 state => 0, 2409 state => 0,
2133 connect_activate => \&toggle_flopper, 2410 connect_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2411 @_
2136 ); 2412 );
2137 2413
2138 if ($self->{state}) { 2414 if ($self->{state}) {
2139 $self->{state} = 0; 2415 $self->{state} = 0;
… …
2174 @_, 2450 @_,
2175 can_events => 0, 2451 can_events => 0,
2176 ) 2452 )
2177} 2453}
2178 2454
2179sub set_text { 2455sub set_tooltip_from {
2180 my ($self, $text) = @_; 2456 my ($self, $widget) = @_;
2181 2457
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2458 $self->add (new CFClient::UI::Label
2183 $self->{label}->set_text ($text); 2459 markup => $widget->{tooltip},
2184 $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 );
2185} 2466}
2186 2467
2187sub size_request { 2468sub size_request {
2188 my ($self) = @_; 2469 my ($self) = @_;
2189 2470
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2471 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2472
2194 ($w + 4, $h + 4) 2473 ($w + 4, $h + 4)
2195} 2474}
2196 2475
2476sub size_allocate {
2477 my ($self, $w, $h) = @_;
2478
2479 $self->SUPER::size_allocate ($w - 4, $h - 4);
2480}
2481
2197sub _draw { 2482sub _draw {
2198 my ($self) = @_; 2483 my ($self) = @_;
2199 2484
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2485 glTranslate 0.375, 0.375;
2202 2486
2203 my ($w, $h) = @$self{qw(w h)}; 2487 my ($w, $h) = @$self{qw(w h)};
2204 2488
2205 glColor 1, 0.8, 0.4; 2489 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2500 glVertex 0 , $h;
2217 glVertex $w, $h; 2501 glVertex $w, $h;
2218 glVertex $w, 0; 2502 glVertex $w, 0;
2219 glEnd; 2503 glEnd;
2220 2504
2221 glPopMatrix; 2505 glTranslate 2 - 0.375, 2 - 0.375;
2222
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2506 $self->SUPER::_draw;
2225} 2507}
2226 2508
2227############################################################################# 2509#############################################################################
2228 2510
2511package CFClient::UI::Face;
2512
2513our @ISA = CFClient::UI::Base::;
2514
2515use CFClient::OpenGL;
2516
2517sub new {
2518 my $class = shift;
2519
2520 my $self = $class->SUPER::new (
2521 aspect => 1,
2522 @_,
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
2540}
2541
2542sub size_request {
2543 (32, 8)
2544}
2545
2546sub _draw {
2547 my ($self) = @_;
2548
2549 return unless $::CONN;#d# manage and cache textures differently
2550
2551 my $face;
2552
2553 if ($self->{frame}) {
2554 my $anim = $::CONN->{anim}[$self->{anim}];
2555
2556 $face = $anim->[ $self->{frame} % @$anim ]
2557 if $anim && @$anim;
2558 }
2559
2560 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2561
2562 if ($tex) {
2563 glEnable GL_TEXTURE_2D;
2564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2565 glColor 1, 1, 1, 1;
2566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2567 glDisable GL_TEXTURE_2D;
2568 }
2569}
2570
2571sub DESTROY {
2572 my ($self) = @_;
2573
2574 $self->{timer}->cancel
2575 if $self->{timer};
2576
2577 $self->SUPER::DESTROY;
2578}
2579
2580#############################################################################
2581
2582package CFClient::UI::InventoryItem;
2583
2584our @ISA = CFClient::UI::HBox::;
2585
2586sub _item_to_desc {
2587 my ($item) = @_;
2588
2589 my $desc =
2590 $item->{nrof} < 2
2591 ? $item->{name}
2592 : "$item->{nrof} × $item->{name_pl}";
2593
2594 $item->{flags} & Crossfire::Protocol::F_OPEN
2595 and $desc .= " (open)";
2596 $item->{flags} & Crossfire::Protocol::F_APPLIED
2597 and $desc .= " (applied)";
2598 $item->{flags} & Crossfire::Protocol::F_UNPAID
2599 and $desc .= " (unpaid)";
2600 $item->{flags} & Crossfire::Protocol::F_MAGIC
2601 and $desc .= " (magic)";
2602 $item->{flags} & Crossfire::Protocol::F_CURSED
2603 and $desc .= " (cursed)";
2604 $item->{flags} & Crossfire::Protocol::F_DAMNED
2605 and $desc .= " (damned)";
2606 $item->{flags} & Crossfire::Protocol::F_LOCKED
2607 and $desc .= " *";
2608
2609 $desc
2610}
2611
2612sub new {
2613 my $class = shift;
2614
2615 my %args = @_;
2616
2617 my $item = delete $args{item};
2618
2619 my $desc = _item_to_desc ($item);
2620
2621 my $self = $class->SUPER::new (
2622 can_hover => 1,
2623 can_events => 1,
2624 tooltip => ((CFClient::UI::Label::escape $desc)
2625 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2626 connect_button_down => sub {
2627 my ($self, $ev, $x, $y) = @_;
2628
2629 # todo: maybe put examine on 1? but should just be a tooltip :(
2630 if ($ev->{button} == 1) {
2631 my $targ = $::CONN->{player}{tag};
2632
2633 if ($item->{container} == $::CONN->{player}{tag}) {
2634 $targ = $main::OPENCONT;
2635 }
2636
2637 $::CONN->send ("move $targ $item->{tag} 0");
2638 } elsif ($ev->{button} == 2) {
2639 $::CONN->send ("apply $item->{tag}");
2640 } elsif ($ev->{button} == 3) {
2641 my @menu_items = (
2642 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2643 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2644 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645 (
2646 $item->{flags} & Crossfire::Protocol::F_LOCKED
2647 ? (
2648 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649 )
2650 : (
2651 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2652 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653 )
2654 ),
2655 );
2656
2657 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2658 }
2659
2660 1
2661 },
2662 %args
2663 );
2664
2665
2666 $self->add (new CFClient::UI::Face
2667 can_events => 0,
2668 face => $item->{face},
2669 anim => $item->{anim},
2670 animspeed => $item->{animspeed},
2671 );
2672
2673 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2674
2675 $self->{item} = $item;
2676
2677 $self->update_item;
2678
2679 $self
2680}
2681
2682sub update_item {
2683 my ($self) = @_;
2684
2685 my $desc = _item_to_desc ($self->{item});
2686
2687 $self->{name_lbl}->set_text ($desc);
2688}
2689
2690#############################################################################
2691
2692package CFClient::UI::Inventory;
2693
2694our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696sub new {
2697 my $class = shift;
2698
2699 my $self = $class->SUPER::new (
2700 scrolled => (new CFClient::UI::VBox),
2701 @_,
2702 );
2703
2704 $self
2705}
2706
2707sub set_items {
2708 my ($self, $items) = @_;
2709
2710 $self->{scrolled}->clear;
2711 return unless $items;
2712
2713 my @items = sort {
2714 ($a->{type} <=> $b->{type})
2715 or ($a->{name} cmp $b->{name})
2716 } @$items;
2717
2718 $self->{real_items} = \@items;
2719
2720 for my $item (@items) {
2721 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2722 $item->update_item ();
2723 }
2724
2725 $self->{scrolled}->add (@items);
2726
2727# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2728}
2729
2730sub size_request {
2731 my ($self) = @_;
2732 ($self->{req_w}, $self->{req_h});
2733}
2734
2735#############################################################################
2736
2737package CFClient::UI::Menu;
2738
2739our @ISA = CFClient::UI::FancyFrame::;
2740
2741use CFClient::OpenGL;
2742
2743sub new {
2744 my $class = shift;
2745
2746 my $self = $class->SUPER::new (
2747 items => [],
2748 z => 100,
2749 @_,
2750 );
2751
2752 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2753
2754 for my $item (@{ $self->{items} }) {
2755 my ($widget, $cb) = @$item;
2756
2757 # handle various types of items, only text for now
2758 if (!ref $widget) {
2759 $widget = new CFClient::UI::Label
2760 can_hover => 1,
2761 can_events => 1,
2762 text => $widget;
2763 }
2764
2765 $self->{item}{$widget} = $item;
2766
2767 $self->{vbox}->add ($widget);
2768 }
2769
2770 $self
2771}
2772
2773# popup given the event (must be a mouse button down event currently)
2774sub popup {
2775 my ($self, $ev) = @_;
2776
2777 $self->emit ("popdown");
2778
2779 # maybe save $GRAB? must be careful about events...
2780 $GRAB = $self;
2781 $self->{button} = $ev->{button};
2782
2783 $self->show;
2784 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2785}
2786
2787sub mouse_motion {
2788 my ($self, $ev, $x, $y) = @_;
2789
2790 # TODO: should use vbox->find_widget or so
2791 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2792 $self->{hover} = $self->{item}{$HOVER};
2793}
2794
2795sub button_up {
2796 my ($self, $ev, $x, $y) = @_;
2797
2798 if ($ev->{button} == $self->{button}) {
2799 undef $GRAB;
2800 $self->hide;
2801
2802 $self->emit ("popdown");
2803 $self->{hover}[1]->() if $self->{hover};
2804 }
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Statusbox;
2810
2811our @ISA = CFClient::UI::VBox::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 $class->SUPER::new (
2817 fontsize => 0.8,
2818 @_,
2819 )
2820}
2821
2822sub reorder {
2823 my ($self) = @_;
2824 my $NOW = time;
2825
2826 while (my ($k, $v) = each %{ $self->{item} }) {
2827 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2828 }
2829
2830 my @widgets;
2831
2832 my @items = sort {
2833 $a->{pri} <=> $b->{pri}
2834 or $b->{id} <=> $a->{id}
2835 } values %{ $self->{item} };
2836
2837 my $count = 10 + 1;
2838 for my $item (@items) {
2839 last unless --$count;
2840
2841 push @widgets, $item->{label} ||= do {
2842 # TODO: doesn't handle markup well (read as: at all)
2843 my $short = $item->{count} > 1
2844 ? "<b>$item->{count} ×</b> $item->{text}"
2845 : $item->{text};
2846
2847 for ($short) {
2848 s/^\s+//;
2849 s/\s+/ /g;
2850 }
2851
2852 new CFClient::UI::Label
2853 markup => $short,
2854 tooltip => $item->{tooltip},
2855 tooltip_font => $::FONT_PROP,
2856 tooltip_width => 0.67,
2857 fontsize => $item->{fontsize} || $self->{fontsize},
2858 max_w => $::WIDTH * 0.44,
2859 fg => $item->{fg},
2860 can_events => 1,
2861 can_hover => 1
2862 };
2863 }
2864
2865 $self->clear;
2866 $self->SUPER::add (reverse @widgets);
2867}
2868
2869sub add {
2870 my ($self, $text, %arg) = @_;
2871
2872 $text =~ s/^\s+//;
2873 $text =~ s/\s+$//;
2874
2875 my $timeout = time + ((delete $arg{timeout}) || 60);
2876
2877 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2878
2879 if (my $item = $self->{item}{$group}) {
2880 if ($item->{text} eq $text) {
2881 $item->{count}++;
2882 } else {
2883 $item->{count} = 1;
2884 $item->{text} = $item->{tooltip} = $text;
2885 }
2886 $item->{id} = ++$self->{id};
2887 $item->{timeout} = $timeout;
2888 delete $item->{label};
2889 } else {
2890 $self->{item}{$group} = {
2891 id => ++$self->{id},
2892 text => $text,
2893 timeout => $timeout,
2894 tooltip => $text,
2895 fg => [0.8, 0.8, 0.8, 0.8],
2896 pri => 0,
2897 count => 1,
2898 %arg,
2899 };
2900 }
2901
2902 $self->reorder;
2903}
2904
2905sub reconfigure {
2906 my ($self) = @_;
2907
2908 delete $_->{label}
2909 for values %{ $self->{item} || {} };
2910
2911 $self->reorder;
2912 $self->SUPER::reconfigure;
2913}
2914
2915#############################################################################
2916
2229package CFClient::UI::Root; 2917package CFClient::UI::Root;
2230 2918
2231our @ISA = CFClient::UI::Container::; 2919our @ISA = CFClient::UI::Container::;
2232 2920
2233use CFClient::OpenGL; 2921use CFClient::OpenGL;
2234 2922
2235sub check_size { 2923sub new {
2236 my ($self) = @_; 2924 my $class = shift;
2237 2925
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2926 $class->SUPER::new (
2239} 2927 @_,
2240 2928 )
2241sub size_request {
2242 ($::WIDTH, $::HEIGHT)
2243} 2929}
2244 2930
2245sub configure { 2931sub configure {
2246 my ($self, $x, $y, $w, $h) = @_; 2932 my ($self, $x, $y, $w, $h) = @_;
2247 2933
2248 $self->SUPER::configure ($x, $y, $w, $h); 2934 $self->{w} = $w;
2935 $self->{h} = $h;
2936}
2249 2937
2938sub check_size {
2939 my ($self) = @_;
2940
2941 $self->size_allocate ($self->{w}, $self->{h})
2942 if $self->{w};
2943}
2944
2945sub size_request {
2946 my ($self) = @_;
2947
2948 ($self->{w}, $self->{h})
2949}
2950
2951sub size_allocate {
2952 my ($self, $w, $h) = @_;
2953
2954 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2955 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2956
2957 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2958 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2959
2250 for my $child (@{$self->{children}}) { 2960 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2961 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 2962
2963 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2964 if exists $child->{req_x};
2965
2966 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2967 if exists $child->{req_y};
2968
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2969 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2254 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2970 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971
2255 $child->configure ($X, $Y, $W,$H); 2972 $child->configure ($X, $Y, $W, $H);
2256 } 2973 }
2257} 2974}
2258 2975
2259sub _topleft { 2976sub coord2local {
2260 my ($self, $x, $y) = @_; 2977 my ($self, $x, $y) = @_;
2261 2978
2262 ($x, $y) 2979 ($x, $y)
2263} 2980}
2264 2981
2982sub coord2global {
2983 my ($self, $x, $y) = @_;
2984
2985 ($x, $y)
2986}
2987
2265sub update { 2988sub update {
2266 my ($self) = @_; 2989 my ($self) = @_;
2267 2990
2268 $self->check_size; 2991 $self->check_size;
2269 ::refresh (); 2992 $::WANT_REFRESH++;
2270} 2993}
2271 2994
2272sub add { 2995sub add {
2273 my ($self, $child) = @_; 2996 my ($self, @children) = @_;
2274 2997
2998 for my $child (@children) {
2999 $child->{toplevel} = 1;
3000
2275 # integerize window positions 3001 # integerise window positions
2276 $child->{x} = int $child->{x}; 3002 $child->{x} = int $child->{x};
2277 $child->{y} = int $child->{y}; 3003 $child->{y} = int $child->{y};
3004 }
2278 3005
2279 $self->SUPER::add ($child); 3006 $self->SUPER::add (@children);
2280} 3007}
2281 3008
2282sub on_refresh { 3009sub on_refresh {
2283 my ($self, $id, $cb) = @_; 3010 my ($self, $id, $cb) = @_;
2284 3011
2285 $self->{refresh_hook}{$id} = $cb; 3012 $self->{refresh_hook}{$id} = $cb;
2286} 3013}
2287 3014
3015sub on_post_alloc {
3016 my ($self, $id, $cb) = @_;
3017
3018 $self->{post_alloc_hook}{$id} = $cb;
3019}
3020
2288sub draw { 3021sub draw {
2289 my ($self) = @_; 3022 my ($self) = @_;
2290 3023
2291 while (my $rcb = delete $self->{refresh_hook}) { 3024 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 3025 $_->()
3026 for values %{delete $self->{refresh_hook}};
3027 }
3028
3029 if ($self->{check_size}) {
3030 my @queue = ([], []);
3031
3032 for (;;) {
3033 if ($self->{check_size}) {
3034 # heuristic: check containers last
3035 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3036 for values %{delete $self->{check_size}}
3037 }
3038
3039 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3040
3041 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3042 ? @$widget{qw(user_w user_h)}
3043 : $widget->size_request;
3044
3045 if (delete $widget->{force_alloc}
3046 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3047 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3048
3049 $widget->{req_w} = $w;
3050 $widget->{req_h} = $h;
3051
3052 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3053
3054 $widget->{parent}->check_size
3055 if $widget->{parent};
3056 }
3057 }
3058 }
3059
3060 while ($self->{size_alloc}) {
3061 for (values %{delete $self->{size_alloc}}) {
3062 my ($widget, $w, $h) = @$_;
3063
3064 $w = 0 if $w < 0;
3065 $h = 0 if $h < 0;
3066
3067 $widget->{w} = $w;
3068 $widget->{h} = $h;
3069 $widget->size_allocate ($w, $h);
3070 $widget->emit (size_allocate => $w, $h);
3071 }
3072 }
3073
3074 while ($self->{post_alloc_hook}) {
3075 $_->()
3076 for values %{delete $self->{post_alloc_hook}};
2293 } 3077 }
2294 3078
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3079 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 3081 glClear GL_COLOR_BUFFER_BIT;
2298 3082
2299 glMatrixMode GL_PROJECTION; 3083 glMatrixMode GL_PROJECTION;
2300 glLoadIdentity; 3084 glLoadIdentity;
2301 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3085 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302 glMatrixMode GL_MODELVIEW; 3086 glMatrixMode GL_MODELVIEW;
2303 glLoadIdentity; 3087 glLoadIdentity;
2304 3088
2305 $self->_draw; 3089 $self->_draw;
2306} 3090}
… …
2308############################################################################# 3092#############################################################################
2309 3093
2310package CFClient::UI; 3094package CFClient::UI;
2311 3095
2312$ROOT = new CFClient::UI::Root; 3096$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 3097$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314 3098
23151 30991
2316 3100

Diff Legend

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