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.225 by root, Tue May 23 21:14:41 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
150 return if $self->{parent}; 211 return if $self->{parent};
151 212
152 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
153} 214}
154 215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
155sub hide { 229sub hide {
156 my ($self) = @_; 230 my ($self) = @_;
157 231
158 return unless $self->{parent}; 232 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self;
159 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)});
634 748
635 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
636} 750}
637 751
638sub _draw { 752sub size_allocate {
639 my ($self) = @_; 753 my ($self, $w, $h) = @_;
640 754
641 $self->{children}[1]->draw; 755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
758 $self->update;
642} 759}
643 760
761sub set_offset {
762 my ($self, $x, $y) = @_;
644 763
645############################################################################# 764 $self->{view_x} = int $x;
765 $self->{view_y} = int $y;
646 766
767 $self->update;
768}
769
770# hmm, this does not work for topleft of $self... but we should not ask for that
771sub coord2local {
772 my ($self, $x, $y) = @_;
773
774 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
775}
776
777sub coord2global {
778 my ($self, $x, $y) = @_;
779
780 $x = List::Util::min $self->{w}, $x - $self->{view_x};
781 $y = List::Util::min $self->{h}, $y - $self->{view_y};
782
783 $self->SUPER::coord2global ($x, $y)
784}
785
786sub find_widget {
787 my ($self, $x, $y) = @_;
788
789 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
790 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
791 ) {
792 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
793 } else {
794 $self->CFClient::UI::Base::find_widget ($x, $y)
795 }
796}
797
798sub _render {
799 my ($self) = @_;
800
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802
803 $self->SUPER::_render;
804}
805
806#############################################################################
807
647package CFClient::UI::Frame; 808package CFClient::UI::ScrolledWindow;
648 809
649our @ISA = CFClient::UI::Bin::; 810our @ISA = CFClient::UI::HBox::;
650
651use CFClient::OpenGL;
652 811
653sub new { 812sub new {
654 my $class = shift; 813 my $class = shift;
655 814
815 my $self;
816
817 my $slider = new CFClient::UI::Slider
818 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
822 },
823 ;
824
656 my $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
657 bg => [1, 1, 1, 1], 826 vp => (new CFClient::UI::ViewPort expand => 1),
658 border_bg => [1, 1, 1, 1], 827 slider => $slider,
659 border => 0.8,
660 @_ 828 @_,
661 ); 829 );
662 830
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider});
834
663 $self 835 $self
664} 836}
665 837
838#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll
840
841#############################################################################
842
843package CFClient::UI::Frame;
844
845our @ISA = CFClient::UI::Bin::;
846
847use CFClient::OpenGL;
848
849sub new {
850 my $class = shift;
851
852 $class->SUPER::new (
853 bg => undef,
854 @_,
855 )
856}
857
666sub _draw { 858sub _draw {
667 my ($self) = @_; 859 my ($self) = @_;
668 860
669 my ($w, $h) = ($self->{w}, $self->{h}); 861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
670 863
671 glEnable GL_BLEND; 864 glEnable GL_BLEND;
672 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 866 glColor @{ $self->{bg} };
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 867
676# glBegin GL_QUADS; 868 glBegin GL_QUADS;
677# glColor 0, 0, 0, 0;
678# glVertex 0 , 0; 869 glVertex 0 , 0;
679# glVertex 0 , $h; 870 glVertex 0 , $h;
680# glVertex $w, $h; 871 glVertex $w, $h;
681# glVertex $w, 0; 872 glVertex $w, 0;
682# glEnd; 873 glEnd;
683 874
684
685 $self->child->draw;
686 glDisable GL_BLEND; 875 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 876 }
877
878 $self->SUPER::_draw;
688} 879}
689 880
690############################################################################# 881#############################################################################
691 882
692package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
… …
703 my $class = shift; 894 my $class = shift;
704 895
705 # TODO: user_x, user_y, overwrite moveto? 896 # TODO: user_x, user_y, overwrite moveto?
706 897
707 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
710 border => 0.8, 901 border => 0.6,
902 toplevel => 1,
711 can_events => 1, 903 can_events => 1,
712 @_ 904 @_
713 ); 905 );
714 906
715 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 908 align => 0,
717 valign => 1, 909 valign => 1,
718 text => $self->{title}, 910 text => $self->{title},
719 fontsize => 1; 911 fontsize => $self->{border};
720 912
721 $self 913 $self
722} 914}
723 915
724sub border { 916sub border {
… …
740 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
741 933
742 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
743 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
744 936
745 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
746 if $self->{title}; 938 if $self->{title};
747 939
748 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
749} 941}
750 942
751sub button_down { 943sub button_down {
752 my ($self, $ev, $x, $y) = @_; 944 my ($self, $ev, $x, $y) = @_;
753 945
946 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 947 my $border = $self->border;
755 948
756 if ($x < $self->{w} && $x >= $self->{w} - $border 949 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 950 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 951
952 if ($lr & $td) {
953 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 954 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 955 my ($bw, $bh) = ($self->{w}, $self->{h});
761 956
957 my $mx = $x < $border;
958 my $my = $y < $border;
959
762 $self->{motion} = sub { 960 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 961 my ($ev, $x, $y) = @_;
764 962
765 ($x, $y) = ($ev->{x}, $ev->{y}); 963 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy;
766 965
767 $self->{user_w} = $bw + $x - $ox; 966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
768 $self->{user_h} = $bh + $y - $oy; 967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
769 $self->check_size; 969 $self->check_size;
770 }; 970 };
771 971
772 } elsif ($x >= 0 && $x < $self->{w} 972 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 973 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 974 my ($bx, $by) = ($self->{x}, $self->{y});
777 975
778 $self->{motion} = sub { 976 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 977 my ($ev, $x, $y) = @_;
… …
802 my ($self) = @_; 1000 my ($self) = @_;
803 1001
804 my ($w, $h ) = ($self->{w}, $self->{h}); 1002 my ($w, $h ) = ($self->{w}, $self->{h});
805 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806 1004
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 1005 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811 1007
812 my $border = $self->border; 1008 my $border = $self->border;
813 1009
814 glColor @{ $self->{border_bg} }; 1010 glColor @{ $self->{border_bg} };
815 $tex[1]->draw_quad (0, 0, $w, $border); 1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
819 1015
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820 my $bg = $tex[0]; 1017 my $bg = $tex[0];
821 1018
822 # TODO: repeat texture not scale 1019 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 1020 my $rep_x = $cw / $bg->{w};
824 my $rep_y = $ch / $bg->{h}; 1021 my $rep_y = $ch / $bg->{h};
825 1022
826 glColor @{ $self->{bg} }; 1023 glColor @{ $self->{bg} };
827 1024
828 $bg->{s} = $rep_x; 1025 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y; 1026 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1; 1027 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 }
832 1030
833 glDisable GL_TEXTURE_2D; 1031 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND;
835 1032
836 $self->{title}->draw if $self->{title}; 1033 $self->{title}->draw if $self->{title};
1034
837 $self->child->draw; 1035 $self->child->draw;
838} 1036}
839 1037
840############################################################################# 1038#############################################################################
841 1039
… …
863 $self->{children}[$y][$x] = $child; 1061 $self->{children}[$y][$x] = $child;
864 1062
865 $child->check_size; 1063 $child->check_size;
866} 1064}
867 1065
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
868# TODO: move to container class maybe? send childs a signal on removal? 1070# TODO: move to container class maybe? send childs a signal on removal?
869sub clear { 1071sub clear {
870 my ($self) = @_; 1072 my ($self) = @_;
871 1073
1074 my @children = $self->children;
872 delete $self->{children}; 1075 delete $self->{children};
1076
1077 for (@children) {
1078 delete $_->{parent};
1079 $_->hide;
1080 }
1081
873 $self->update; 1082 $self->update;
874} 1083}
875 1084
876sub get_wh { 1085sub get_wh {
877 my ($self) = @_; 1086 my ($self) = @_;
… …
1054} 1263}
1055 1264
1056sub size_allocate { 1265sub size_allocate {
1057 my ($self, $w, $h) = @_; 1266 my ($self, $w, $h) = @_;
1058 1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1059 my $children = $self->{children}; 1270 my $children = $self->{children};
1060 1271
1061 my @h = map $_->{req_h}, @$children; 1272 my @h = map $_->{req_h}, @$children;
1062 1273
1063 my $req_h = List::Util::sum @h; 1274 my $req_h = List::Util::sum @h;
… …
1092 1303
1093############################################################################# 1304#############################################################################
1094 1305
1095package CFClient::UI::Label; 1306package CFClient::UI::Label;
1096 1307
1097our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1098 1309
1099use CFClient::OpenGL; 1310use CFClient::OpenGL;
1100 1311
1101sub new { 1312sub new {
1102 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1103 1314
1104 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1106 #font => default_font 1319 #font => default_font
1320 #text => initial text
1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1324 layout => (new CFClient::Layout),
1107 fontsize => 1, 1325 fontsize => 1,
1108 text => "",
1109 align => -1, 1326 align => -1,
1110 valign => -1, 1327 valign => -1,
1111 padding => 2, 1328 padding => 2,
1112 layout => new CFClient::Layout,
1113 can_events => 0, 1329 can_events => 0,
1114 %arg 1330 %arg
1115 ); 1331 );
1116 1332
1117 if (exists $self->{template}) { 1333 if (exists $self->{template}) {
1118 my $layout = new CFClient::Layout; 1334 my $layout = new CFClient::Layout;
1119 $layout->set_text (delete $self->{template}); 1335 $layout->set_text (delete $self->{template});
1120 $self->{template} = $layout; 1336 $self->{template} = $layout;
1121 } 1337 }
1122 1338
1123 $self->set_text (delete $self->{text}) if exists $self->{text}; 1339 if (exists $self->{markup}) {
1124 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1340 $self->set_markup (delete $self->{markup});
1341 } else {
1342 $self->set_text (delete $self->{text});
1343 }
1125 1344
1126 $self 1345 $self
1127} 1346}
1128 1347
1129sub escape_text { 1348sub escape($) {
1130 local $_ = $_[1]; 1349 local $_ = $_[0];
1131 1350
1132 s/&/&amp;/g; 1351 s/&/&amp;/g;
1133 s/>/&gt;/g; 1352 s/>/&gt;/g;
1134 s/</&lt;/g; 1353 s/</&lt;/g;
1135 1354
1136 $_[1] 1355 $_
1356}
1357
1358sub update {
1359 my ($self) = @_;
1360
1361 delete $self->{texture};
1362 $self->SUPER::update;
1137} 1363}
1138 1364
1139sub set_text { 1365sub set_text {
1140 my ($self, $text) = @_; 1366 my ($self, $text) = @_;
1141 1367
1368 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text";
1370
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142 $self->{layout}->set_text ($text); 1372 $self->{layout}->set_text ($text);
1143 1373
1144 delete $self->{texture}; 1374 $self->update;
1145 $self->check_size; 1375 $self->check_size;
1146 $self->update;
1147} 1376}
1148 1377
1149sub set_markup { 1378sub set_markup {
1150 my ($self, $markup) = @_; 1379 my ($self, $markup) = @_;
1151 1380
1381 return if $self->{text} eq "M$markup";
1382 $self->{text} = "M$markup";
1383
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152 $self->{layout}->set_markup ($markup); 1387 $self->{layout}->set_markup ($markup);
1153 1388
1154 delete $self->{texture}; 1389 $self->update;
1155 $self->check_size; 1390 $self->check_size;
1156 $self->update;
1157} 1391}
1158 1392
1159sub size_request { 1393sub size_request {
1160 my ($self) = @_; 1394 my ($self) = @_;
1161 1395
1162 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1163 $self->{layout}->set_width ($self->{max_w} || -1); 1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1164 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165 1401
1166 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1167 1403
1168 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
… …
1190sub set_fontsize { 1426sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1427 my ($self, $fontsize) = @_;
1192 1428
1193 $self->{fontsize} = $fontsize; 1429 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1430 delete $self->{texture};
1431
1432 $self->update;
1195 $self->check_size; 1433 $self->check_size;
1196 $self->update;
1197} 1434}
1198 1435
1199sub _draw { 1436sub _draw {
1200 my ($self) = @_; 1437 my ($self) = @_;
1201 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1202 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448
1206 new_from_layout CFClient::Texture $self->{layout} 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1450
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1453 : ($self->{w} - $tex->{w}) * 0.5);
1454
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1207 }; 1460 };
1208 1461
1209 glEnable GL_BLEND;
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1464
1465 if ($tex->{format} == GL_ALPHA) {
1214 glColor @{$self->{fg}}; 1466 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}); 1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 }
1229 1471
1230 glDisable GL_TEXTURE_2D; 1472 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1473}
1233 1474
1234############################################################################# 1475#############################################################################
1235 1476
1236package CFClient::UI::EntryBase; 1477package CFClient::UI::EntryBase;
… …
1241 1482
1242sub new { 1483sub new {
1243 my $class = shift; 1484 my $class = shift;
1244 1485
1245 $class->SUPER::new ( 1486 $class->SUPER::new (
1246 fg => [1, 1, 1], 1487 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1488 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1489 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1250 can_hover => 1, 1491 can_hover => 1,
1251 can_focus => 1, 1492 can_focus => 1,
1252 valign => 0, 1493 valign => 0,
1253 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1254 @_ 1496 @_
1255 ) 1497 )
1256} 1498}
1257 1499
1258sub _set_text { 1500sub _set_text {
… …
1269 1511
1270 $text =~ s/./*/g if $self->{hidden}; 1512 $text =~ s/./*/g if $self->{hidden};
1271 $self->{layout}->set_text ("$text "); 1513 $self->{layout}->set_text ("$text ");
1272 1514
1273 $self->emit (changed => $self->{text}); 1515 $self->emit (changed => $self->{text});
1274}
1275
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} 1516}
1293 1517
1294sub set_text { 1518sub set_text {
1295 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1296 1520
1297 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1298 $self->_set_text ($text); 1522 $self->_set_text ($text);
1299 $self->update; 1523 $self->update;
1524 $self->check_size;
1525}
1526
1527sub get_text {
1528 $_[0]{text}
1529}
1530
1531sub size_request {
1532 my ($self) = @_;
1533
1534 my ($w, $h) = $self->SUPER::size_request;
1535
1536 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1300} 1543}
1301 1544
1302sub key_down { 1545sub key_down {
1303 my ($self, $ev) = @_; 1546 my ($self, $ev) = @_;
1304 1547
… …
1306 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1308 1551
1309 my $text = $self->get_text; 1552 my $text = $self->get_text;
1310 1553
1311 if ($sym == 8) { 1554 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1567 $self->emit ('escape');
1325 } elsif ($uni) { 1568 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1327 } 1570 }
1328 1571
1329 $self->_set_text ($text); 1572 $self->_set_text ($text);
1330 $self->update; 1573 $self->update;
1574 $self->check_size;
1331} 1575}
1332 1576
1333sub focus_in { 1577sub focus_in {
1334 my ($self) = @_; 1578 my ($self) = @_;
1335 1579
… …
1411 my ($self, $ev) = @_; 1655 my ($self, $ev) = @_;
1412 1656
1413 my $sym = $ev->{sym}; 1657 my $sym = $ev->{sym};
1414 1658
1415 if ($sym == 13) { 1659 if ($sym == 13) {
1660 unshift @{$self->{history}},
1661 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1664 $self->emit (activate => $txt);
1417 $self->update; 1665 $self->update;
1666
1667 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text;
1670 }
1671 if (@{$self->{history} || []} > 0) {
1672 $self->{history_pointer}++;
1673 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1674 $self->{history_pointer} = @{$self->{history} || []} - 1;
1675 }
1676 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1677 }
1678
1679 } elsif ($sym == CFClient::SDLK_DOWN) {
1680 $self->{history_pointer}--;
1681 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1682
1683 if ($self->{history_pointer} >= 0) {
1684 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1685 } else {
1686 $self->set_text ($self->{history_saveback});
1687 }
1418 1688
1419 } else { 1689 } else {
1420 $self->SUPER::key_down ($ev); 1690 $self->SUPER::key_down ($ev);
1421 } 1691 }
1422 1692
… …
1436 1706
1437sub new { 1707sub new {
1438 my $class = shift; 1708 my $class = shift;
1439 1709
1440 $class->SUPER::new ( 1710 $class->SUPER::new (
1441 padding => 4, 1711 padding => 4,
1442 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1445 can_hover => 1, 1714 can_hover => 1,
1446 align => 0, 1715 align => 0,
1447 valign => 0, 1716 valign => 0,
1448 can_events => 1, 1717 can_events => 1,
1449 @_ 1718 @_
1450 ) 1719 )
1451} 1720}
1452 1721
… …
1466 1735
1467 if ($GRAB == $self) { 1736 if ($GRAB == $self) {
1468 $self->{fg} = $self->{active_fg}; 1737 $self->{fg} = $self->{active_fg};
1469 } 1738 }
1470 1739
1471 glEnable GL_BLEND;
1472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1742 glColor 0, 0, 0, 1;
1476 1743
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1744 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1745
1479 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1747
1482 $self->SUPER::_draw; 1748 $self->SUPER::_draw;
1483} 1749}
1484 1750
1485############################################################################# 1751#############################################################################
… …
1499 1765
1500 $class->SUPER::new ( 1766 $class->SUPER::new (
1501 padding => 2, 1767 padding => 2,
1502 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1503 active_fg => [1, 1, 0], 1769 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5],
1504 state => 0, 1772 state => 0,
1505 can_hover => 1, 1773 can_hover => 1,
1506 @_ 1774 @_
1507 ) 1775 )
1508} 1776}
… …
1532 1800
1533 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1534 1802
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 1804
1537 glEnable GL_BLEND; 1805 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806
1538 glEnable GL_TEXTURE_2D; 1807 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); 1808 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 1809 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 1810}
1548 1811
1549############################################################################# 1812#############################################################################
1550 1813
1551package CFClient::UI::Image; 1814package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 1857 glTranslate 0, -$self->{w}, 0;
1595 1858
1596 ($w, $h) = ($h, $w); 1859 ($w, $h) = ($h, $w);
1597 } 1860 }
1598 1861
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1862 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 1864
1604 $tex->draw_quad (0, 0, $w, $h); 1865 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 1866
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1608} 1868}
1609 1869
1610############################################################################# 1870#############################################################################
1611 1871
… …
1659} 1919}
1660 1920
1661sub set_max { 1921sub set_max {
1662 my ($self, $max) = @_; 1922 my ($self, $max) = @_;
1663 1923
1924 return if $self->{max_val} == $max;
1925
1664 $self->{max_val} = $max; 1926 $self->{max_val} = $max;
1927 $self->update;
1665} 1928}
1666 1929
1667sub set_value { 1930sub set_value {
1668 my ($self, $val, $max) = @_; 1931 my ($self, $val, $max) = @_;
1669 1932
1670 $self->set_max ($max) 1933 $self->set_max ($max)
1671 if defined $max; 1934 if defined $max;
1672 1935
1673 $max = $self->{max_val}; 1936 return if $self->{val} == $val;
1937
1674 $self->{val} = $val; 1938 $self->{val} = $val;
1675
1676 $self->update; 1939 $self->update;
1677} 1940}
1678 1941
1679sub _draw { 1942sub _draw {
1680 my ($self) = @_; 1943 my ($self) = @_;
… …
1743 2006
1744sub new { 2007sub new {
1745 my ($class, %arg) = @_; 2008 my ($class, %arg) = @_;
1746 2009
1747 my $self = $class->SUPER::new ( 2010 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 2011 tooltip => $arg{type},
2012 can_hover => 1,
2013 can_events => 1,
1749 %arg, 2014 %arg,
1750 ); 2015 );
1751 2016
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2017 $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); 2018 $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); 2019 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 2020
1756 $self 2021 $self
1757} 2022}
1758 2023
1759sub set_fontsize { 2024sub set_fontsize {
… …
1761 2026
1762 $self->{value}->set_fontsize ($fsize); 2027 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 2028 $self->{max} ->set_fontsize ($fsize);
1764} 2029}
1765 2030
2031sub set_max {
2032 my ($self, $max) = @_;
2033
2034 $self->{gauge}->set_max ($max);
2035 $self->{max}->set_text ($max);
2036}
2037
1766sub set_value { 2038sub set_value {
1767 my ($self, $val, $max) = @_; 2039 my ($self, $val, $max) = @_;
1768 2040
1769 $self->set_max ($max) 2041 $self->set_max ($max)
1770 if defined $max; 2042 if defined $max;
1771 2043
1772 $self->{gauge}->set_value ($val, $max); 2044 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 2045 $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} 2046}
1782 2047
1783############################################################################# 2048#############################################################################
1784 2049
1785package CFClient::UI::Slider; 2050package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1796 2061
1797sub new { 2062sub new {
1798 my $class = shift; 2063 my $class = shift;
1799 2064
1800 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
1801 2066
1802 # TODO: 0-width page 2067 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2069 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
1807 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5],
1808 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10],
1809 req_w => 20, 2076 req_w => $::WIDTH / 80,
1810 req_h => 20, 2077 req_h => $::WIDTH / 80,
1811 vertical => 0, 2078 vertical => 0,
1812 can_hover => 1, 2079 can_hover => 1,
1813 inner_pad => 5, 2080 inner_pad => 0.02,
1814 @_ 2081 @_
1815 ); 2082 );
1816 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
1817 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2098sub set_value {
2099 my ($self, $value) = @_;
2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102
2103 $hi = $lo + 1 if $hi <= $lo;
2104
2105 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi;
2107
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit;
2110
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
1818} 2119}
1819 2120
1820sub size_request { 2121sub size_request {
1821 my ($self) = @_; 2122 my ($self) = @_;
1822 2123
… …
1835 2136
1836sub mouse_motion { 2137sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2138 my ($self, $ev, $x, $y) = @_;
1838 2139
1839 if ($GRAB == $self) { 2140 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142
2143 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2146
2147 $self->set_value ($x * ($hi - $lo) + $lo);
2148 }
2149}
2150
2151sub update {
2152 my ($self) = @_;
2153
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]);
2156
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2157 my ($value, $lo, $hi, $page) = @{$self->{range}};
1841 2158
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2159 my $inner_w = 1 - 2 * $self->{inner_pad};
1843 2160
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1845 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1846 2162
1847 $x -= $inner_pad_px; # substract the padding 2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2164 $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 2165
1853 $self->emit (changed => $x); 2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
1854 $self->update; 2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value;
2172 $self->{knob_w} = $page;
1855 } 2173 });
1856}
1857 2174
1858# the inner_* stuff is for generating a padding for the slider handle, 2175 $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} 2176}
1865 2177
1866sub _draw { 2178sub _draw {
1867 my ($self) = @_; 2179 my ($self) = @_;
1868 2180
1869 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
1870 2182
1871 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
1872 2184
1873 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
1875 2187
2188 glTranslate 1, 0, 0;
1876 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2190 }
1881 2191
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2194
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; 2195 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2197
1908 # draw background 2198 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2200
1911 # draw handle 2201 # draw handle
1912 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913 2203
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
1916} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
1917 2247
1918############################################################################# 2248#############################################################################
1919 2249
1920package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
1921 2251
… …
1925 2255
1926sub new { 2256sub new {
1927 my $class = shift; 2257 my $class = shift;
1928 2258
1929 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
1930 fontsize => 1, 2260 fontsize => 1,
2261 can_events => 0,
1931 #font => default_font 2262 #font => default_font
1932 @_, 2263 @_,
1933 2264
1934 layout => (new CFClient::Layout), 2265 layout => (new CFClient::Layout 1),
1935 par => [], 2266 par => [],
1936 height => 0, 2267 height => 0,
1937 children => [ 2268 children => [
1938 (new CFClient::UI::Empty expand => 1), 2269 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2270 (new CFClient::UI::Slider vertical => 1),
1940 ], 2271 ],
1941 ); 2272 );
1942 2273
1943 $self->{children}[1]->connect (changed => sub { 2274 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2275
1947 $self 2276 $self
1948} 2277}
1949 2278
1950sub set_fontsize { 2279sub set_fontsize {
1951 my ($self, $fontsize) = @_; 2280 my ($self, $fontsize) = @_;
1952 2281
1953 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
1954 $self->reflow; 2283 $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} 2284}
1975 2285
1976sub size_allocate { 2286sub size_allocate {
1977 my ($self, $w, $h) = @_; 2287 my ($self, $w, $h) = @_;
1978 2288
… …
1983 $self->{layout}->set_width ($self->{children}[0]{w}); 2293 $self->{layout}->set_width ($self->{children}[0]{w});
1984 2294
1985 $self->reflow; 2295 $self->reflow;
1986} 2296}
1987 2297
2298sub text_height {
2299 my ($self, $text, $indent) = @_;
2300
2301 my $layout = $self->{layout};
2302
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text);
2306
2307 ($layout->size)[1]
2308}
2309
2310sub reflow {
2311 my ($self) = @_;
2312
2313 $self->{need_reflow}++;
2314 $self->update;
2315}
2316
1988sub add_paragraph { 2317sub add_paragraph {
1989 my ($self, $color, $text) = @_; 2318 my ($self, $color, $text, $indent) = @_;
1990 2319
1991 #TODO: intelligently "reformat" paragraph 2320 #TODO: intelligently "reformat" paragraph
1992 2321
2322 for my $line (split /\n/, $text) {
1993 my $height = $self->text_height ($text); 2323 my $height = $self->text_height ($line);
1994
1995 $self->{height} += $height; 2324 $self->{height} += $height;
1996
1997 push @{$self->{par}}, [$height, $color, $text]; 2325 push @{$self->{par}}, [$height, $color, $indent, $line];
2326 }
1998 2327
1999 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2328 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
2000 $self->{children}[1]->update; 2329 $self->{children}[1]->update;
2001} 2330}
2002 2331
… …
2007 2336
2008 return unless $self->{h} > 0; 2337 return unless $self->{h} > 0;
2009 2338
2010 delete $self->{texture}; 2339 delete $self->{texture};
2011 2340
2012 $ROOT->on_refresh ($self, sub { 2341 $ROOT->on_post_alloc ($self, sub {
2013 if (delete $self->{need_reflow}) { 2342 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2343 my $height = 0;
2015 2344
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2345 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2017 for @{$self->{par}}; 2346 for @{$self->{par}};
2018 2347
2019 $self->{height} = $height; 2348 $self->{height} = $height;
2020 2349
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2350 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2351 $self->{children}[1]->update;
2022 2352
2023 delete $self->{texture}; 2353 delete $self->{texture};
2024 } 2354 }
2025 2355
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2356 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2027 glClearColor 0, 0, 0, 1; 2357 glClearColor 0.5, 0.5, 0.5, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2358 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 2359
2035 my $top = int $self->{children}[1]{range}[0]; 2360 my $top = int $self->{children}[1]{range}[0];
2036 2361
2037 my $y0 = $top; 2362 my $y0 = $top;
2038 my $y1 = $top + $self->{h}; 2363 my $y1 = $top + $self->{h};
… …
2041 2366
2042 my $layout = $self->{layout}; 2367 my $layout = $self->{layout};
2043 2368
2044 $layout->set_font ($self->{font}) if $self->{font}; 2369 $layout->set_font ($self->{font}) if $self->{font};
2045 2370
2371 glEnable GL_BLEND;
2372 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2373
2046 for my $par (@{$self->{par}}) { 2374 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2375 my $h = $par->[0];
2048 2376
2049 if ($y0 < $y + $h && $y < $y1) { 2377 if ($y0 < $y + $h && $y < $y1) {
2378 $layout->set_foreground (@{ $par->[1] });
2379 $layout->set_width ($self->{w} - $par->[2]);
2050 $layout->set_text ($par->[2]); 2380 $layout->set_markup ($par->[3]);
2051 2381
2052 glColor @{ $par->[1] }; 2382 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053 my ($W, $H) = $layout->size; 2383
2054 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2384 glRasterPos $par->[2], $y - $y0;
2385 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2055 } 2386 }
2056 2387
2057 $y += $h; 2388 $y += $h;
2058 } 2389 }
2059 2390
2060 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND; 2391 glDisable GL_BLEND;
2062 }; 2392 };
2063 }); 2393 });
2064} 2394}
2065 2395
2066sub _draw { 2396sub _draw {
2067 my ($self) = @_; 2397 my ($self) = @_;
2068 2398
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 1, 1, 1, 1;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2402 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2403 glDisable GL_TEXTURE_2D;
2074 }
2075 2404
2076 $self->{children}[1]->draw; 2405 $self->{children}[1]->draw;
2077 2406
2078} 2407}
2079 2408
… …
2127 2456
2128sub new { 2457sub new {
2129 my $class = shift; 2458 my $class = shift;
2130 2459
2131 my $self = $class->SUPER::new ( 2460 my $self = $class->SUPER::new (
2132 state => 0, 2461 state => 0,
2133 connect_activate => \&toggle_flopper, 2462 connect_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2463 @_
2136 ); 2464 );
2137 2465
2138 if ($self->{state}) { 2466 if ($self->{state}) {
2139 $self->{state} = 0; 2467 $self->{state} = 0;
… …
2174 @_, 2502 @_,
2175 can_events => 0, 2503 can_events => 0,
2176 ) 2504 )
2177} 2505}
2178 2506
2179sub set_text { 2507sub set_tooltip_from {
2180 my ($self, $text) = @_; 2508 my ($self, $widget) = @_;
2181 2509
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2510 $self->add (new CFClient::UI::Label
2183 $self->{label}->set_text ($text); 2511 markup => $widget->{tooltip},
2184 $self->add ($self->{label}); 2512 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2513 fontsize => 0.8,
2514 fg => [0, 0, 0, 1],
2515 ellipsise => 0,
2516 font => ($widget->{tooltip_font} || $::FONT_PROP),
2517 );
2185} 2518}
2186 2519
2187sub size_request { 2520sub size_request {
2188 my ($self) = @_; 2521 my ($self) = @_;
2189 2522
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2523 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2524
2194 ($w + 4, $h + 4) 2525 ($w + 4, $h + 4)
2195} 2526}
2196 2527
2528sub size_allocate {
2529 my ($self, $w, $h) = @_;
2530
2531 $self->SUPER::size_allocate ($w - 4, $h - 4);
2532}
2533
2197sub _draw { 2534sub _draw {
2198 my ($self) = @_; 2535 my ($self) = @_;
2199 2536
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2537 glTranslate 0.375, 0.375;
2202 2538
2203 my ($w, $h) = @$self{qw(w h)}; 2539 my ($w, $h) = @$self{qw(w h)};
2204 2540
2205 glColor 1, 0.8, 0.4; 2541 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2552 glVertex 0 , $h;
2217 glVertex $w, $h; 2553 glVertex $w, $h;
2218 glVertex $w, 0; 2554 glVertex $w, 0;
2219 glEnd; 2555 glEnd;
2220 2556
2221 glPopMatrix; 2557 glTranslate 2 - 0.375, 2 - 0.375;
2222
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2558 $self->SUPER::_draw;
2225} 2559}
2226 2560
2227############################################################################# 2561#############################################################################
2228 2562
2563package CFClient::UI::Face;
2564
2565our @ISA = CFClient::UI::Base::;
2566
2567use CFClient::OpenGL;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 aspect => 1,
2574 @_,
2575 );
2576
2577 if ($self->{anim} && $self->{animspeed}) {
2578 Scalar::Util::weaken (my $widget = $self);
2579
2580 $self->{timer} = Event->timer (
2581 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2582 hard => 1,
2583 interval => $self->{animspeed},
2584 cb => sub {
2585 ++$widget->{frame};
2586 $widget->update;
2587 },
2588 );
2589 }
2590
2591 $self
2592}
2593
2594sub size_request {
2595 (32, 8)
2596}
2597
2598sub update {
2599 my ($self) = @_;
2600
2601 return unless $self->{visible};
2602
2603 $self->SUPER::update;
2604}
2605
2606sub _draw {
2607 my ($self) = @_;
2608
2609 return unless $::CONN;#d# manage and cache textures differently
2610
2611 my $face;
2612
2613 if ($self->{frame}) {
2614 my $anim = $::CONN->{anim}[$self->{anim}];
2615
2616 $face = $anim->[ $self->{frame} % @$anim ]
2617 if $anim && @$anim;
2618 }
2619
2620 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2621
2622 if ($tex) {
2623 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1;
2626 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2627 glDisable GL_TEXTURE_2D;
2628 }
2629}
2630
2631sub DESTROY {
2632 my ($self) = @_;
2633
2634 $self->{timer}->cancel
2635 if $self->{timer};
2636
2637 $self->SUPER::DESTROY;
2638}
2639
2640#############################################################################
2641
2642package CFClient::UI::InventoryItem;
2643
2644our @ISA = CFClient::UI::HBox::;
2645
2646sub _item_to_desc {
2647 my ($item) = @_;
2648
2649 my $desc =
2650 $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} × $item->{name_pl}";
2653
2654 $item->{flags} & Crossfire::Protocol::F_OPEN
2655 and $desc .= " (open)";
2656 $item->{flags} & Crossfire::Protocol::F_APPLIED
2657 and $desc .= " (applied)";
2658 $item->{flags} & Crossfire::Protocol::F_UNPAID
2659 and $desc .= " (unpaid)";
2660 $item->{flags} & Crossfire::Protocol::F_MAGIC
2661 and $desc .= " (magic)";
2662 $item->{flags} & Crossfire::Protocol::F_CURSED
2663 and $desc .= " (cursed)";
2664 $item->{flags} & Crossfire::Protocol::F_DAMNED
2665 and $desc .= " (damned)";
2666 $item->{flags} & Crossfire::Protocol::F_LOCKED
2667 and $desc .= " *";
2668
2669 $desc
2670}
2671
2672sub new {
2673 my $class = shift;
2674
2675 my %args = @_;
2676
2677 my $item = delete $args{item};
2678
2679 my $desc = _item_to_desc ($item);
2680
2681 my $self = $class->SUPER::new (
2682 can_hover => 1,
2683 can_events => 1,
2684 tooltip => ((CFClient::UI::Label::escape $desc)
2685 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2686 connect_button_down => sub {
2687 my ($self, $ev, $x, $y) = @_;
2688
2689 # todo: maybe put examine on 1? but should just be a tooltip :(
2690 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2691 my $targ = $::CONN->{player}{tag};
2692
2693 if ($item->{container} == $::CONN->{player}{tag}) {
2694 $targ = $main::OPENCONT;
2695 }
2696
2697 $::CONN->send ("move $targ $item->{tag} 0");
2698 } elsif ($ev->{button} == 1) {
2699 $::CONN->send ("examine $item->{tag}");
2700 } elsif ($ev->{button} == 2) {
2701 $::CONN->send ("apply $item->{tag}");
2702 } elsif ($ev->{button} == 3) {
2703 my @menu_items = (
2704 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2705 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2706 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2707 (
2708 $item->{flags} & Crossfire::Protocol::F_LOCKED
2709 ? (
2710 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2711 )
2712 : (
2713 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2714 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2715 )
2716 ),
2717 );
2718
2719 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2720 }
2721
2722 1
2723 },
2724 %args
2725 );
2726
2727
2728 $self->add (new CFClient::UI::Face
2729 can_events => 0,
2730 face => $item->{face},
2731 anim => $item->{anim},
2732 animspeed => $item->{animspeed},
2733 );
2734
2735 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2736
2737 $self->{item} = $item;
2738
2739 $self->update_item;
2740
2741 $self
2742}
2743
2744sub update_item {
2745 my ($self) = @_;
2746
2747 my $desc = _item_to_desc ($self->{item});
2748
2749 $self->{name_lbl}->set_text ($desc);
2750}
2751
2752#############################################################################
2753
2754package CFClient::UI::Inventory;
2755
2756our @ISA = CFClient::UI::ScrolledWindow::;
2757
2758sub new {
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 for my $item (@items) {
2783 $item->{item} = $item;
2784 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2785 $item->update_item ();
2786 }
2787
2788 my $i = 0;
2789 for (@items) {
2790 $self->{scrolled}->add (0, $i, $_);
2791 my $nrof = $_->{item}->{nrof} || 1;
2792 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2793 }
2794
2795# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2796}
2797
2798sub size_request {
2799 my ($self) = @_;
2800 ($self->{req_w}, $self->{req_h});
2801}
2802
2803#############################################################################
2804
2805package CFClient::UI::Menu;
2806
2807our @ISA = CFClient::UI::FancyFrame::;
2808
2809use CFClient::OpenGL;
2810
2811sub new {
2812 my $class = shift;
2813
2814 my $self = $class->SUPER::new (
2815 items => [],
2816 z => 100,
2817 @_,
2818 );
2819
2820 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2821
2822 for my $item (@{ $self->{items} }) {
2823 my ($widget, $cb) = @$item;
2824
2825 # handle various types of items, only text for now
2826 if (!ref $widget) {
2827 $widget = new CFClient::UI::Label
2828 can_hover => 1,
2829 can_events => 1,
2830 text => $widget;
2831 }
2832
2833 $self->{item}{$widget} = $item;
2834
2835 $self->{vbox}->add ($widget);
2836 }
2837
2838 $self
2839}
2840
2841# popup given the event (must be a mouse button down event currently)
2842sub popup {
2843 my ($self, $ev) = @_;
2844
2845 $self->emit ("popdown");
2846
2847 # maybe save $GRAB? must be careful about events...
2848 $GRAB = $self;
2849 $self->{button} = $ev->{button};
2850
2851 $self->show;
2852 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853}
2854
2855sub mouse_motion {
2856 my ($self, $ev, $x, $y) = @_;
2857
2858 # TODO: should use vbox->find_widget or so
2859 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860 $self->{hover} = $self->{item}{$HOVER};
2861}
2862
2863sub button_up {
2864 my ($self, $ev, $x, $y) = @_;
2865
2866 if ($ev->{button} == $self->{button}) {
2867 undef $GRAB;
2868 $self->hide;
2869
2870 $self->emit ("popdown");
2871 $self->{hover}[1]->() if $self->{hover};
2872 }
2873}
2874
2875#############################################################################
2876
2877package CFClient::UI::Statusbox;
2878
2879our @ISA = CFClient::UI::VBox::;
2880
2881sub new {
2882 my $class = shift;
2883
2884 $class->SUPER::new (
2885 fontsize => 0.8,
2886 @_,
2887 )
2888}
2889
2890sub reorder {
2891 my ($self) = @_;
2892 my $NOW = time;
2893
2894 while (my ($k, $v) = each %{ $self->{item} }) {
2895 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896 }
2897
2898 my @widgets;
2899
2900 my @items = sort {
2901 $a->{pri} <=> $b->{pri}
2902 or $b->{id} <=> $a->{id}
2903 } values %{ $self->{item} };
2904
2905 my $count = 10 + 1;
2906 for my $item (@items) {
2907 last unless --$count;
2908
2909 push @widgets, $item->{label} ||= do {
2910 # TODO: doesn't handle markup well (read as: at all)
2911 my $short = $item->{count} > 1
2912 ? "<b>$item->{count} ×</b> $item->{text}"
2913 : $item->{text};
2914
2915 for ($short) {
2916 s/^\s+//;
2917 s/\s+/ /g;
2918 }
2919
2920 new CFClient::UI::Label
2921 markup => $short,
2922 tooltip => $item->{tooltip},
2923 tooltip_font => $::FONT_PROP,
2924 tooltip_width => 0.67,
2925 fontsize => $item->{fontsize} || $self->{fontsize},
2926 max_w => $::WIDTH * 0.44,
2927 fg => $item->{fg},
2928 can_events => 1,
2929 can_hover => 1
2930 };
2931 }
2932
2933 $self->clear;
2934 $self->SUPER::add (reverse @widgets);
2935}
2936
2937sub add {
2938 my ($self, $text, %arg) = @_;
2939
2940 $text =~ s/^\s+//;
2941 $text =~ s/\s+$//;
2942
2943 my $timeout = time + ((delete $arg{timeout}) || 60);
2944
2945 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2946
2947 if (my $item = $self->{item}{$group}) {
2948 if ($item->{text} eq $text) {
2949 $item->{count}++;
2950 } else {
2951 $item->{count} = 1;
2952 $item->{text} = $item->{tooltip} = $text;
2953 }
2954 $item->{id} = ++$self->{id};
2955 $item->{timeout} = $timeout;
2956 delete $item->{label};
2957 } else {
2958 $self->{item}{$group} = {
2959 id => ++$self->{id},
2960 text => $text,
2961 timeout => $timeout,
2962 tooltip => $text,
2963 fg => [0.8, 0.8, 0.8, 0.8],
2964 pri => 0,
2965 count => 1,
2966 %arg,
2967 };
2968 }
2969
2970 $self->reorder;
2971}
2972
2973sub reconfigure {
2974 my ($self) = @_;
2975
2976 delete $_->{label}
2977 for values %{ $self->{item} || {} };
2978
2979 $self->reorder;
2980 $self->SUPER::reconfigure;
2981}
2982
2983#############################################################################
2984
2229package CFClient::UI::Root; 2985package CFClient::UI::Root;
2230 2986
2231our @ISA = CFClient::UI::Container::; 2987our @ISA = CFClient::UI::Container::;
2232 2988
2233use CFClient::OpenGL; 2989use CFClient::OpenGL;
2234 2990
2235sub check_size { 2991sub new {
2236 my ($self) = @_; 2992 my $class = shift;
2237 2993
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2994 $class->SUPER::new (
2239} 2995 @_,
2240 2996 )
2241sub size_request {
2242 ($::WIDTH, $::HEIGHT)
2243} 2997}
2244 2998
2245sub configure { 2999sub configure {
2246 my ($self, $x, $y, $w, $h) = @_; 3000 my ($self, $x, $y, $w, $h) = @_;
2247 3001
2248 $self->SUPER::configure ($x, $y, $w, $h); 3002 $self->{w} = $w;
3003 $self->{h} = $h;
3004}
2249 3005
3006sub check_size {
3007 my ($self) = @_;
3008
3009 $self->size_allocate ($self->{w}, $self->{h})
3010 if $self->{w};
3011}
3012
3013sub size_request {
3014 my ($self) = @_;
3015
3016 ($self->{w}, $self->{h})
3017}
3018
3019sub size_allocate {
3020 my ($self, $w, $h) = @_;
3021
3022 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3023 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3024
3025 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3026 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3027
2250 for my $child (@{$self->{children}}) { 3028 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 3030
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3032 if exists $child->{req_x};
3033
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3037 $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; 3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
2255 $child->configure ($X, $Y, $W,$H); 3040 $child->configure ($X, $Y, $W, $H);
2256 } 3041 }
2257} 3042}
2258 3043
2259sub _topleft { 3044sub coord2local {
2260 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2261 3046
2262 ($x, $y) 3047 ($x, $y)
2263} 3048}
2264 3049
3050sub coord2global {
3051 my ($self, $x, $y) = @_;
3052
3053 ($x, $y)
3054}
3055
2265sub update { 3056sub update {
2266 my ($self) = @_; 3057 my ($self) = @_;
2267 3058
2268 $self->check_size; 3059 $self->check_size;
2269 ::refresh (); 3060 $::WANT_REFRESH++;
2270} 3061}
2271 3062
2272sub add { 3063sub add {
2273 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2274 3065
3066 for my $child (@children) {
3067 $child->{toplevel} = 1;
3068
2275 # integerize window positions 3069 # integerise window positions
2276 $child->{x} = int $child->{x}; 3070 $child->{x} = int $child->{x};
2277 $child->{y} = int $child->{y}; 3071 $child->{y} = int $child->{y};
3072 }
2278 3073
2279 $self->SUPER::add ($child); 3074 $self->SUPER::add (@children);
3075
3076 while (@children) {
3077 my $w = pop @children;
3078 push @children, $w->children;
3079 $w->{visible} = 1;
3080 }
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 delete $w->{visible};
3092 }
2280} 3093}
2281 3094
2282sub on_refresh { 3095sub on_refresh {
2283 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2284 3097
2285 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2286} 3099}
2287 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2288sub draw { 3107sub draw {
2289 my ($self) = @_; 3108 my ($self) = @_;
2290 3109
2291 while (my $rcb = delete $self->{refresh_hook}) { 3110 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 3111 $_->()
3112 for values %{delete $self->{refresh_hook}};
3113 }
3114
3115 if ($self->{check_size}) {
3116 my @queue = ([], []);
3117
3118 for (;;) {
3119 if ($self->{check_size}) {
3120 # heuristic: check containers last
3121 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3122 for values %{delete $self->{check_size}}
3123 }
3124
3125 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3126
3127 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3128 ? @$widget{qw(user_w user_h)}
3129 : $widget->size_request;
3130
3131 if (delete $widget->{force_alloc}
3132 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3133 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3134
3135 $widget->{req_w} = $w;
3136 $widget->{req_h} = $h;
3137
3138 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3139
3140 $widget->{parent}->check_size
3141 if $widget->{parent};
3142 }
3143 }
3144 }
3145
3146 while ($self->{size_alloc}) {
3147 for (values %{delete $self->{size_alloc}}) {
3148 my ($widget, $w, $h) = @$_;
3149
3150 $w = 0 if $w < 0;
3151 $h = 0 if $h < 0;
3152
3153 $widget->{w} = $w;
3154 $widget->{h} = $h;
3155 $widget->size_allocate ($w, $h);
3156 $widget->emit (size_allocate => $w, $h);
3157 }
3158 }
3159
3160 while ($self->{post_alloc_hook}) {
3161 $_->()
3162 for values %{delete $self->{post_alloc_hook}};
2293 } 3163 }
2294 3164
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3165 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3166 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 3167 glClear GL_COLOR_BUFFER_BIT;
2298 3168
2299 glMatrixMode GL_PROJECTION; 3169 glMatrixMode GL_PROJECTION;
2300 glLoadIdentity; 3170 glLoadIdentity;
2301 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3171 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302 glMatrixMode GL_MODELVIEW; 3172 glMatrixMode GL_MODELVIEW;
2303 glLoadIdentity; 3173 glLoadIdentity;
2304 3174
2305 $self->_draw; 3175 $self->_draw;
2306} 3176}
… …
2308############################################################################# 3178#############################################################################
2309 3179
2310package CFClient::UI; 3180package CFClient::UI;
2311 3181
2312$ROOT = new CFClient::UI::Root; 3182$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 3183$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314 3184
23151 31851
2316 3186

Diff Legend

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