ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.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
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_text ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
39 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
40} 51}
41 52
42# class methods for events 53# class methods for events
43sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
45} 57}
46 58
47sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
49} 62}
50 63
51sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
52 my ($ev) = @_; 65 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
61 check_tooltip; 74 check_tooltip;
62 } 75 }
63 76
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 78
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
67} 83}
68 84
69sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
70 my ($ev) = @_; 86 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
72 88
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 90
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 92
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
78 97
79 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 100 $grab->update if $grab;
82 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 118
100 check_tooltip; 119 check_tooltip;
101 } 120 }
102 121
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
104} 126}
105 127
106# convert position array to integers 128# convert position array to integers
107sub harmonize { 129sub harmonize {
108 my ($vals) = @_; 130 my ($vals) = @_;
114 $rem += $_ - $i; 136 $rem += $_ - $i;
115 $_ = $i; 137 $_ = $i;
116 } 138 }
117} 139}
118 140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
147}
148
149# call when resolution changes etc.
150sub rescale_widgets {
151 my ($sx, $sy) = @_;
152
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET;
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167
168 $widget->reconfigure;
169 }
170}
171
119############################################################################# 172#############################################################################
120 173
121package CFClient::UI::Base; 174package CFClient::UI::Base;
122 175
123use strict; 176use strict;
126 179
127sub new { 180sub new {
128 my $class = shift; 181 my $class = shift;
129 182
130 my $self = bless { 183 my $self = bless {
131 x => 0, 184 x => 0,
132 y => 0, 185 y => 0,
133 z => 0, 186 z => 0,
134 can_events => 1, 187 can_events => 1,
135 @_ 188 @_
136 }, $class; 189 }, $class;
137 190
138 for (keys %$self) { 191 for (keys %$self) {
139 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
141 } 194 }
142 } 195 }
143 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
144 $self 199 $self
145} 200}
146 201
147sub destroy { 202sub destroy {
148 my ($self) = @_; 203 my ($self) = @_;
152} 207}
153 208
154sub show { 209sub show {
155 my ($self) = @_; 210 my ($self) = @_;
156 211
212 for (my @w = $self; @w; ) {
213 my $w = pop @w;
214 push @w, $w->children;
215 $w->{visible} = 1;
216 }
217
157 return if $self->{parent}; 218 return if $self->{parent};
158 219
159 $CFClient::UI::ROOT->add ($self); 220 $CFClient::UI::ROOT->add ($self);
160} 221}
161 222
162sub hide { 223sub hide {
163 my ($self) = @_; 224 my ($self) = @_;
164 225
165 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 }
166 231
232 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self;
234
167 $self->{parent}->remove ($self); 235 $self->{parent}->remove ($self)
236 if $self->{parent};
168} 237}
169 238
170sub move { 239sub move {
171 my ($self, $x, $y, $z) = @_; 240 my ($self, $x, $y, $z) = @_;
172 241
211 $self->{y} = $y; 280 $self->{y} = $y;
212 $self->update; 281 $self->update;
213 } 282 }
214 283
215 if ($self->{w} != $w || $self->{h} != $h) { 284 if ($self->{w} != $w || $self->{h} != $h) {
216 $self->{w} = $w; 285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217 $self->{h} = $h;
218
219 $self->size_allocate ($w, $h);
220 $self->update;
221 } 286 }
222} 287}
223 288
224sub size_allocate { 289sub size_allocate {
225 # nothing to be done 290 # nothing to be done
226} 291}
227 292
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children {
301}
302
228sub set_max_size { 303sub set_max_size {
229 my ($self, $w, $h) = @_; 304 my ($self, $w, $h) = @_;
230 305
231 delete $self->{max_w}; $self->{max_w} = $w if $w; 306 delete $self->{max_w}; $self->{max_w} = $w if $w;
232 delete $self->{max_h}; $self->{max_h} = $h if $h; 307 delete $self->{max_h}; $self->{max_h} = $h if $h;
233} 308}
234 309
235# return top left coordinates 310sub set_tooltip {
236sub _topleft {
237 my ($self, $x, $y) = @_; 311 my ($self, $tooltip) = @_;
238 312
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 313 $self->{tooltip} = $tooltip;
314
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip;
318 }
240} 319}
241 320
242# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
243sub coord2local { 322sub coord2local {
244 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
245 324
246 my ($X, $Y) = $self->_topleft; 325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247 ($x - $X, $y - $Y)
248} 326}
249 327
250# translate local coordinates to global coordinate system 328# translate local coordinates to global coordinate system
251sub coord2global { 329sub coord2global {
252 my ($self, $x, $y) = @_; 330 my ($self, $x, $y) = @_;
253 331
254 my ($X, $Y) = $self->_topleft; 332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255 ($x + $X, $y + $Y)
256} 333}
257 334
258sub focus_in { 335sub focus_in {
259 my ($self) = @_; 336 my ($self) = @_;
260 337
320 glVertex $x + $self->{w}, $y + $self->{h}; 397 glVertex $x + $self->{w}, $y + $self->{h};
321 glVertex $x , $y + $self->{h}; 398 glVertex $x , $y + $self->{h};
322 glEnd; 399 glEnd;
323 glDisable GL_BLEND; 400 glDisable GL_BLEND;
324 } 401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0;
409 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h};
412 glEnd;
413 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 }
325} 416}
326 417
327sub _draw { 418sub _draw {
328 my ($self) = @_; 419 my ($self) = @_;
329 420
344 435
345sub set_parent { 436sub set_parent {
346 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
347 438
348 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
349} 446}
350 447
351sub check_size { 448sub check_size {
352 my ($self) = @_; 449 my ($self, $forced) = @_;
353 450
354 $self->{parent} 451 $self->{force_alloc} = 1 if $forced;
355 or return 1; 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
356
357 my ($w, $h) = $self->{user_w} && $self->{user_h}
358 ? @$self{qw(user_w user_h)}
359 : $self->size_request;
360
361 if ($w != $self->{req_w} || $h != $self->{req_h}) {
362 $self->{req_w} = $w;
363 $self->{req_h} = $h;
364
365 $self->{parent}->check_size
366 or $self->size_allocate (
367 (List::Util::max $self->{w}, $w),
368 (List::Util::max $self->{h}, $h),
369 );
370
371 1
372 } else {
373 0
374 }
375} 453}
376 454
377sub update { 455sub update {
378 my ($self) = @_; 456 my ($self) = @_;
379 457
388} 466}
389 467
390sub emit { 468sub emit {
391 my ($self, $signal, @args) = @_; 469 my ($self, $signal, @args) = @_;
392 470
393 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
394 $cb->($self, @args);
395 }
396} 472}
397 473
398sub DESTROY { 474sub DESTROY {
399 my ($self) = @_; 475 my ($self) = @_;
400 476
477 delete $WIDGET{$self+0};
401 #$self->deactivate; 478 #$self->deactivate;
402} 479}
403 480
404############################################################################# 481#############################################################################
405 482
414 my $class = shift; 491 my $class = shift;
415 492
416 # range [value, low, high, page] 493 # range [value, low, high, page]
417 494
418 $class->SUPER::new ( 495 $class->SUPER::new (
419 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
420 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
421 @_ 498 @_
422 ) 499 )
423} 500}
424 501
425sub _draw { 502sub _draw {
426 my ($self) = @_; 503 my ($self) = @_;
427 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
428 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
429 511
430 glEnable GL_BLEND; 512 glEnable GL_BLEND;
431 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
432 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
433 515
434 glBegin GL_QUADS; 516 glBegin GL_QUADS;
435 glVertex 0 , 0; 517 glVertex 0 , 0;
436 glVertex 0 , $h; 518 glVertex 0 , $h;
437 glVertex $w, $h; 519 glVertex $w, $h;
438 glVertex $w, 0; 520 glVertex $w, 0;
439 glEnd; 521 glEnd;
440 522
441 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
442} 525}
443 526
444############################################################################# 527#############################################################################
445 528
446package CFClient::UI::Empty; 529package CFClient::UI::Empty;
467sub new { 550sub new {
468 my ($class, %arg) = @_; 551 my ($class, %arg) = @_;
469 552
470 my $children = delete $arg{children} || []; 553 my $children = delete $arg{children} || [];
471 554
472 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 555 my $self = $class->SUPER::new (
556 children => [],
557 can_events => 0,
558 %arg,
559 );
473 $self->add ($_) for @$children; 560 $self->add ($_) for @$children;
474 561
475 $self 562 $self
476} 563}
477 564
478sub add { 565sub add {
479 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
480 567
481 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
482 570
483 use sort 'stable'; 571 use sort 'stable';
484 572
485 $self->{children} = [ 573 $self->{children} = [
486 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
487 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
488 ]; 576 ];
489 577
490 $child->check_size; 578 $self->check_size (1);
579 $self->update;
580}
581
582sub children {
583 @{ $_[0]{children} }
491} 584}
492 585
493sub remove { 586sub remove {
494 my ($self, $child) = @_; 587 my ($self, $child) = @_;
495 588
496 delete $child->{parent}; 589 delete $child->{parent};
590 $child->hide;
497 591
498 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593
594 $self->check_size;
595 $self->update;
596}
597
598sub clear {
599 my ($self) = @_;
600
601 my $children = delete $self->{children};
602 $self->{children} = [];
603
604 for (@$children) {
605 delete $_->{parent};
606 $_->hide;
607 }
499 608
500 $self->check_size; 609 $self->check_size;
501 $self->update; 610 $self->update;
502} 611}
503 612
581} 690}
582 691
583sub update { 692sub update {
584 my ($self) = @_; 693 my ($self) = @_;
585 694
586 # we want to do this delayed... 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
587 $self->render_chld;
588 $self->SUPER::update; 696 $self->SUPER::update;
589}
590
591sub render_chld {
592 my ($self) = @_;
593
594 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
595 glClearColor 0, 0, 0, 1;
596 glClear GL_COLOR_BUFFER_BIT;
597 $self->child->draw;
598 };
599} 697}
600 698
601sub size_allocate { 699sub size_allocate {
602 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
603 701
604 $self->child->configure (0, 0, $w, $h); 702 $self->SUPER::size_allocate ($w, $h);
703 $self->update;
704}
605 705
706sub _render {
707 $_[0]{children}[0]->draw;
708}
709
710sub render_child {
711 my ($self) = @_;
712
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT;
716
606 $self->render_chld; 717 $self->_render;
718 };
607} 719}
608 720
609sub _draw { 721sub _draw {
610 my ($self) = @_; 722 my ($self) = @_;
611 723
612 my ($w, $h) = ($self->w, $self->h); 724 my ($w, $h) = ($self->w, $self->h);
613 725
614 my $tex = $self->{texture} 726 my $tex = $self->{texture}
615 or return; 727 or return;
616 728
617 glEnable GL_BLEND;
618 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
619 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1;
621 732
622 $tex->draw_quad (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
623 734
624 glDisable GL_BLEND;
625 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
626} 736}
627 737
628############################################################################# 738#############################################################################
629 739
630package CFClient::UI::ViewPort; 740package CFClient::UI::ViewPort;
631 741
632our @ISA = CFClient::UI::Window::; 742our @ISA = CFClient::UI::Window::;
633 743
634sub new { die }
635
636sub size_request { 744sub size_request {
637 my ($self) = @_; 745 my ($self) = @_;
638 746
639 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
640 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
641 749
642 @$self{qw(child_w child_h)} 750 @$self{qw(child_w child_h)}
643} 751}
644 752
645sub _draw { 753sub size_allocate {
646 my ($self) = @_; 754 my ($self, $w, $h) = @_;
647 755
648 $self->{children}[1]->draw; 756 $self->update;
649} 757}
650 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}
651 803
652############################################################################# 804#############################################################################
653 805
654package CFClient::UI::Frame; 806package CFClient::UI::ScrolledWindow;
655 807
656our @ISA = CFClient::UI::Bin::; 808our @ISA = CFClient::UI::HBox::;
657
658use CFClient::OpenGL;
659 809
660sub new { 810sub new {
661 my $class = shift; 811 my $class = shift;
662 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
663 my $self = $class->SUPER::new ( 823 $self = $class->SUPER::new (
664 bg => [1, 1, 1, 1], 824 vp => (new CFClient::UI::ViewPort expand => 1),
665 border_bg => [1, 1, 1, 1], 825 slider => $slider,
666 border => 0.8,
667 @_ 826 @_,
668 ); 827 );
669 828
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider});
832
670 $self 833 $self
671} 834}
672 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
673sub _draw { 856sub _draw {
674 my ($self) = @_; 857 my ($self) = @_;
675 858
676 my ($w, $h) = ($self->{w}, $self->{h}); 859 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)};
677 861
678 glEnable GL_BLEND; 862 glEnable GL_BLEND;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
680 glEnable GL_TEXTURE_2D; 864 glColor @{ $self->{bg} };
681 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
682 865
683# glBegin GL_QUADS; 866 glBegin GL_QUADS;
684# glColor 0, 0, 0, 0;
685# glVertex 0 , 0; 867 glVertex 0 , 0;
686# glVertex 0 , $h; 868 glVertex 0 , $h;
687# glVertex $w, $h; 869 glVertex $w, $h;
688# glVertex $w, 0; 870 glVertex $w, 0;
689# glEnd; 871 glEnd;
690 872
691
692 $self->child->draw;
693 glDisable GL_BLEND; 873 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 874 }
875
876 $self->SUPER::_draw;
695} 877}
696 878
697############################################################################# 879#############################################################################
698 880
699package CFClient::UI::FancyFrame; 881package CFClient::UI::FancyFrame;
710 my $class = shift; 892 my $class = shift;
711 893
712 # TODO: user_x, user_y, overwrite moveto? 894 # TODO: user_x, user_y, overwrite moveto?
713 895
714 my $self = $class->SUPER::new ( 896 my $self = $class->SUPER::new (
715 bg => [1, 1, 1, 1], 897 bg => [1, 1, 1, 1],
716 border_bg => [1, 1, 1, 1], 898 border_bg => [1, 1, 1, 1],
717 border => 0.8, 899 border => 0.6,
900 toplevel => 1,
718 can_events => 1, 901 can_events => 1,
719 @_ 902 @_
720 ); 903 );
721 904
722 $self->{title} &&= new CFClient::UI::Label 905 $self->{title} &&= new CFClient::UI::Label
723 align => 0, 906 align => 0,
724 valign => 1, 907 valign => 1,
725 text => $self->{title}, 908 text => $self->{title},
726 fontsize => 1; 909 fontsize => $self->{border};
727 910
728 $self 911 $self
729} 912}
730 913
731sub border { 914sub border {
747 my ($self, $w, $h) = @_; 930 my ($self, $w, $h) = @_;
748 931
749 $h -= List::Util::max 0, $self->border * 2; 932 $h -= List::Util::max 0, $self->border * 2;
750 $w -= List::Util::max 0, $self->border * 2; 933 $w -= List::Util::max 0, $self->border * 2;
751 934
752 $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)
753 if $self->{title}; 936 if $self->{title};
754 937
755 $self->child->configure ($self->border, $self->border, $w, $h); 938 $self->child->configure ($self->border, $self->border, $w, $h);
756} 939}
757 940
758sub button_down { 941sub button_down {
759 my ($self, $ev, $x, $y) = @_; 942 my ($self, $ev, $x, $y) = @_;
760 943
944 my ($w, $h) = @$self{qw(w h)};
761 my $border = $self->border; 945 my $border = $self->border;
762 946
763 if ($x < $self->{w} && $x >= $self->{w} - $border 947 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
764 && $y < $self->{h} && $y >= $self->{h} - $border) { 948 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
765 949
950 if ($lr & $td) {
951 my ($wx, $wy) = ($self->{x}, $self->{y});
766 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 952 my ($ox, $oy) = ($ev->{x}, $ev->{y});
767 my ($bw, $bh) = ($self->{w}, $self->{h}); 953 my ($bw, $bh) = ($self->{w}, $self->{h});
768 954
955 my $mx = $x < $border;
956 my $my = $y < $border;
957
769 $self->{motion} = sub { 958 $self->{motion} = sub {
770 my ($ev, $x, $y) = @_; 959 my ($ev, $x, $y) = @_;
771 960
772 ($x, $y) = ($ev->{x}, $ev->{y}); 961 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy;
773 963
774 $self->{user_w} = $bw + $x - $ox; 964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
775 $self->{user_h} = $bh + $y - $oy; 965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
776 $self->check_size; 967 $self->check_size;
777 }; 968 };
778 969
779 } elsif ($x >= 0 && $x < $self->{w} 970 } elsif ($lr ^ $td) {
780 && $y >= 0 && $y < $border) {
781
782 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 971 my ($ox, $oy) = ($ev->{x}, $ev->{y});
783 my ($bx, $by) = ($self->{x}, $self->{y}); 972 my ($bx, $by) = ($self->{x}, $self->{y});
784 973
785 $self->{motion} = sub { 974 $self->{motion} = sub {
786 my ($ev, $x, $y) = @_; 975 my ($ev, $x, $y) = @_;
809 my ($self) = @_; 998 my ($self) = @_;
810 999
811 my ($w, $h ) = ($self->{w}, $self->{h}); 1000 my ($w, $h ) = ($self->{w}, $self->{h});
812 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
813 1002
814 glEnable GL_BLEND;
815 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
816 glEnable GL_TEXTURE_2D; 1003 glEnable GL_TEXTURE_2D;
817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
818 1005
819 my $border = $self->border; 1006 my $border = $self->border;
820 1007
821 glColor @{ $self->{border_bg} }; 1008 glColor @{ $self->{border_bg} };
822 $tex[1]->draw_quad (0, 0, $w, $border); 1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
823 $tex[3]->draw_quad (0, $border, $border, $ch); 1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
824 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
825 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
826 1013
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
827 my $bg = $tex[0]; 1015 my $bg = $tex[0];
828 1016
829 # TODO: repeat texture not scale 1017 # TODO: repeat texture not scale
830 my $rep_x = $cw / $bg->{w}; 1018 my $rep_x = $cw / $bg->{w};
831 my $rep_y = $ch / $bg->{h}; 1019 my $rep_y = $ch / $bg->{h};
832 1020
833 glColor @{ $self->{bg} }; 1021 glColor @{ $self->{bg} };
834 1022
835 $bg->{s} = $rep_x; 1023 $bg->{s} = $rep_x;
836 $bg->{t} = $rep_y; 1024 $bg->{t} = $rep_y;
837 $bg->{wrap_mode} = 1; 1025 $bg->{wrap_mode} = 1;
838 $bg->draw_quad ($border, $border, $cw, $ch); 1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 }
839 1028
840 glDisable GL_TEXTURE_2D; 1029 glDisable GL_TEXTURE_2D;
841 glDisable GL_BLEND;
842 1030
843 $self->{title}->draw if $self->{title}; 1031 $self->{title}->draw if $self->{title};
1032
844 $self->child->draw; 1033 $self->child->draw;
845} 1034}
846 1035
847############################################################################# 1036#############################################################################
848 1037
870 $self->{children}[$y][$x] = $child; 1059 $self->{children}[$y][$x] = $child;
871 1060
872 $child->check_size; 1061 $child->check_size;
873} 1062}
874 1063
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
875# 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?
876sub clear { 1069sub clear {
877 my ($self) = @_; 1070 my ($self) = @_;
878 1071
1072 my @children = $self->children;
879 delete $self->{children}; 1073 delete $self->{children};
1074
1075 for (@children) {
1076 delete $_->{parent};
1077 $_->hide;
1078 }
1079
880 $self->update; 1080 $self->update;
881} 1081}
882 1082
883sub get_wh { 1083sub get_wh {
884 my ($self) = @_; 1084 my ($self) = @_;
1061} 1261}
1062 1262
1063sub size_allocate { 1263sub size_allocate {
1064 my ($self, $w, $h) = @_; 1264 my ($self, $w, $h) = @_;
1065 1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1066 my $children = $self->{children}; 1268 my $children = $self->{children};
1067 1269
1068 my @h = map $_->{req_h}, @$children; 1270 my @h = map $_->{req_h}, @$children;
1069 1271
1070 my $req_h = List::Util::sum @h; 1272 my $req_h = List::Util::sum @h;
1099 1301
1100############################################################################# 1302#############################################################################
1101 1303
1102package CFClient::UI::Label; 1304package CFClient::UI::Label;
1103 1305
1104our @ISA = CFClient::UI::Base::; 1306our @ISA = CFClient::UI::DrawBG::;
1105 1307
1106use CFClient::OpenGL; 1308use CFClient::OpenGL;
1107 1309
1108sub new { 1310sub new {
1109 my ($class, %arg) = @_; 1311 my ($class, %arg) = @_;
1110 1312
1111 my $self = $class->SUPER::new ( 1313 my $self = $class->SUPER::new (
1112 fg => [1, 1, 1], 1314 fg => [1, 1, 1],
1315 #bg => none
1316 #active_bg => none
1113 #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),
1114 fontsize => 1, 1323 fontsize => 1,
1115 text => "",
1116 align => -1, 1324 align => -1,
1117 valign => -1, 1325 valign => -1,
1118 padding => 2, 1326 padding => 2,
1119 layout => new CFClient::Layout,
1120 can_events => 0, 1327 can_events => 0,
1121 %arg 1328 %arg
1122 ); 1329 );
1123 1330
1124 if (exists $self->{template}) { 1331 if (exists $self->{template}) {
1125 my $layout = new CFClient::Layout; 1332 my $layout = new CFClient::Layout;
1126 $layout->set_text (delete $self->{template}); 1333 $layout->set_text (delete $self->{template});
1127 $self->{template} = $layout; 1334 $self->{template} = $layout;
1128 } 1335 }
1129 1336
1130 $self->set_text (delete $self->{text}) if exists $self->{text}; 1337 if (exists $self->{markup}) {
1131 $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 }
1132 1342
1133 $self 1343 $self
1134} 1344}
1135 1345
1136sub escape_text { 1346sub escape($) {
1137 local $_ = $_[1]; 1347 local $_ = $_[0];
1138 1348
1139 s/&/&amp;/g; 1349 s/&/&amp;/g;
1140 s/>/&gt;/g; 1350 s/>/&gt;/g;
1141 s/</&lt;/g; 1351 s/</&lt;/g;
1142 1352
1143 $_[1] 1353 $_
1354}
1355
1356sub update {
1357 my ($self) = @_;
1358
1359 delete $self->{texture};
1360 $self->SUPER::update;
1144} 1361}
1145 1362
1146sub set_text { 1363sub set_text {
1147 my ($self, $text) = @_; 1364 my ($self, $text) = @_;
1148 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;
1149 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1150 1371
1151 delete $self->{texture}; 1372 $self->update;
1152 $self->check_size; 1373 $self->check_size;
1153 $self->update;
1154} 1374}
1155 1375
1156sub set_markup { 1376sub set_markup {
1157 my ($self, $markup) = @_; 1377 my ($self, $markup) = @_;
1158 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;
1159 $self->{layout}->set_markup ($markup); 1385 $self->{layout}->set_markup ($markup);
1160 1386
1161 delete $self->{texture}; 1387 $self->update;
1162 $self->check_size; 1388 $self->check_size;
1163 $self->update;
1164} 1389}
1165 1390
1166sub size_request { 1391sub size_request {
1167 my ($self) = @_; 1392 my ($self) = @_;
1168 1393
1169 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1394 $self->{layout}->set_font ($self->{font}) if $self->{font};
1170 $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});
1171 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1172 1399
1173 my ($w, $h) = $self->{layout}->size; 1400 my ($w, $h) = $self->{layout}->size;
1174 1401
1175 if (exists $self->{template}) { 1402 if (exists $self->{template}) {
1197sub set_fontsize { 1424sub set_fontsize {
1198 my ($self, $fontsize) = @_; 1425 my ($self, $fontsize) = @_;
1199 1426
1200 $self->{fontsize} = $fontsize; 1427 $self->{fontsize} = $fontsize;
1201 delete $self->{texture}; 1428 delete $self->{texture};
1429
1430 $self->update;
1202 $self->check_size; 1431 $self->check_size;
1203 $self->update;
1204} 1432}
1205 1433
1206sub _draw { 1434sub _draw {
1207 my ($self) = @_; 1435 my ($self) = @_;
1208 1436
1437 $self->SUPER::_draw; # draw background, if applicable
1438
1209 my $tex = $self->{texture} ||= do { 1439 my $tex = $self->{texture} ||= do {
1440 $self->{layout}->set_foreground (@{$self->{fg}});
1210 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1441 $self->{layout}->set_font ($self->{font}) if $self->{font};
1211 $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});
1212 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446
1213 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
1214 }; 1458 };
1215 1459
1216 glEnable GL_BLEND;
1217 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1218 glEnable GL_TEXTURE_2D; 1460 glEnable GL_TEXTURE_2D;
1219 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1220 1462
1463 if ($tex->{format} == GL_ALPHA) {
1221 glColor @{$self->{fg}}; 1464 glColor @{$self->{fg}};
1222
1223 $self->{ox} = int (
1224 $self->{align} < 0 ? $self->{padding}
1225 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1226 : ($self->{w} - $tex->{w}) * 0.5
1227 );
1228
1229 $self->{oy} = int (
1230 $self->{valign} < 0 ? $self->{padding}
1231 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1232 : ($self->{h} - $tex->{h}) * 0.5
1233 );
1234
1235 $tex->draw_quad ($self->{ox}, $self->{oy}); 1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1466 } else {
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1468 }
1236 1469
1237 glDisable GL_TEXTURE_2D; 1470 glDisable GL_TEXTURE_2D;
1238 glDisable GL_BLEND;
1239} 1471}
1240 1472
1241############################################################################# 1473#############################################################################
1242 1474
1243package CFClient::UI::EntryBase; 1475package CFClient::UI::EntryBase;
1248 1480
1249sub new { 1481sub new {
1250 my $class = shift; 1482 my $class = shift;
1251 1483
1252 $class->SUPER::new ( 1484 $class->SUPER::new (
1253 fg => [1, 1, 1], 1485 fg => [1, 1, 1],
1254 bg => [0, 0, 0, 0.2], 1486 bg => [0, 0, 0, 0.2],
1255 active_bg => [1, 1, 1, 0.5], 1487 active_bg => [1, 1, 1, 0.5],
1256 active_fg => [0, 0, 0], 1488 active_fg => [0, 0, 0],
1257 can_hover => 1, 1489 can_hover => 1,
1258 can_focus => 1, 1490 can_focus => 1,
1259 valign => 0, 1491 valign => 0,
1260 can_events => 1, 1492 can_events => 1,
1261 @_ 1493 @_
1262 ) 1494 )
1263} 1495}
1264 1496
1278 $self->{layout}->set_text ("$text "); 1510 $self->{layout}->set_text ("$text ");
1279 1511
1280 $self->emit (changed => $self->{text}); 1512 $self->emit (changed => $self->{text});
1281} 1513}
1282 1514
1283sub get_text {
1284 $_[0]{text}
1285}
1286
1287sub size_request {
1288 my ($self) = @_;
1289
1290 my ($w, $h) = $self->SUPER::size_request;
1291
1292 ($w + 1, $h) # add 1 for cursor
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1299}
1300
1301sub set_text { 1515sub set_text {
1302 my ($self, $text) = @_; 1516 my ($self, $text) = @_;
1303 1517
1304 $self->{cursor} = length $text; 1518 $self->{cursor} = length $text;
1305 $self->_set_text ($text); 1519 $self->_set_text ($text);
1306 $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
1307} 1540}
1308 1541
1309sub key_down { 1542sub key_down {
1310 my ($self, $ev) = @_; 1543 my ($self, $ev) = @_;
1311 1544
1313 my $sym = $ev->{sym}; 1546 my $sym = $ev->{sym};
1314 my $uni = $ev->{unicode}; 1547 my $uni = $ev->{unicode};
1315 1548
1316 my $text = $self->get_text; 1549 my $text = $self->get_text;
1317 1550
1318 if ($sym == 8) { 1551 if ($uni == 8) {
1319 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1552 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1320 } elsif ($sym == 127) { 1553 } elsif ($uni == 127) {
1321 substr $text, $self->{cursor}, 1, ""; 1554 substr $text, $self->{cursor}, 1, "";
1322 } elsif ($sym == CFClient::SDLK_LEFT) { 1555 } elsif ($sym == CFClient::SDLK_LEFT) {
1323 --$self->{cursor} if $self->{cursor}; 1556 --$self->{cursor} if $self->{cursor};
1324 } elsif ($sym == CFClient::SDLK_RIGHT) { 1557 } elsif ($sym == CFClient::SDLK_RIGHT) {
1325 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1558 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1326 } elsif ($sym == CFClient::SDLK_HOME) { 1559 } elsif ($sym == CFClient::SDLK_HOME) {
1327 $self->{cursor} = 0; 1560 $self->{cursor} = 0;
1328 } elsif ($sym == CFClient::SDLK_END) { 1561 } elsif ($sym == CFClient::SDLK_END) {
1329 $self->{cursor} = length $text; 1562 $self->{cursor} = length $text;
1330 } elsif ($sym == 27) { 1563 } elsif ($uni == 27) {
1331 $self->emit ('escape'); 1564 $self->emit ('escape');
1332 } elsif ($uni) { 1565 } elsif ($uni) {
1333 substr $text, $self->{cursor}++, 0, chr $uni; 1566 substr $text, $self->{cursor}++, 0, chr $uni;
1334 } 1567 }
1335 1568
1336 $self->_set_text ($text); 1569 $self->_set_text ($text);
1337 $self->update; 1570 $self->update;
1571 $self->check_size;
1338} 1572}
1339 1573
1340sub focus_in { 1574sub focus_in {
1341 my ($self) = @_; 1575 my ($self) = @_;
1342 1576
1418 my ($self, $ev) = @_; 1652 my ($self, $ev) = @_;
1419 1653
1420 my $sym = $ev->{sym}; 1654 my $sym = $ev->{sym};
1421 1655
1422 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} = '';
1423 $self->emit (activate => $self->get_text); 1661 $self->emit (activate => $txt);
1424 $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 }
1425 1685
1426 } else { 1686 } else {
1427 $self->SUPER::key_down ($ev); 1687 $self->SUPER::key_down ($ev);
1428 } 1688 }
1429 1689
1443 1703
1444sub new { 1704sub new {
1445 my $class = shift; 1705 my $class = shift;
1446 1706
1447 $class->SUPER::new ( 1707 $class->SUPER::new (
1448 padding => 4, 1708 padding => 4,
1449 fg => [1, 1, 1], 1709 fg => [1, 1, 1],
1450 bg => [1, 1, 1, 0.2],
1451 active_fg => [0, 0, 1], 1710 active_fg => [0, 0, 1],
1452 can_hover => 1, 1711 can_hover => 1,
1453 align => 0, 1712 align => 0,
1454 valign => 0, 1713 valign => 0,
1455 can_events => 1, 1714 can_events => 1,
1456 @_ 1715 @_
1457 ) 1716 )
1458} 1717}
1459 1718
1473 1732
1474 if ($GRAB == $self) { 1733 if ($GRAB == $self) {
1475 $self->{fg} = $self->{active_fg}; 1734 $self->{fg} = $self->{active_fg};
1476 } 1735 }
1477 1736
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D; 1737 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482 glColor 0, 0, 0, 1; 1739 glColor 0, 0, 0, 1;
1483 1740
1484 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1741 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1485 1742
1486 glDisable GL_TEXTURE_2D; 1743 glDisable GL_TEXTURE_2D;
1487 glDisable GL_BLEND;
1488 1744
1489 $self->SUPER::_draw; 1745 $self->SUPER::_draw;
1490} 1746}
1491 1747
1492############################################################################# 1748#############################################################################
1506 1762
1507 $class->SUPER::new ( 1763 $class->SUPER::new (
1508 padding => 2, 1764 padding => 2,
1509 fg => [1, 1, 1], 1765 fg => [1, 1, 1],
1510 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],
1511 state => 0, 1769 state => 0,
1512 can_hover => 1, 1770 can_hover => 1,
1513 @_ 1771 @_
1514 ) 1772 )
1515} 1773}
1539 1797
1540 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;
1541 1799
1542 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1543 1801
1544 glEnable GL_BLEND; 1802 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803
1545 glEnable GL_TEXTURE_2D; 1804 glEnable GL_TEXTURE_2D;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1547
1548 my $tex = $self->{state} ? $tex[1] : $tex[0];
1549
1550 $tex->draw_quad (0, 0, $s, $s); 1805 $tex->draw_quad_alpha (0, 0, $s, $s);
1551
1552 glDisable GL_TEXTURE_2D; 1806 glDisable GL_TEXTURE_2D;
1553 glDisable GL_BLEND;
1554} 1807}
1555 1808
1556############################################################################# 1809#############################################################################
1557 1810
1558package CFClient::UI::Image; 1811package CFClient::UI::Image;
1601 glTranslate 0, -$self->{w}, 0; 1854 glTranslate 0, -$self->{w}, 0;
1602 1855
1603 ($w, $h) = ($h, $w); 1856 ($w, $h) = ($h, $w);
1604 } 1857 }
1605 1858
1606 glEnable GL_BLEND;
1607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1608 glEnable GL_TEXTURE_2D; 1859 glEnable GL_TEXTURE_2D;
1609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1610 1861
1611 $tex->draw_quad (0, 0, $w, $h); 1862 $tex->draw_quad_alpha (0, 0, $w, $h);
1612 1863
1613 glDisable GL_BLEND;
1614 glDisable GL_TEXTURE_2D; 1864 glDisable GL_TEXTURE_2D;
1615} 1865}
1616 1866
1617############################################################################# 1867#############################################################################
1618 1868
1666} 1916}
1667 1917
1668sub set_max { 1918sub set_max {
1669 my ($self, $max) = @_; 1919 my ($self, $max) = @_;
1670 1920
1921 return if $self->{max_val} == $max;
1922
1671 $self->{max_val} = $max; 1923 $self->{max_val} = $max;
1924 $self->update;
1672} 1925}
1673 1926
1674sub set_value { 1927sub set_value {
1675 my ($self, $val, $max) = @_; 1928 my ($self, $val, $max) = @_;
1676 1929
1677 $self->set_max ($max) 1930 $self->set_max ($max)
1678 if defined $max; 1931 if defined $max;
1679 1932
1680 $max = $self->{max_val}; 1933 return if $self->{val} == $val;
1934
1681 $self->{val} = $val; 1935 $self->{val} = $val;
1682
1683 $self->update; 1936 $self->update;
1684} 1937}
1685 1938
1686sub _draw { 1939sub _draw {
1687 my ($self) = @_; 1940 my ($self) = @_;
1750 2003
1751sub new { 2004sub new {
1752 my ($class, %arg) = @_; 2005 my ($class, %arg) = @_;
1753 2006
1754 my $self = $class->SUPER::new ( 2007 my $self = $class->SUPER::new (
1755 tooltip => $arg{type}, 2008 tooltip => $arg{type},
2009 can_hover => 1,
1756 can_events => 1, 2010 can_events => 1,
1757 can_hover => 1,
1758 %arg, 2011 %arg,
1759 ); 2012 );
1760 2013
1761 $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");
1762 $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);
1770 2023
1771 $self->{value}->set_fontsize ($fsize); 2024 $self->{value}->set_fontsize ($fsize);
1772 $self->{max} ->set_fontsize ($fsize); 2025 $self->{max} ->set_fontsize ($fsize);
1773} 2026}
1774 2027
2028sub set_max {
2029 my ($self, $max) = @_;
2030
2031 $self->{gauge}->set_max ($max);
2032 $self->{max}->set_text ($max);
2033}
2034
1775sub set_value { 2035sub set_value {
1776 my ($self, $val, $max) = @_; 2036 my ($self, $val, $max) = @_;
1777 2037
1778 $self->set_max ($max) 2038 $self->set_max ($max)
1779 if defined $max; 2039 if defined $max;
1780 2040
1781 $self->{gauge}->set_value ($val, $max); 2041 $self->{gauge}->set_value ($val, $max);
1782 $self->{value}->set_text ($val); 2042 $self->{value}->set_text ($val);
1783}
1784
1785sub set_max {
1786 my ($self, $max) = @_;
1787
1788 $self->{gauge}->set_max ($max);
1789 $self->{max}->set_text ($max);
1790} 2043}
1791 2044
1792############################################################################# 2045#############################################################################
1793 2046
1794package CFClient::UI::Slider; 2047package CFClient::UI::Slider;
1804 qw(s1_slider.png s1_slider_bg.png); 2057 qw(s1_slider.png s1_slider_bg.png);
1805 2058
1806sub new { 2059sub new {
1807 my $class = shift; 2060 my $class = shift;
1808 2061
1809 # range [value, low, high, page] 2062 # range [value, low, high, page, unit]
1810 2063
1811 # TODO: 0-width page 2064 # TODO: 0-width page
1812 # TODO: req_w/h are wrong with vertical 2065 # TODO: req_w/h are wrong with vertical
1813 # TODO: calculations are off 2066 # TODO: calculations are off
1814 my $self = $class->SUPER::new ( 2067 my $self = $class->SUPER::new (
1815 fg => [1, 1, 1], 2068 fg => [1, 1, 1],
1816 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],
1817 range => [0, 0, 100, 10], 2072 range => [0, 0, 100, 10],
1818 req_w => 20, 2073 req_w => $::WIDTH / 80,
1819 req_h => 20, 2074 req_h => $::WIDTH / 80,
1820 vertical => 0, 2075 vertical => 0,
1821 can_hover => 1, 2076 can_hover => 1,
1822 inner_pad => 5, 2077 inner_pad => 0.02,
1823 @_ 2078 @_
1824 ); 2079 );
1825 2080
2081 $self->set_value ($self->{range}[0]);
2082 $self->update;
2083
1826 $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 }
1827} 2108}
1828 2109
1829sub size_request { 2110sub size_request {
1830 my ($self) = @_; 2111 my ($self) = @_;
1831 2112
1844 2125
1845sub mouse_motion { 2126sub mouse_motion {
1846 my ($self, $ev, $x, $y) = @_; 2127 my ($self, $ev, $x, $y) = @_;
1847 2128
1848 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
1849 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2146 my ($value, $lo, $hi, $page) = @{$self->{range}};
1850 2147
1851 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2148 my $inner_w = 1 - 2 * $self->{inner_pad};
1852 2149
1853 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1854 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1855 2151
1856 $x -= $inner_pad_px; # substract the padding 2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1857 $x = $x * ($hi - $lo) / $inner_w + $lo; 2153 $value = $self->{scale} * ($value - $lo);
1858 $x = $lo if $x < $lo;
1859 $x = $hi - $page if $x > $hi - $page;
1860 $self->{range}[0] = $x;
1861 2154
1862 $self->emit (changed => $x); 2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
1863 $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;
1864 } 2162 });
1865}
1866 2163
1867# the inner_* stuff is for generating a padding for the slider handle, 2164 $self->SUPER::update;
1868# so that the handle doesn't leave the texture. This calculation isn't 100%
1869# correct propably, but it does the job for now
1870sub _calc_inner_pad_px {
1871 my ($self, $w) = @_;
1872 ($w / 100) * $self->{inner_pad} # % to pixels
1873} 2165}
1874 2166
1875sub _draw { 2167sub _draw {
1876 my ($self) = @_; 2168 my ($self) = @_;
1877 2169
1878 $self->SUPER::_draw (); 2170 $self->SUPER::_draw ();
1879 2171
1880 my ($w, $h) = @$self{qw(w h)}; 2172 glScale $self->{w}, $self->{h};
1881 2173
1882 if ($self->{vertical}) { 2174 if ($self->{vertical}) {
1883 # draw a vertical slider like a rotated horizontal slider 2175 # draw a vertical slider like a rotated horizontal slider
1884 2176
2177 glTranslate 1, 0, 0;
1885 glRotate 90, 0, 0, 1; 2178 glRotate 90, 0, 0, 1;
1886 glTranslate 0, -$self->{w}, 0;
1887
1888 ($w, $h) = ($h, $w);
1889 } 2179 }
1890 2180
1891 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2181 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1892 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2182 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1893 2183
1894 my ($value, $lo, $hi, $page) = @{$self->{range}};
1895
1896 $hi = $value + 1 if $lo == $hi;
1897
1898 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1899 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1900
1901 $page = int $page * $inner_w / ($hi - $lo);
1902 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1903
1904 $w -= $page;
1905 $page &= ~1;
1906 glTranslate $page * 0.5, 0, 0;
1907 $page ||= 2;
1908
1909 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1910 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1911
1912 glEnable GL_BLEND;
1913 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1914 glEnable GL_TEXTURE_2D; 2184 glEnable GL_TEXTURE_2D;
1915 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1916 2186
1917 # draw background 2187 # draw background
1918 $tex[1]->draw_quad (0, 0, $w, $h); 2188 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1919 2189
1920 # draw handle 2190 # draw handle
1921 $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);
1922 2192
1923 glDisable GL_BLEND;
1924 glDisable GL_TEXTURE_2D; 2193 glDisable GL_TEXTURE_2D;
1925} 2194}
1926 2195
1927############################################################################# 2196#############################################################################
1928 2197
1934 2203
1935sub new { 2204sub new {
1936 my $class = shift; 2205 my $class = shift;
1937 2206
1938 my $self = $class->SUPER::new ( 2207 my $self = $class->SUPER::new (
1939 fontsize => 1, 2208 fontsize => 1,
2209 can_events => 0,
1940 #font => default_font 2210 #font => default_font
1941 @_, 2211 @_,
1942 2212
1943 layout => (new CFClient::Layout), 2213 layout => (new CFClient::Layout 1),
1944 par => [], 2214 par => [],
1945 height => 0, 2215 height => 0,
1946 children => [ 2216 children => [
1947 (new CFClient::UI::Empty expand => 1), 2217 (new CFClient::UI::Empty expand => 1),
1948 (new CFClient::UI::Slider vertical => 1), 2218 (new CFClient::UI::Slider vertical => 1),
1949 ], 2219 ],
1950 ); 2220 );
1951 2221
1952 $self->{children}[1]->connect (changed => sub { 2222 $self->{children}[1]->connect (changed => sub { $self->update });
1953 $self->update;
1954 });
1955 2223
1956 $self 2224 $self
1957} 2225}
1958 2226
1959sub set_fontsize { 2227sub set_fontsize {
1960 my ($self, $fontsize) = @_; 2228 my ($self, $fontsize) = @_;
1961 2229
1962 $self->{fontsize} = $fontsize; 2230 $self->{fontsize} = $fontsize;
1963 $self->reflow; 2231 $self->reflow;
1964}
1965
1966sub text_height {
1967 my ($self, $text) = @_;
1968
1969 my $layout = $self->{layout};
1970
1971 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1972 $layout->set_width ($self->{w});
1973 $layout->set_text ($text);
1974
1975 ($layout->size)[1]
1976}
1977
1978sub reflow {
1979 my ($self) = @_;
1980
1981 $self->{need_reflow}++;
1982 $self->update;
1983} 2232}
1984 2233
1985sub size_allocate { 2234sub size_allocate {
1986 my ($self, $w, $h) = @_; 2235 my ($self, $w, $h) = @_;
1987 2236
1992 $self->{layout}->set_width ($self->{children}[0]{w}); 2241 $self->{layout}->set_width ($self->{children}[0]{w});
1993 2242
1994 $self->reflow; 2243 $self->reflow;
1995} 2244}
1996 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
1997sub add_paragraph { 2265sub add_paragraph {
1998 my ($self, $color, $text) = @_; 2266 my ($self, $color, $text, $indent) = @_;
1999 2267
2000 #TODO: intelligently "reformat" paragraph 2268 #TODO: intelligently "reformat" paragraph
2001 2269
2270 for my $line (split /\n/, $text) {
2002 my $height = $self->text_height ($text); 2271 my $height = $self->text_height ($line);
2003
2004 $self->{height} += $height; 2272 $self->{height} += $height;
2005
2006 push @{$self->{par}}, [$height, $color, $text]; 2273 push @{$self->{par}}, [$height, $color, $indent, $line];
2274 }
2007 2275
2008 $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}];
2009 $self->{children}[1]->update; 2277 $self->{children}[1]->update;
2010} 2278}
2011 2279
2016 2284
2017 return unless $self->{h} > 0; 2285 return unless $self->{h} > 0;
2018 2286
2019 delete $self->{texture}; 2287 delete $self->{texture};
2020 2288
2021 $ROOT->on_refresh ($self, sub { 2289 $ROOT->on_post_alloc ($self, sub {
2022 if (delete $self->{need_reflow}) { 2290 if (delete $self->{need_reflow}) {
2023 my $height = 0; 2291 my $height = 0;
2024 2292
2025 $height += $_->[0] = $self->text_height ($_->[2]) 2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2026 for @{$self->{par}}; 2294 for @{$self->{par}};
2027 2295
2028 $self->{height} = $height; 2296 $self->{height} = $height;
2029 2297
2030 $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;
2031 2300
2032 delete $self->{texture}; 2301 delete $self->{texture};
2033 } 2302 }
2034 2303
2035 $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 {
2036 glClearColor 0, 0, 0, 1; 2305 glClearColor 0.5, 0.5, 0.5, 0;
2037 glClear GL_COLOR_BUFFER_BIT; 2306 glClear GL_COLOR_BUFFER_BIT;
2038
2039 glEnable GL_BLEND;
2040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2041 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2307
2044 my $top = int $self->{children}[1]{range}[0]; 2308 my $top = int $self->{children}[1]{range}[0];
2045 2309
2046 my $y0 = $top; 2310 my $y0 = $top;
2047 my $y1 = $top + $self->{h}; 2311 my $y1 = $top + $self->{h};
2050 2314
2051 my $layout = $self->{layout}; 2315 my $layout = $self->{layout};
2052 2316
2053 $layout->set_font ($self->{font}) if $self->{font}; 2317 $layout->set_font ($self->{font}) if $self->{font};
2054 2318
2319 glEnable GL_BLEND;
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321
2055 for my $par (@{$self->{par}}) { 2322 for my $par (@{$self->{par}}) {
2056 my $h = $par->[0]; 2323 my $h = $par->[0];
2057 2324
2058 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]);
2059 $layout->set_text ($par->[2]); 2328 $layout->set_markup ($par->[3]);
2060 2329
2061 glColor @{ $par->[1] }; 2330 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2062 my ($W, $H) = $layout->size; 2331
2063 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;
2064 } 2334 }
2065 2335
2066 $y += $h; 2336 $y += $h;
2067 } 2337 }
2068 2338
2069 glDisable GL_TEXTURE_2D;
2070 glDisable GL_BLEND; 2339 glDisable GL_BLEND;
2071 }; 2340 };
2072 }); 2341 });
2073} 2342}
2074 2343
2075sub _draw { 2344sub _draw {
2076 my ($self) = @_; 2345 my ($self) = @_;
2077 2346
2078 if ($self->{texture}) {
2079 glEnable GL_TEXTURE_2D; 2347 glEnable GL_TEXTURE_2D;
2080 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;
2081 $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});
2082 glDisable GL_TEXTURE_2D; 2351 glDisable GL_TEXTURE_2D;
2083 }
2084 2352
2085 $self->{children}[1]->draw; 2353 $self->{children}[1]->draw;
2086 2354
2087} 2355}
2088 2356
2136 2404
2137sub new { 2405sub new {
2138 my $class = shift; 2406 my $class = shift;
2139 2407
2140 my $self = $class->SUPER::new ( 2408 my $self = $class->SUPER::new (
2141 state => 0, 2409 state => 0,
2142 connect_activate => \&toggle_flopper, 2410 connect_activate => \&toggle_flopper,
2143 can_events => 1,
2144 @_ 2411 @_
2145 ); 2412 );
2146 2413
2147 if ($self->{state}) { 2414 if ($self->{state}) {
2148 $self->{state} = 0; 2415 $self->{state} = 0;
2183 @_, 2450 @_,
2184 can_events => 0, 2451 can_events => 0,
2185 ) 2452 )
2186} 2453}
2187 2454
2188sub set_text { 2455sub set_tooltip_from {
2189 my ($self, $text) = @_; 2456 my ($self, $widget) = @_;
2190 2457
2191 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2458 $self->add (new CFClient::UI::Label
2192 $self->{label}->set_text ($text); 2459 markup => $widget->{tooltip},
2193 $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 );
2194} 2466}
2195 2467
2196sub size_request { 2468sub size_request {
2197 my ($self) = @_; 2469 my ($self) = @_;
2198 2470
2199 $self->child->set_max_size ($::WIDTH * 0.3);
2200
2201 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2471 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2202 2472
2203 ($w + 4, $h + 4) 2473 ($w + 4, $h + 4)
2204} 2474}
2205 2475
2476sub size_allocate {
2477 my ($self, $w, $h) = @_;
2478
2479 $self->SUPER::size_allocate ($w - 4, $h - 4);
2480}
2481
2206sub _draw { 2482sub _draw {
2207 my ($self) = @_; 2483 my ($self) = @_;
2208 2484
2209 glPushMatrix;
2210 glTranslate 0.375, 0.375; 2485 glTranslate 0.375, 0.375;
2211 2486
2212 my ($w, $h) = @$self{qw(w h)}; 2487 my ($w, $h) = @$self{qw(w h)};
2213 2488
2214 glColor 1, 0.8, 0.4; 2489 glColor 1, 0.8, 0.4;
2225 glVertex 0 , $h; 2500 glVertex 0 , $h;
2226 glVertex $w, $h; 2501 glVertex $w, $h;
2227 glVertex $w, 0; 2502 glVertex $w, 0;
2228 glEnd; 2503 glEnd;
2229 2504
2230 glPopMatrix; 2505 glTranslate 2 - 0.375, 2 - 0.375;
2231
2232 glTranslate 2, 2;
2233 $self->SUPER::_draw; 2506 $self->SUPER::_draw;
2234} 2507}
2235 2508
2236############################################################################# 2509#############################################################################
2237 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
2238package CFClient::UI::Root; 2917package CFClient::UI::Root;
2239 2918
2240our @ISA = CFClient::UI::Container::; 2919our @ISA = CFClient::UI::Container::;
2241 2920
2242use CFClient::OpenGL; 2921use CFClient::OpenGL;
2243 2922
2244sub check_size { 2923sub new {
2245 my ($self) = @_; 2924 my $class = shift;
2246 2925
2247 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2926 $class->SUPER::new (
2248} 2927 @_,
2249 2928 )
2250sub size_request {
2251 ($::WIDTH, $::HEIGHT)
2252} 2929}
2253 2930
2254sub configure { 2931sub configure {
2255 my ($self, $x, $y, $w, $h) = @_; 2932 my ($self, $x, $y, $w, $h) = @_;
2256 2933
2257 $self->SUPER::configure ($x, $y, $w, $h); 2934 $self->{w} = $w;
2935 $self->{h} = $h;
2936}
2258 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
2259 for my $child (@{$self->{children}}) { 2960 for my $child ($self->children) {
2260 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)};
2261 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
2262 $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;
2263 $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
2264 $child->configure ($X, $Y, $W,$H); 2972 $child->configure ($X, $Y, $W, $H);
2265 } 2973 }
2266} 2974}
2267 2975
2268sub _topleft { 2976sub coord2local {
2269 my ($self, $x, $y) = @_; 2977 my ($self, $x, $y) = @_;
2270 2978
2271 ($x, $y) 2979 ($x, $y)
2272} 2980}
2273 2981
2982sub coord2global {
2983 my ($self, $x, $y) = @_;
2984
2985 ($x, $y)
2986}
2987
2274sub update { 2988sub update {
2275 my ($self) = @_; 2989 my ($self) = @_;
2276 2990
2277 $self->check_size; 2991 $self->check_size;
2278 ::refresh (); 2992 $::WANT_REFRESH++;
2279} 2993}
2280 2994
2281sub add { 2995sub add {
2282 my ($self, $child) = @_; 2996 my ($self, @children) = @_;
2283 2997
2998 for my $child (@children) {
2999 $child->{toplevel} = 1;
3000
2284 # integerize window positions 3001 # integerise window positions
2285 $child->{x} = int $child->{x}; 3002 $child->{x} = int $child->{x};
2286 $child->{y} = int $child->{y}; 3003 $child->{y} = int $child->{y};
3004 }
2287 3005
2288 $self->SUPER::add ($child); 3006 $self->SUPER::add (@children);
2289} 3007}
2290 3008
2291sub on_refresh { 3009sub on_refresh {
2292 my ($self, $id, $cb) = @_; 3010 my ($self, $id, $cb) = @_;
2293 3011
2294 $self->{refresh_hook}{$id} = $cb; 3012 $self->{refresh_hook}{$id} = $cb;
2295} 3013}
2296 3014
3015sub on_post_alloc {
3016 my ($self, $id, $cb) = @_;
3017
3018 $self->{post_alloc_hook}{$id} = $cb;
3019}
3020
2297sub draw { 3021sub draw {
2298 my ($self) = @_; 3022 my ($self) = @_;
2299 3023
2300 while (my $rcb = delete $self->{refresh_hook}) { 3024 while ($self->{refresh_hook}) {
2301 $_->() 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}};
2302 } 3077 }
2303 3078
2304 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3079 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2305 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3080 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2306 glClear GL_COLOR_BUFFER_BIT; 3081 glClear GL_COLOR_BUFFER_BIT;
2307 3082
2308 glMatrixMode GL_PROJECTION; 3083 glMatrixMode GL_PROJECTION;
2309 glLoadIdentity; 3084 glLoadIdentity;
2310 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3085 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2311 glMatrixMode GL_MODELVIEW; 3086 glMatrixMode GL_MODELVIEW;
2312 glLoadIdentity; 3087 glLoadIdentity;
2313 3088
2314 $self->_draw; 3089 $self->_draw;
2315} 3090}
2317############################################################################# 3092#############################################################################
2318 3093
2319package CFClient::UI; 3094package CFClient::UI;
2320 3095
2321$ROOT = new CFClient::UI::Root; 3096$ROOT = new CFClient::UI::Root;
2322$TOOLTIP = new CFClient::UI::Tooltip; 3097$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2323 3098
23241 30991
2325 3100

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines