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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
… …
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
13our $TOOLTIP; 14our $TOOLTIP;
14our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
15 18
16sub check_tooltip { 19sub check_tooltip {
17 if (!$GRAB) { 20 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 22 if (length $widget->{tooltip}) {
… …
23 26
24 my $tip = $widget->{tooltip}; 27 my $tip = $widget->{tooltip};
25 28
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 29 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 30
28 $TOOLTIP->set_markup ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
31 } 42 }
32 43
33 return; 44 return;
34 } 45 }
35 } 46 }
… …
39 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
40} 51}
41 52
42# class methods for events 53# class methods for events
43sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
45 if $FOCUS; 56 if $FOCUS;
46} 57}
47 58
48sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
50 if $FOCUS; 61 if $FOCUS;
51} 62}
52 63
53sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
54 my ($ev) = @_; 65 my ($ev) = @_;
… …
63 check_tooltip; 74 check_tooltip;
64 } 75 }
65 76
66 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
67 78
68 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
69 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
72} 81}
73 82
74sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
75 my ($ev) = @_; 84 my ($ev) = @_;
76 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
77 86
78 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
79 88
80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
81 90
82 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
83 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
86 93
87 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
88 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
89 $grab->update if $grab; 96 $grab->update if $grab;
90 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
106 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
107 114
108 check_tooltip; 115 check_tooltip;
109 } 116 }
110 117
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
114 } 119 if $HOVER;
115} 120}
116 121
117# convert position array to integers 122# convert position array to integers
118sub harmonize { 123sub harmonize {
119 my ($vals) = @_; 124 my ($vals) = @_;
… …
123 for (@$vals) { 128 for (@$vals) {
124 my $i = int $_ + $rem; 129 my $i = int $_ + $rem;
125 $rem += $_ - $i; 130 $rem += $_ - $i;
126 $_ = $i; 131 $_ = $i;
127 } 132 }
133}
134
135sub full_refresh {
136 # make a copy, otherwise for complains about freed values.
137 my @widgets = values %WIDGET;
138
139 $_->update
140 for @widgets;
141}
142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
151# call when resolution changes etc.
152sub rescale_widgets {
153 my ($sx, $sy) = @_;
154
155 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 }
166 }
167
168 reconfigure_widgets;
128} 169}
129 170
130############################################################################# 171#############################################################################
131 172
132package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
150 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
151 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
152 } 193 }
153 } 194 }
154 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
155 $self 198 $self
156} 199}
157 200
158sub destroy { 201sub destroy {
159 my ($self) = @_; 202 my ($self) = @_;
… …
162 %$self = (); 205 %$self = ();
163} 206}
164 207
165sub show { 208sub show {
166 my ($self) = @_; 209 my ($self) = @_;
167
168 return if $self->{parent}; 210 return if $self->{parent};
169 211
170 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
171} 213}
172 214
173sub hide { 215sub show_centered {
174 my ($self) = @_; 216 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220
221 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 },
225 );
226}
227
228sub set_invisible {
229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
175 234
176 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
178 248
179 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
180 if $self->{parent}; 250 if $self->{parent};
181} 251}
182 252
… …
224 $self->{y} = $y; 294 $self->{y} = $y;
225 $self->update; 295 $self->update;
226 } 296 }
227 297
228 if ($self->{w} != $w || $self->{h} != $h) { 298 if ($self->{w} != $w || $self->{h} != $h) {
229 $self->{w} = $w; 299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230 $self->{h} = $h;
231
232 $self->size_allocate ($w, $h);
233 $self->update;
234 } 300 }
235} 301}
236 302
237sub size_allocate { 303sub size_allocate {
238 # nothing to be done 304 # nothing to be done
239} 305}
240 306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
241sub children { 314sub children {
242}
243
244# call when resoltuion changes etc.
245sub reconfigure {
246 my ($self) = @_;
247
248 $_->reconfigure
249 for $self->children;
250
251 $_->check_size;
252} 315}
253 316
254sub set_max_size { 317sub set_max_size {
255 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
256 319
257 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
258 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
259} 322}
260 323
261# return top left coordinates 324sub set_tooltip {
262sub _topleft {
263 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
264 326
265 $self->{parent} 327 $self->{tooltip} = $tooltip;
266 or Carp::confess "no parent widget in _topleft\n";#d#
267 328
268 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 329 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner};
331 CFClient::UI::check_tooltip;
332 }
269} 333}
270 334
271# translate global coordinates to local coordinate system 335# translate global coordinates to local coordinate system
272sub coord2local { 336sub coord2local {
273 my ($self, $x, $y) = @_; 337 my ($self, $x, $y) = @_;
274 338
275 my ($X, $Y) = $self->_topleft; 339 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
276 ($x - $X, $y - $Y)
277} 340}
278 341
279# translate local coordinates to global coordinate system 342# translate local coordinates to global coordinate system
280sub coord2global { 343sub coord2global {
281 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
282 345
283 my ($X, $Y) = $self->_topleft; 346 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
284 ($x + $X, $y + $Y)
285} 347}
286 348
287sub focus_in { 349sub focus_in {
288 my ($self) = @_; 350 my ($self) = @_;
289 351
290 return if $FOCUS == $self; 352 return if $FOCUS == $self;
291 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
292 354
293 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
294 356
295 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
296 358
297 $focus->update if $focus; 359 $focus->update if $focus;
298 $FOCUS->update; 360 $FOCUS->update;
299} 361}
300 362
… …
303 365
304 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
305 367
306 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
307 369
308 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
309 371
310 $focus->update if $focus; #? 372 $focus->update if $focus; #?
373
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS;
311} 376}
312 377
313sub mouse_motion { } 378sub mouse_motion { }
314sub button_up { } 379sub button_up { }
315sub key_down { } 380sub key_down { }
316sub key_up { } 381sub key_up { }
317 382
318sub button_down { 383sub button_down {
319 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
320 385
321 $self->focus_in; 386 $self->focus_in;
… …
361 glVertex $self->{w}, 0; 426 glVertex $self->{w}, 0;
362 glVertex $self->{w}, $self->{h}; 427 glVertex $self->{w}, $self->{h};
363 glVertex 0 , $self->{h}; 428 glVertex 0 , $self->{h};
364 glEnd; 429 glEnd;
365 glPopMatrix; 430 glPopMatrix;
366 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
367 } 432 }
368} 433}
369 434
370sub _draw { 435sub _draw {
371 my ($self) = @_; 436 my ($self) = @_;
… …
387 452
388sub set_parent { 453sub set_parent {
389 my ($self, $parent) = @_; 454 my ($self, $parent) = @_;
390 455
391 Scalar::Util::weaken ($self->{parent} = $parent); 456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
392} 463}
393 464
394sub check_size { 465sub check_size {
395 my ($self) = @_; 466 my ($self, $forced) = @_;
396 467
397 $self->{parent} 468 $self->{force_alloc} = 1 if $forced;
398 or return 1; 469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399
400 my ($w, $h) = $self->{user_w} && $self->{user_h}
401 ? @$self{qw(user_w user_h)}
402 : $self->size_request;
403
404 if ($w != $self->{req_w} || $h != $self->{req_h}) {
405 $self->{req_w} = $w;
406 $self->{req_h} = $h;
407
408 $self->{parent}->check_size
409 or $self->size_allocate (
410 (List::Util::max $self->{w}, $w),
411 (List::Util::max $self->{h}, $h),
412 );
413
414 1
415 } else {
416 0
417 }
418} 470}
419 471
420sub update { 472sub update {
421 my ($self) = @_; 473 my ($self) = @_;
422 474
… …
428 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
429 481
430 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
431} 483}
432 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
433sub emit { 491sub emit {
434 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
435 493
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
437} 496}
438 497
439sub DESTROY { 498sub DESTROY {
440 my ($self) = @_; 499 my ($self) = @_;
441 500
501 delete $WIDGET{$self+0};
442 #$self->deactivate; 502 #$self->deactivate;
443} 503}
444 504
445############################################################################# 505#############################################################################
446 506
… …
455 my $class = shift; 515 my $class = shift;
456 516
457 # range [value, low, high, page] 517 # range [value, low, high, page]
458 518
459 $class->SUPER::new ( 519 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 520 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 521 #active_bg => [1, 1, 1, 0.5],
462 @_ 522 @_
463 ) 523 )
464} 524}
465 525
466sub _draw { 526sub _draw {
467 my ($self) = @_; 527 my ($self) = @_;
468 528
529 my $color = $FOCUS == $self && $self->{active_bg}
530 ? $self->{active_bg}
531 : $self->{bg};
532
533 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 534 my ($w, $h) = @$self{qw(w h)};
470 535
471 glEnable GL_BLEND; 536 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 538 glColor @$color;
474 539
475 glBegin GL_QUADS; 540 glBegin GL_QUADS;
476 glVertex 0 , 0; 541 glVertex 0 , 0;
477 glVertex 0 , $h; 542 glVertex 0 , $h;
478 glVertex $w, $h; 543 glVertex $w, $h;
479 glVertex $w, 0; 544 glVertex $w, 0;
480 glEnd; 545 glEnd;
481 546
482 glDisable GL_BLEND; 547 glDisable GL_BLEND;
548 }
483} 549}
484 550
485############################################################################# 551#############################################################################
486 552
487package CFClient::UI::Empty; 553package CFClient::UI::Empty;
… …
519 585
520 $self 586 $self
521} 587}
522 588
523sub add { 589sub add {
524 my ($self, $child) = @_; 590 my ($self, @widgets) = @_;
525 591
526 $child->set_parent ($self); 592 $_->set_parent ($self)
593 for @widgets;
527 594
528 use sort 'stable'; 595 use sort 'stable';
529 596
530 $self->{children} = [ 597 $self->{children} = [
531 sort { $a->{z} <=> $b->{z} } 598 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 599 @{$self->{children}}, @widgets
533 ]; 600 ];
534 601
535 $child->check_size; 602 $self->check_size (1);
603 $self->update;
536} 604}
537 605
538sub children { 606sub children {
539 @{ $_[0]{children} } 607 @{ $_[0]{children} }
540} 608}
… …
559 627
560 for (@$children) { 628 for (@$children) {
561 delete $_->{parent}; 629 delete $_->{parent};
562 $_->hide; 630 $_->hide;
563 } 631 }
632
633 $self->check_size;
634 $self->update;
564} 635}
565 636
566sub find_widget { 637sub find_widget {
567 my ($self, $x, $y) = @_; 638 my ($self, $x, $y) = @_;
568 639
… …
643} 714}
644 715
645sub update { 716sub update {
646 my ($self) = @_; 717 my ($self) = @_;
647 718
648 # we want to do this delayed... 719 $ROOT->on_post_alloc ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 720 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 721}
662 722
663sub size_allocate { 723sub size_allocate {
664 my ($self, $w, $h) = @_; 724 my ($self, $w, $h) = @_;
665 725
666 $self->child->configure (0, 0, $w, $h); 726 $self->SUPER::size_allocate ($w, $h);
727 $self->update;
728}
667 729
730sub _render {
731 $_[0]{children}[0]->draw;
732}
733
734sub render_child {
735 my ($self) = @_;
736
737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
738 glClearColor 0, 0, 0, 0;
739 glClear GL_COLOR_BUFFER_BIT;
740
668 $self->render_chld; 741 $self->_render;
742 };
669} 743}
670 744
671sub _draw { 745sub _draw {
672 my ($self) = @_; 746 my ($self) = @_;
673 747
674 my ($w, $h) = ($self->w, $self->h); 748 my ($w, $h) = ($self->w, $self->h);
675 749
676 my $tex = $self->{texture} 750 my $tex = $self->{texture}
677 or return; 751 or return;
678 752
679 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
755 glColor 1, 1, 1, 1;
683 756
684 $tex->draw_quad (0, 0, $w, $h); 757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
685 758
686 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
688} 760}
689 761
690############################################################################# 762#############################################################################
691 763
692package CFClient::UI::ViewPort; 764package CFClient::UI::ViewPort;
693 765
694our @ISA = CFClient::UI::Window::; 766our @ISA = CFClient::UI::Window::;
695 767
696sub new { die }
697
698sub size_request { 768sub size_request {
699 my ($self) = @_; 769 my ($self) = @_;
700 770
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
703 772
704 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
705} 774}
706 775
707sub _draw { 776sub size_allocate {
708 my ($self) = @_; 777 my ($self, $w, $h) = @_;
709 778
710 $self->{children}[1]->draw; 779 my ($cw, $ch) = @$self{qw(child_w child_h)};
780# $w = $self->{w};
781 $self->child->configure (0, 0, $cw, $ch);
782 $self->update;
711} 783}
712 784
785sub set_offset {
786 my ($self, $x, $y) = @_;
787
788 $self->{view_x} = int $x;
789 $self->{view_y} = int $y;
790
791 $self->update;
792}
793
794# hmm, this does not work for topleft of $self... but we should not ask for that
795sub coord2local {
796 my ($self, $x, $y) = @_;
797
798 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
799}
800
801sub coord2global {
802 my ($self, $x, $y) = @_;
803
804 $x = List::Util::min $self->{w}, $x - $self->{view_x};
805 $y = List::Util::min $self->{h}, $y - $self->{view_y};
806
807 $self->SUPER::coord2global ($x, $y)
808}
809
810sub find_widget {
811 my ($self, $x, $y) = @_;
812
813 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
814 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
815 ) {
816 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
817 } else {
818 $self->CFClient::UI::Base::find_widget ($x, $y)
819 }
820}
821
822sub _render {
823 my ($self) = @_;
824
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826
827 $self->SUPER::_render;
828}
713 829
714############################################################################# 830#############################################################################
715 831
716package CFClient::UI::Frame; 832package CFClient::UI::ScrolledWindow;
717 833
718our @ISA = CFClient::UI::Bin::; 834our @ISA = CFClient::UI::HBox::;
719
720use CFClient::OpenGL;
721 835
722sub new { 836sub new {
723 my $class = shift; 837 my $class = shift;
724 838
839 my $self;
840
841 my $slider = new CFClient::UI::Slider
842 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]);
846 },
847 ;
848
725 my $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
726 bg => [1, 1, 1, 1], 850 vp => (new CFClient::UI::ViewPort expand => 1),
727 border_bg => [1, 1, 1, 1], 851 slider => $slider,
728 border => 0.8,
729 @_ 852 @_,
730 ); 853 );
731 854
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider});
858
732 $self 859 $self
733} 860}
734 861
862sub size_allocate {
863 my ($self, $w, $h) = @_;
864
865 $self->SUPER::size_allocate ($w, $h);
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869}
870
871#TODO# update range on size_allocate depending on child
872# update viewport offset on scroll
873
874#############################################################################
875
876package CFClient::UI::Frame;
877
878our @ISA = CFClient::UI::Bin::;
879
880use CFClient::OpenGL;
881
882sub new {
883 my $class = shift;
884
885 $class->SUPER::new (
886 bg => undef,
887 @_,
888 )
889}
890
735sub _draw { 891sub _draw {
736 my ($self) = @_; 892 my ($self) = @_;
737 893
738 my ($w, $h) = ($self->{w}, $self->{h}); 894 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)};
739 896
740 glEnable GL_BLEND; 897 glEnable GL_BLEND;
741 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
742 glEnable GL_TEXTURE_2D; 899 glColor @{ $self->{bg} };
743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
744 900
745# glBegin GL_QUADS; 901 glBegin GL_QUADS;
746# glColor 0, 0, 0, 0;
747# glVertex 0 , 0; 902 glVertex 0 , 0;
748# glVertex 0 , $h; 903 glVertex 0 , $h;
749# glVertex $w, $h; 904 glVertex $w, $h;
750# glVertex $w, 0; 905 glVertex $w, 0;
751# glEnd; 906 glEnd;
752 907
753
754 $self->child->draw;
755 glDisable GL_BLEND; 908 glDisable GL_BLEND;
756 glDisable GL_TEXTURE_2D; 909 }
910
911 $self->SUPER::_draw;
757} 912}
758 913
759############################################################################# 914#############################################################################
760 915
761package CFClient::UI::FancyFrame; 916package CFClient::UI::FancyFrame;
… …
772 my $class = shift; 927 my $class = shift;
773 928
774 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
775 930
776 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
779 border => 0.8, 934 border => 0.6,
935 is_toplevel => 1,
780 can_events => 1, 936 can_events => 1,
781 @_ 937 @_
782 ); 938 );
783 939
784 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 941 align => 0,
786 valign => 1, 942 valign => 1,
787 text => $self->{title}, 943 text => $self->{title},
788 fontsize => 1; 944 fontsize => $self->{border};
789 945
790 $self 946 $self
791} 947}
792 948
793sub border { 949sub border {
… …
809 my ($self, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
810 966
811 $h -= List::Util::max 0, $self->border * 2; 967 $h -= List::Util::max 0, $self->border * 2;
812 $w -= List::Util::max 0, $self->border * 2; 968 $w -= List::Util::max 0, $self->border * 2;
813 969
814 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
815 if $self->{title}; 971 if $self->{title};
816 972
817 $self->child->configure ($self->border, $self->border, $w, $h); 973 $self->child->configure ($self->border, $self->border, $w, $h);
818} 974}
819 975
820sub button_down { 976sub button_down {
821 my ($self, $ev, $x, $y) = @_; 977 my ($self, $ev, $x, $y) = @_;
822 978
979 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 980 my $border = $self->border;
824 981
825 if ($x < $self->{w} && $x >= $self->{w} - $border 982 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 983 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 984
985 if ($lr & $td) {
986 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 987 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 988 my ($bw, $bh) = ($self->{w}, $self->{h});
830 989
990 my $mx = $x < $border;
991 my $my = $y < $border;
992
831 $self->{motion} = sub { 993 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 994 my ($ev, $x, $y) = @_;
833 995
834 ($x, $y) = ($ev->{x}, $ev->{y}); 996 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy;
835 998
836 $self->{user_w} = $bw + $x - $ox; 999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 1002 $self->check_size;
839 }; 1003 };
840 1004
841 } elsif ($x >= 0 && $x < $self->{w} 1005 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1006 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 1007 my ($bx, $by) = ($self->{x}, $self->{y});
846 1008
847 $self->{motion} = sub { 1009 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 1010 my ($ev, $x, $y) = @_;
… …
871 my ($self) = @_; 1033 my ($self) = @_;
872 1034
873 my ($w, $h ) = ($self->{w}, $self->{h}); 1035 my ($w, $h ) = ($self->{w}, $self->{h});
874 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
875 1037
876 glEnable GL_BLEND;
877 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
878 glEnable GL_TEXTURE_2D; 1038 glEnable GL_TEXTURE_2D;
879 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
880 1040
881 my $border = $self->border; 1041 my $border = $self->border;
882 1042
883 glColor @{ $self->{border_bg} }; 1043 glColor @{ $self->{border_bg} };
884 $tex[1]->draw_quad (0, 0, $w, $border); 1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
888 1048
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 1050 my $bg = $tex[0];
890 1051
891 # TODO: repeat texture not scale 1052 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 1053 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 1054 my $rep_y = $ch / $bg->{h};
894 1055
895 glColor @{ $self->{bg} }; 1056 glColor @{ $self->{bg} };
896 1057
897 $bg->{s} = $rep_x; 1058 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 1059 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 1060 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 }
901 1063
902 glDisable GL_TEXTURE_2D; 1064 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND;
904 1065
905 $self->{title}->draw if $self->{title}; 1066 $self->{title}->draw if $self->{title};
1067
906 $self->child->draw; 1068 $self->child->draw;
907} 1069}
908 1070
909############################################################################# 1071#############################################################################
910 1072
… …
1134} 1296}
1135 1297
1136sub size_allocate { 1298sub size_allocate {
1137 my ($self, $w, $h) = @_; 1299 my ($self, $w, $h) = @_;
1138 1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1139 my $children = $self->{children}; 1303 my $children = $self->{children};
1140 1304
1141 my @h = map $_->{req_h}, @$children; 1305 my @h = map $_->{req_h}, @$children;
1142 1306
1143 my $req_h = List::Util::sum @h; 1307 my $req_h = List::Util::sum @h;
… …
1172 1336
1173############################################################################# 1337#############################################################################
1174 1338
1175package CFClient::UI::Label; 1339package CFClient::UI::Label;
1176 1340
1177our @ISA = CFClient::UI::Base::; 1341our @ISA = CFClient::UI::DrawBG::;
1178 1342
1179use CFClient::OpenGL; 1343use CFClient::OpenGL;
1180 1344
1181sub new { 1345sub new {
1182 my ($class, %arg) = @_; 1346 my ($class, %arg) = @_;
1183 1347
1184 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1185 fg => [1, 1, 1], 1349 fg => [1, 1, 1],
1350 #bg => none
1351 #active_bg => none
1186 #font => default_font 1352 #font => default_font
1353 #text => initial text
1354 #markup => initial narkup
1355 #max_w => maximum pixel width
1356 ellipsise => 3, # end
1357 layout => (new CFClient::Layout),
1187 fontsize => 1, 1358 fontsize => 1,
1188 text => "",
1189 align => -1, 1359 align => -1,
1190 valign => -1, 1360 valign => -1,
1191 padding => 2, 1361 padding => 2,
1192 layout => new CFClient::Layout,
1193 can_events => 0, 1362 can_events => 0,
1194 %arg 1363 %arg
1195 ); 1364 );
1196 1365
1197 if (exists $self->{template}) { 1366 if (exists $self->{template}) {
1198 my $layout = new CFClient::Layout; 1367 my $layout = new CFClient::Layout;
1199 $layout->set_text (delete $self->{template}); 1368 $layout->set_text (delete $self->{template});
1200 $self->{template} = $layout; 1369 $self->{template} = $layout;
1201 } 1370 }
1202 1371
1203 $self->set_text (delete $self->{text}) if exists $self->{text}; 1372 if (exists $self->{markup}) {
1204 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1373 $self->set_markup (delete $self->{markup});
1374 } else {
1375 $self->set_text (delete $self->{text});
1376 }
1205 1377
1206 $self 1378 $self
1207} 1379}
1208 1380
1209sub escape { 1381sub escape($) {
1210 local $_ = $_[1]; 1382 local $_ = $_[0];
1211 1383
1212 s/&/&amp;/g; 1384 s/&/&amp;/g;
1213 s/>/&gt;/g; 1385 s/>/&gt;/g;
1214 s/</&lt;/g; 1386 s/</&lt;/g;
1215 1387
1216 $_[1] 1388 $_
1217} 1389}
1218 1390
1219sub update { 1391sub update {
1220 my ($self) = @_; 1392 my ($self) = @_;
1221 1393
1222 delete $self->{texture}; 1394 delete $self->{texture};
1223 $self->SUPER::update; 1395 $self->SUPER::update;
1224} 1396}
1225 1397
1226sub reconfigure {
1227 my ($self) = @_;
1228
1229 delete $self->{texture};
1230}
1231
1232sub set_text { 1398sub set_text {
1233 my ($self, $text) = @_; 1399 my ($self, $text) = @_;
1234 1400
1235 return if $self->{text} eq "T$text"; 1401 return if $self->{text} eq "T$text";
1236 $self->{text} = "T$text"; 1402 $self->{text} = "T$text";
1237 1403
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1238 $self->{layout}->set_text ($text); 1405 $self->{layout}->set_text ($text);
1239 1406
1240 delete $self->{texture};
1241 $self->update; 1407 $self->update;
1242 $self->check_size; 1408 $self->check_size;
1243} 1409}
1244 1410
1245sub set_markup { 1411sub set_markup {
1246 my ($self, $markup) = @_; 1412 my ($self, $markup) = @_;
1247 1413
1248 return if $self->{text} eq "M$markup"; 1414 return if $self->{text} eq "M$markup";
1249 $self->{text} = "M$markup"; 1415 $self->{text} = "M$markup";
1250 1416
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1251 $self->{layout}->set_markup ($markup); 1420 $self->{layout}->set_markup ($markup);
1252 1421
1253 delete $self->{texture};
1254 $self->update; 1422 $self->update;
1255 $self->check_size; 1423 $self->check_size;
1256} 1424}
1257 1425
1258sub size_request { 1426sub size_request {
1259 my ($self) = @_; 1427 my ($self) = @_;
1260 1428
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1429 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{max_w} || -1); 1430 $self->{layout}->set_width ($self->{max_w} || -1);
1431 $self->{layout}->set_ellipsise ($self->{ellipsise});
1432 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1263 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1264 1434
1265 my ($w, $h) = $self->{layout}->size; 1435 my ($w, $h) = $self->{layout}->size;
1266 1436
1267 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1289sub set_fontsize { 1459sub set_fontsize {
1290 my ($self, $fontsize) = @_; 1460 my ($self, $fontsize) = @_;
1291 1461
1292 $self->{fontsize} = $fontsize; 1462 $self->{fontsize} = $fontsize;
1293 delete $self->{texture}; 1463 delete $self->{texture};
1464
1465 $self->update;
1294 $self->check_size; 1466 $self->check_size;
1295 $self->update;
1296} 1467}
1297 1468
1298sub _draw { 1469sub _draw {
1299 my ($self) = @_; 1470 my ($self) = @_;
1300 1471
1472 $self->SUPER::_draw; # draw background, if applicable
1473
1301 my $tex = $self->{texture} ||= do { 1474 my $tex = $self->{texture} ||= do {
1475 $self->{layout}->set_foreground (@{$self->{fg}});
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1476 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $self->{layout}->set_width ($self->{w}); 1477 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481
1305 new_from_layout CFClient::Texture $self->{layout} 1482 my $tex = new_from_layout CFClient::Texture $self->{layout};
1483
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1486 : ($self->{w} - $tex->{w}) * 0.5);
1487
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1490 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1306 }; 1493 };
1307 1494
1308 glEnable GL_BLEND;
1309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1310 glEnable GL_TEXTURE_2D; 1495 glEnable GL_TEXTURE_2D;
1311 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1312 1497
1498 if ($tex->{format} == GL_ALPHA) {
1313 glColor @{$self->{fg}}; 1499 glColor @{$self->{fg}};
1314
1315 $self->{ox} = int (
1316 $self->{align} < 0 ? $self->{padding}
1317 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1318 : ($self->{w} - $tex->{w}) * 0.5
1319 );
1320
1321 $self->{oy} = int (
1322 $self->{valign} < 0 ? $self->{padding}
1323 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1324 : ($self->{h} - $tex->{h}) * 0.5
1325 );
1326
1327 $tex->draw_quad ($self->{ox}, $self->{oy}); 1500 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1501 } else {
1502 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1503 }
1328 1504
1329 glDisable GL_TEXTURE_2D; 1505 glDisable GL_TEXTURE_2D;
1330 glDisable GL_BLEND;
1331} 1506}
1332 1507
1333############################################################################# 1508#############################################################################
1334 1509
1335package CFClient::UI::EntryBase; 1510package CFClient::UI::EntryBase;
… …
1348 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1349 can_hover => 1, 1524 can_hover => 1,
1350 can_focus => 1, 1525 can_focus => 1,
1351 valign => 0, 1526 valign => 0,
1352 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1353 @_ 1529 @_
1354 ) 1530 )
1355} 1531}
1356 1532
1357sub _set_text { 1533sub _set_text {
… …
1367 $self->{text} = $text; 1543 $self->{text} = $text;
1368 1544
1369 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1370 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1371 1547
1372 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1373}
1374
1375sub get_text {
1376 $_[0]{text}
1377}
1378
1379sub size_request {
1380 my ($self) = @_;
1381
1382 my ($w, $h) = $self->SUPER::size_request;
1383
1384 ($w + 1, $h) # add 1 for cursor
1385}
1386
1387sub size_allocate {
1388 my ($self, $w, $h) = @_;
1389
1390 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1391} 1549}
1392 1550
1393sub set_text { 1551sub set_text {
1394 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1395 1553
1396 $self->{cursor} = length $text; 1554 $self->{cursor} = length $text;
1397 $self->_set_text ($text); 1555 $self->_set_text ($text);
1398 $self->update; 1556 $self->update;
1557 $self->check_size;
1558}
1559
1560sub get_text {
1561 $_[0]{text}
1562}
1563
1564sub size_request {
1565 my ($self) = @_;
1566
1567 my ($w, $h) = $self->SUPER::size_request;
1568
1569 ($w + 1, $h) # add 1 for cursor
1399} 1570}
1400 1571
1401sub key_down { 1572sub key_down {
1402 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1403 1574
… …
1405 my $sym = $ev->{sym}; 1576 my $sym = $ev->{sym};
1406 my $uni = $ev->{unicode}; 1577 my $uni = $ev->{unicode};
1407 1578
1408 my $text = $self->get_text; 1579 my $text = $self->get_text;
1409 1580
1410 if ($sym == 8) { 1581 if ($uni == 8) {
1411 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1582 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1412 } elsif ($sym == 127) { 1583 } elsif ($uni == 127) {
1413 substr $text, $self->{cursor}, 1, ""; 1584 substr $text, $self->{cursor}, 1, "";
1414 } elsif ($sym == CFClient::SDLK_LEFT) { 1585 } elsif ($sym == CFClient::SDLK_LEFT) {
1415 --$self->{cursor} if $self->{cursor}; 1586 --$self->{cursor} if $self->{cursor};
1416 } elsif ($sym == CFClient::SDLK_RIGHT) { 1587 } elsif ($sym == CFClient::SDLK_RIGHT) {
1417 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1588 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1418 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1419 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1420 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1421 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1422 } elsif ($sym == 27) { 1593 } elsif ($uni == 27) {
1423 $self->emit ('escape'); 1594 $self->_emit ('escape');
1424 } elsif ($uni) { 1595 } elsif ($uni) {
1425 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1426 } 1597 }
1427 1598
1428 $self->_set_text ($text); 1599 $self->_set_text ($text);
1429 $self->update; 1600 $self->update;
1601 $self->check_size;
1430} 1602}
1431 1603
1432sub focus_in { 1604sub focus_in {
1433 my ($self) = @_; 1605 my ($self) = @_;
1434 1606
… …
1514 if ($sym == 13) { 1686 if ($sym == 13) {
1515 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1516 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1517 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1518 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1519 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1520 $self->update; 1692 $self->update;
1521 1693
1522 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1523 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1524 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1563 my $class = shift; 1735 my $class = shift;
1564 1736
1565 $class->SUPER::new ( 1737 $class->SUPER::new (
1566 padding => 4, 1738 padding => 4,
1567 fg => [1, 1, 1], 1739 fg => [1, 1, 1],
1568 bg => [1, 1, 1, 0.2],
1569 active_fg => [0, 0, 1], 1740 active_fg => [0, 0, 1],
1570 can_hover => 1, 1741 can_hover => 1,
1571 align => 0, 1742 align => 0,
1572 valign => 0, 1743 valign => 0,
1573 can_events => 1, 1744 can_events => 1,
1574 @_ 1745 @_
1575 ) 1746 )
1576} 1747}
1577 1748
1749sub activate { }
1750
1578sub button_up { 1751sub button_up {
1579 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1580 1753
1754 $self->emit ("activate")
1581 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1582 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1583 $self->emit ("activate");
1584 }
1585} 1757}
1586 1758
1587sub _draw { 1759sub _draw {
1588 my ($self) = @_; 1760 my ($self) = @_;
1589 1761
… …
1591 1763
1592 if ($GRAB == $self) { 1764 if ($GRAB == $self) {
1593 $self->{fg} = $self->{active_fg}; 1765 $self->{fg} = $self->{active_fg};
1594 } 1766 }
1595 1767
1596 glEnable GL_BLEND;
1597 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1598 glEnable GL_TEXTURE_2D; 1768 glEnable GL_TEXTURE_2D;
1599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1600 glColor 0, 0, 0, 1; 1770 glColor 0, 0, 0, 1;
1601 1771
1602 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1772 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1603 1773
1604 glDisable GL_TEXTURE_2D; 1774 glDisable GL_TEXTURE_2D;
1605 glDisable GL_BLEND;
1606 1775
1607 $self->SUPER::_draw; 1776 $self->SUPER::_draw;
1608} 1777}
1609 1778
1610############################################################################# 1779#############################################################################
… …
1624 1793
1625 $class->SUPER::new ( 1794 $class->SUPER::new (
1626 padding => 2, 1795 padding => 2,
1627 fg => [1, 1, 1], 1796 fg => [1, 1, 1],
1628 active_fg => [1, 1, 0], 1797 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5],
1629 state => 0, 1800 state => 0,
1630 can_hover => 1, 1801 can_hover => 1,
1631 @_ 1802 @_
1632 ) 1803 )
1633} 1804}
… …
1642 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1643 1814
1644 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1645 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1646 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1647 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1648 } 1819 }
1649} 1820}
1650 1821
1651sub _draw { 1822sub _draw {
1652 my ($self) = @_; 1823 my ($self) = @_;
… …
1657 1828
1658 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1659 1830
1660 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1661 1832
1662 glEnable GL_BLEND; 1833 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834
1663 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1665
1666 my $tex = $self->{state} ? $tex[1] : $tex[0];
1667
1668 $tex->draw_quad (0, 0, $s, $s); 1836 $tex->draw_quad_alpha (0, 0, $s, $s);
1669
1670 glDisable GL_TEXTURE_2D; 1837 glDisable GL_TEXTURE_2D;
1671 glDisable GL_BLEND;
1672} 1838}
1673 1839
1674############################################################################# 1840#############################################################################
1675 1841
1676package CFClient::UI::Image; 1842package CFClient::UI::Image;
… …
1719 glTranslate 0, -$self->{w}, 0; 1885 glTranslate 0, -$self->{w}, 0;
1720 1886
1721 ($w, $h) = ($h, $w); 1887 ($w, $h) = ($h, $w);
1722 } 1888 }
1723 1889
1724 glEnable GL_BLEND;
1725 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1726 glEnable GL_TEXTURE_2D; 1890 glEnable GL_TEXTURE_2D;
1727 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1891 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1728 1892
1729 $tex->draw_quad (0, 0, $w, $h); 1893 $tex->draw_quad_alpha (0, 0, $w, $h);
1730 1894
1731 glDisable GL_BLEND;
1732 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1733} 1896}
1734 1897
1735############################################################################# 1898#############################################################################
1736 1899
… …
1925 qw(s1_slider.png s1_slider_bg.png); 2088 qw(s1_slider.png s1_slider_bg.png);
1926 2089
1927sub new { 2090sub new {
1928 my $class = shift; 2091 my $class = shift;
1929 2092
1930 # range [value, low, high, page] 2093 # range [value, low, high, page, unit]
1931 2094
1932 # TODO: 0-width page 2095 # TODO: 0-width page
1933 # TODO: req_w/h are wrong with vertical 2096 # TODO: req_w/h are wrong with vertical
1934 # TODO: calculations are off 2097 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2100 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5],
1938 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
1939 req_w => 20, 2104 req_w => $::WIDTH / 80,
1940 req_h => 20, 2105 req_h => $::WIDTH / 80,
1941 vertical => 0, 2106 vertical => 0,
1942 can_hover => 1, 2107 can_hover => 1,
1943 inner_pad => 5, 2108 inner_pad => 0.02,
1944 @_ 2109 @_
1945 ); 2110 );
1946 2111
2112 $self->set_value ($self->{range}[0]);
2113 $self->update;
2114
1947 $self 2115 $self
2116}
2117
2118sub set_range {
2119 my ($self, $range) = @_;
2120
2121 $self->{range} = $range;
2122
2123 $self->update;
2124}
2125
2126sub set_value {
2127 my ($self, $value) = @_;
2128
2129 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2130
2131 $hi = $lo + 1 if $hi <= $lo;
2132
2133 $page = $hi - $lo if $page > $hi - $lo;
2134
2135 $value = $lo if $value < $lo;
2136 $value = $hi - $page if $value > $hi - $page;
2137
2138 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2139 if $unit;
2140
2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2142
2143 if ($value != $old_value) {
2144 $self->_emit (changed => $value);
2145 $self->update;
2146 }
1948} 2147}
1949 2148
1950sub size_request { 2149sub size_request {
1951 my ($self) = @_; 2150 my ($self) = @_;
1952 2151
… …
1958 2157
1959sub button_down { 2158sub button_down {
1960 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
1961 2160
1962 $self->SUPER::button_down ($ev, $x, $y); 2161 $self->SUPER::button_down ($ev, $x, $y);
2162
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164
1963 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
1964} 2166}
1965 2167
1966sub mouse_motion { 2168sub mouse_motion {
1967 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
1968 2170
1969 if ($GRAB == $self) { 2171 if ($GRAB == $self) {
2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2173
2174 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2179 }
2180}
2181
2182sub update {
2183 my ($self) = @_;
2184
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2186 $self->set_value ($self->{range}[0]);
2187
1970 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
1971 2190
1972 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1973 2192
1974 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2193 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1975 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1976 2195
1977 $x -= $inner_pad_px; # substract the padding 2196 $value = ($value - $lo) / $range;
1978 $x = $x * ($hi - $lo) / $inner_w + $lo; 2197 $value = $value * $self->{scale} + $self->{offset};
1979 $x = $lo if $x < $lo;
1980 $x = $hi - $page if $x > $hi - $page;
1981 $self->{range}[0] = $x;
1982 2198
1983 $self->emit (changed => $x); 2199 $self->{knob_x} = $value - $knob_w * 0.5;
1984 $self->update; 2200 $self->{knob_w} = $knob_w;
1985 } 2201 });
1986}
1987 2202
1988# the inner_* stuff is for generating a padding for the slider handle, 2203 $self->SUPER::update;
1989# so that the handle doesn't leave the texture. This calculation isn't 100%
1990# correct propably, but it does the job for now
1991sub _calc_inner_pad_px {
1992 my ($self, $w) = @_;
1993 ($w / 100) * $self->{inner_pad} # % to pixels
1994} 2204}
1995 2205
1996sub _draw { 2206sub _draw {
1997 my ($self) = @_; 2207 my ($self) = @_;
1998 2208
1999 $self->SUPER::_draw (); 2209 $self->SUPER::_draw ();
2000 2210
2001 my ($w, $h) = @$self{qw(w h)}; 2211 glScale $self->{w}, $self->{h};
2002 2212
2003 if ($self->{vertical}) { 2213 if ($self->{vertical}) {
2004 # draw a vertical slider like a rotated horizontal slider 2214 # draw a vertical slider like a rotated horizontal slider
2005 2215
2216 glTranslate 1, 0, 0;
2006 glRotate 90, 0, 0, 1; 2217 glRotate 90, 0, 0, 1;
2007 glTranslate 0, -$self->{w}, 0;
2008
2009 ($w, $h) = ($h, $w);
2010 } 2218 }
2011 2219
2012 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2220 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2013 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2221 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2014 2222
2015 my ($value, $lo, $hi, $page) = @{$self->{range}};
2016
2017 $hi = $value + 1 if $lo == $hi;
2018
2019 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2020 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2021
2022 $page = int $page * $inner_w / ($hi - $lo);
2023 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2024
2025 $w -= $page;
2026 $page &= ~1;
2027 glTranslate $page * 0.5, 0, 0;
2028 $page ||= 2;
2029
2030 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2031 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2032
2033 glEnable GL_BLEND;
2034 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2035 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2037 2225
2038 # draw background 2226 # draw background
2039 $tex[1]->draw_quad (0, 0, $w, $h); 2227 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2040 2228
2041 # draw handle 2229 # draw handle
2042 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2230 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2043 2231
2044 glDisable GL_BLEND;
2045 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2046} 2233}
2234
2235#############################################################################
2236
2237package CFClient::UI::ValSlider;
2238
2239our @ISA = CFClient::UI::HBox::;
2240
2241sub new {
2242 my ($class, %arg) = @_;
2243
2244 my $range = delete $arg{range};
2245
2246 my $self = $class->SUPER::new (
2247 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2248 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2249 to_value => sub { shift },
2250 from_value => sub { shift },
2251 %arg,
2252 );
2253
2254 $self->{slider}->connect (changed => sub {
2255 my ($self, $value) = @_;
2256 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2257 $self->{parent}->emit (changed => $value);
2258 });
2259
2260# $self->{entry}->connect (changed => sub {
2261# my ($self, $value) = @_;
2262# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2263# $self->{parent}->emit (changed => $value);
2264# });
2265
2266 $self->add ($self->{slider}, $self->{entry});
2267
2268 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2269
2270 $self
2271}
2272
2273sub set_range { shift->{slider}->set_range (@_) }
2274sub set_value { shift->{slider}->set_value (@_) }
2047 2275
2048############################################################################# 2276#############################################################################
2049 2277
2050package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2051 2279
… …
2060 fontsize => 1, 2288 fontsize => 1,
2061 can_events => 0, 2289 can_events => 0,
2062 #font => default_font 2290 #font => default_font
2063 @_, 2291 @_,
2064 2292
2065 layout => (new CFClient::Layout), 2293 layout => (new CFClient::Layout 1),
2066 par => [], 2294 par => [],
2067 height => 0, 2295 height => 0,
2068 children => [ 2296 children => [
2069 (new CFClient::UI::Empty expand => 1), 2297 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2298 (new CFClient::UI::Slider vertical => 1),
2071 ], 2299 ],
2072 ); 2300 );
2073 2301
2074 $self->{children}[1]->connect (changed => sub { 2302 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2303
2078 $self 2304 $self
2079} 2305}
2080 2306
2081sub set_fontsize { 2307sub set_fontsize {
2082 my ($self, $fontsize) = @_; 2308 my ($self, $fontsize) = @_;
2083 2309
2084 $self->{fontsize} = $fontsize; 2310 $self->{fontsize} = $fontsize;
2085 $self->reflow; 2311 $self->reflow;
2086}
2087
2088sub text_height {
2089 my ($self, $text) = @_;
2090
2091 my $layout = $self->{layout};
2092
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w});
2095 $layout->set_text ($text);
2096
2097 ($layout->size)[1]
2098}
2099
2100sub reflow {
2101 my ($self) = @_;
2102
2103 $self->{need_reflow}++;
2104 $self->update;
2105} 2312}
2106 2313
2107sub size_allocate { 2314sub size_allocate {
2108 my ($self, $w, $h) = @_; 2315 my ($self, $w, $h) = @_;
2109 2316
… …
2114 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2115 2322
2116 $self->reflow; 2323 $self->reflow;
2117} 2324}
2118 2325
2326sub text_size {
2327 my ($self, $text, $indent) = @_;
2328
2329 my $layout = $self->{layout};
2330
2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2332 $layout->set_width ($self->{children}[0]{w} - $indent);
2333 $layout->set_markup ($text);
2334
2335 $layout->size
2336}
2337
2338sub reflow {
2339 my ($self) = @_;
2340
2341 $self->{need_reflow}++;
2342 $self->update;
2343}
2344
2345sub set_offset {
2346 my ($self, $offset) = @_;
2347
2348 # todo: base offset on lines or so, not on pixels
2349 $self->{children}[1]->set_value ($offset);
2350}
2351
2352sub clear {
2353 my ($self) = @_;
2354
2355 $self->{par} = [];
2356 $self->{height} = 0;
2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2358}
2359
2119sub add_paragraph { 2360sub add_paragraph {
2120 my ($self, $color, $text) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2121 2362
2122 #TODO: intelligently "reformat" paragraph 2363 for my $line (split /\n/, $text) {
2123 2364 my ($w, $h) = $self->text_size ($line);
2124 my $height = $self->text_height ($text);
2125
2126 $self->{height} += $height; 2365 $self->{height} += $h;
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2367 }
2127 2368
2128 push @{$self->{par}}, [$height, $color, $text];
2129
2130 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2131 $self->{children}[1]->update;
2132} 2370}
2133 2371
2134sub update { 2372sub update {
2135 my ($self) = @_; 2373 my ($self) = @_;
2136 2374
… …
2138 2376
2139 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2140 2378
2141 delete $self->{texture}; 2379 delete $self->{texture};
2142 2380
2143 $ROOT->on_refresh ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2144 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2145 my $height = 0; 2385 my $height = 0;
2146 2386
2147 $height += $_->[0] = $self->text_height ($_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2148 for @{$self->{par}}; 2391 for (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2393 $layout->set_width ($W - $_->[3]);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3];
2397 $_->[1] = $h;
2398 }
2399
2400 $height += $_->[1];
2401 }
2149 2402
2150 $self->{height} = $height; 2403 $self->{height} = $height;
2151 2404
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2153 2406
2154 delete $self->{texture}; 2407 delete $self->{texture};
2155 } 2408 }
2156 2409
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2158 glClearColor 0, 0, 0, 1; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2160 2413
2414 my $top = int $self->{children}[1]{range}[0];
2415
2416 my $y0 = $top;
2417 my $y1 = $top + $H;
2418
2419 my $y = 0;
2420
2421 my $layout = $self->{layout};
2422
2423 $layout->set_font ($self->{font}) if $self->{font};
2424
2161 glEnable GL_BLEND; 2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D;
2164 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2165
2166 my $top = int $self->{children}[1]{range}[0];
2167
2168 my $y0 = $top;
2169 my $y1 = $top + $self->{h};
2170
2171 my $y = 0;
2172
2173 my $layout = $self->{layout};
2174
2175 $layout->set_font ($self->{font}) if $self->{font};
2176 2428
2177 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2178 my $h = $par->[0]; 2430 my $h = $par->[1];
2179 2431
2180 if ($y0 < $y + $h && $y < $y1) { 2432 if ($y0 < $y + $h && $y < $y1) {
2433 $layout->set_foreground (@{ $par->[2] });
2434 $layout->set_width ($W - $par->[3]);
2181 $layout->set_text ($par->[2]); 2435 $layout->set_markup ($par->[4]);
2182 2436
2183 glColor @{ $par->[1] }; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2184 my ($W, $H) = $layout->size; 2438
2185 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2439 glRasterPos $par->[3], $y - $y0;
2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2186 } 2441 }
2187 2442
2188 $y += $h; 2443 $y += $h;
2189 } 2444 }
2190 2445
2191 glDisable GL_TEXTURE_2D;
2192 glDisable GL_BLEND; 2446 glDisable GL_BLEND;
2193 }; 2447 };
2194 }); 2448 });
2195} 2449}
2196 2450
2197sub _draw { 2451sub _draw {
2198 my ($self) = @_; 2452 my ($self) = @_;
2199 2453
2200 if ($self->{texture}) {
2201 glEnable GL_TEXTURE_2D; 2454 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2456 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2457 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2458 glDisable GL_TEXTURE_2D;
2206 }
2207 2459
2208 $self->{children}[1]->draw; 2460 $self->{children}[1]->draw;
2209 2461
2210} 2462}
2211 2463
… …
2279 2531
2280 # TODO: use animation 2532 # TODO: use animation
2281 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2282 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2283 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2284 $self->emit ("open"); 2536 $self->_emit ("open");
2285 } else { 2537 } else {
2286 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2287 $self->emit ("close"); 2539 $self->_emit ("close");
2288 } 2540 }
2289 2541
2290 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2291} 2543}
2292 2544
2293############################################################################# 2545#############################################################################
2294 2546
2295package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2305 @_, 2557 @_,
2306 can_events => 0, 2558 can_events => 0,
2307 ) 2559 )
2308} 2560}
2309 2561
2310sub set_markup { 2562sub set_tooltip_from {
2311 my ($self, $text) = @_; 2563 my ($self, $widget) = @_;
2312 2564
2313 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2565 $self->add (new CFClient::UI::Label
2314 $self->{label}->set_markup ($text); 2566 markup => $widget->{tooltip},
2315 $self->add ($self->{label}); 2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8,
2569 fg => [0, 0, 0, 1],
2570 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP),
2572 );
2316} 2573}
2317 2574
2318sub size_request { 2575sub size_request {
2319 my ($self) = @_; 2576 my ($self) = @_;
2320
2321 $self->child->set_max_size ($::WIDTH * 0.3);
2322 2577
2323 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2578 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2324 2579
2325 ($w + 4, $h + 4) 2580 ($w + 4, $h + 4)
2326} 2581}
… …
2332} 2587}
2333 2588
2334sub _draw { 2589sub _draw {
2335 my ($self) = @_; 2590 my ($self) = @_;
2336 2591
2337 glPushMatrix;
2338 glTranslate 0.375, 0.375; 2592 glTranslate 0.375, 0.375;
2339 2593
2340 my ($w, $h) = @$self{qw(w h)}; 2594 my ($w, $h) = @$self{qw(w h)};
2341 2595
2342 glColor 1, 0.8, 0.4; 2596 glColor 1, 0.8, 0.4;
… …
2353 glVertex 0 , $h; 2607 glVertex 0 , $h;
2354 glVertex $w, $h; 2608 glVertex $w, $h;
2355 glVertex $w, 0; 2609 glVertex $w, 0;
2356 glEnd; 2610 glEnd;
2357 2611
2358 glPopMatrix; 2612 glTranslate 2 - 0.375, 2 - 0.375;
2359
2360 glTranslate 2, 2;
2361 $self->SUPER::_draw; 2613 $self->SUPER::_draw;
2362} 2614}
2363 2615
2364############################################################################# 2616#############################################################################
2365 2617
… …
2370use CFClient::OpenGL; 2622use CFClient::OpenGL;
2371 2623
2372sub new { 2624sub new {
2373 my $class = shift; 2625 my $class = shift;
2374 2626
2375 $class->SUPER::new ( 2627 my $self = $class->SUPER::new (
2376 aspect => 1, 2628 aspect => 1,
2377 @_, 2629 @_,
2378 ) 2630 );
2631
2632 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self);
2634
2635 $self->{timer} = Event->timer (
2636 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2637 hard => 1,
2638 interval => $self->{animspeed},
2639 cb => sub {
2640 ++$widget->{frame};
2641 $widget->update;
2642 },
2643 );
2644 }
2645
2646 $self
2379} 2647}
2380 2648
2381sub size_request { 2649sub size_request {
2382 (32, 8) 2650 (32, 8)
2383} 2651}
2384 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2385sub draw { 2661sub _draw {
2386 my ($self) = @_; 2662 my ($self) = @_;
2387 2663
2664 return unless $::CONN;
2665
2666 my $face;
2667
2668 if ($self->{frame}) {
2669 my $anim = $::CONN->{anim}[$self->{anim}];
2670
2671 $face = $anim->[ $self->{frame} % @$anim ]
2672 if $anim && @$anim;
2673 }
2674
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2389 2676
2390 if ($tex) { 2677 if ($tex) {
2391 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2678 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2395 glColor 1, 1, 1, 1; 2680 glColor 1, 1, 1, 1;
2396 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2397 glDisable GL_TEXTURE_2D; 2682 glDisable GL_TEXTURE_2D;
2398 glDisable GL_BLEND;
2399 } 2683 }
2684}
2685
2686sub DESTROY {
2687 my ($self) = @_;
2688
2689 $self->{timer}->cancel
2690 if $self->{timer};
2691
2692 $self->SUPER::DESTROY;
2400} 2693}
2401 2694
2402############################################################################# 2695#############################################################################
2403 2696
2697package CFClient::UI::InventoryItem;
2698
2699our @ISA = CFClient::UI::HBox::;
2700
2701sub _item_to_desc {
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856}
2857
2858#############################################################################
2859
2860package CFClient::UI::Menu;
2861
2862our @ISA = CFClient::UI::FancyFrame::;
2863
2864use CFClient::OpenGL;
2865
2866sub new {
2867 my $class = shift;
2868
2869 my $self = $class->SUPER::new (
2870 items => [],
2871 z => 100,
2872 @_,
2873 );
2874
2875 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2876
2877 for my $item (@{ $self->{items} }) {
2878 my ($widget, $cb) = @$item;
2879
2880 # handle various types of items, only text for now
2881 if (!ref $widget) {
2882 $widget = new CFClient::UI::Label
2883 can_hover => 1,
2884 can_events => 1,
2885 text => $widget;
2886 }
2887
2888 $self->{item}{$widget} = $item;
2889
2890 $self->{vbox}->add ($widget);
2891 }
2892
2893 $self
2894}
2895
2896# popup given the event (must be a mouse button down event currently)
2897sub popup {
2898 my ($self, $ev) = @_;
2899
2900 $self->_emit ("popdown");
2901
2902 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self;
2904 $self->{button} = $ev->{button};
2905
2906 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908}
2909
2910sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_;
2912
2913 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER};
2916}
2917
2918sub button_up {
2919 my ($self, $ev, $x, $y) = @_;
2920
2921 if ($ev->{button} == $self->{button}) {
2922 undef $GRAB;
2923 $self->hide;
2924
2925 $self->_emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover};
2927 }
2928}
2929
2930#############################################################################
2931
2932package CFClient::UI::Statusbox;
2933
2934our @ISA = CFClient::UI::VBox::;
2935
2936sub new {
2937 my $class = shift;
2938
2939 $class->SUPER::new (
2940 fontsize => 0.8,
2941 @_,
2942 )
2943}
2944
2945sub reorder {
2946 my ($self) = @_;
2947 my $NOW = time;
2948
2949 while (my ($k, $v) = each %{ $self->{item} }) {
2950 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2951 }
2952
2953 my @widgets;
2954
2955 my @items = sort {
2956 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} };
2959
2960 my $count = 10 + 1;
2961 for my $item (@items) {
2962 last unless --$count;
2963
2964 push @widgets, $item->{label} ||= do {
2965 # TODO: doesn't handle markup well (read as: at all)
2966 my $short = $item->{count} > 1
2967 ? "<b>$item->{count} ×</b> $item->{text}"
2968 : $item->{text};
2969
2970 for ($short) {
2971 s/^\s+//;
2972 s/\s+/ /g;
2973 }
2974
2975 new CFClient::UI::Label
2976 markup => $short,
2977 tooltip => $item->{tooltip},
2978 tooltip_font => $::FONT_PROP,
2979 tooltip_width => 0.67,
2980 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg},
2983 can_events => 1,
2984 can_hover => 1
2985 };
2986 }
2987
2988 $self->clear;
2989 $self->SUPER::add (reverse @widgets);
2990}
2991
2992sub add {
2993 my ($self, $text, %arg) = @_;
2994
2995 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//;
2997
2998 my $timeout = time + ((delete $arg{timeout}) || 60);
2999
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001
3002 if (my $item = $self->{item}{$group}) {
3003 if ($item->{text} eq $text) {
3004 $item->{count}++;
3005 } else {
3006 $item->{count} = 1;
3007 $item->{text} = $item->{tooltip} = $text;
3008 }
3009 $item->{id} = ++$self->{id};
3010 $item->{timeout} = $timeout;
3011 delete $item->{label};
3012 } else {
3013 $self->{item}{$group} = {
3014 id => ++$self->{id},
3015 text => $text,
3016 timeout => $timeout,
3017 tooltip => $text,
3018 fg => [0.8, 0.8, 0.8, 0.8],
3019 pri => 0,
3020 count => 1,
3021 %arg,
3022 };
3023 }
3024
3025 $self->reorder;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 delete $_->{label}
3032 for values %{ $self->{item} || {} };
3033
3034 $self->reorder;
3035 $self->SUPER::reconfigure;
3036}
3037
3038#############################################################################
3039
2404package CFClient::UI::Root; 3040package CFClient::UI::Root;
2405 3041
2406our @ISA = CFClient::UI::Container::; 3042our @ISA = CFClient::UI::Container::;
2407 3043
2408use CFClient::OpenGL; 3044use CFClient::OpenGL;
2409 3045
2410sub check_size { 3046sub new {
2411 my ($self) = @_; 3047 my $class = shift;
2412 3048
2413 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3049 $class->SUPER::new (
2414} 3050 @_,
2415 3051 )
2416sub size_request {
2417 ($::WIDTH, $::HEIGHT)
2418} 3052}
2419 3053
2420sub configure { 3054sub configure {
2421 my ($self, $x, $y, $w, $h) = @_; 3055 my ($self, $x, $y, $w, $h) = @_;
2422 3056
2423 $self->SUPER::configure ($x, $y, $w, $h); 3057 $self->{w} = $w;
3058 $self->{h} = $h;
3059}
2424 3060
3061sub check_size {
3062 my ($self) = @_;
3063
3064 $self->size_allocate ($self->{w}, $self->{h})
3065 if $self->{w};
3066}
3067
3068sub size_request {
3069 my ($self) = @_;
3070
3071 ($self->{w}, $self->{h})
3072}
3073
3074sub size_allocate {
3075 my ($self, $w, $h) = @_;
3076
2425 for my $child (@{$self->{children}}) { 3077 for my $child ($self->children) {
2426 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2427 3079
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3081 if exists $child->{req_x};
3082
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3084 if exists $child->{req_y};
3085
2428 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2429 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088
2430 $child->configure ($X, $Y, $W,$H); 3089 $child->configure ($X, $Y, $W, $H);
2431 } 3090 }
2432} 3091}
2433 3092
2434sub _topleft { 3093sub coord2local {
2435 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2436 3095
2437 ($x, $y) 3096 ($x, $y)
2438} 3097}
2439 3098
3099sub coord2global {
3100 my ($self, $x, $y) = @_;
3101
3102 ($x, $y)
3103}
3104
2440sub update { 3105sub update {
2441 my ($self) = @_; 3106 my ($self) = @_;
2442 3107
2443 $self->check_size; 3108 $self->check_size;
2444 ::refresh (); 3109 $::WANT_REFRESH++;
2445} 3110}
2446 3111
2447sub add { 3112sub add {
2448 my ($self, $child) = @_; 3113 my ($self, @children) = @_;
2449 3114
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1;
3123
2450 # integerize window positions 3124 # integerise window positions
2451 $child->{x} = int $child->{x}; 3125 $child->{x} = int $child->{x};
2452 $child->{y} = int $child->{y}; 3126 $child->{y} = int $child->{y};
3127 }
2453 3128
2454 $self->SUPER::add ($child); 3129 $self->SUPER::add (@children);
3130}
3131
3132sub remove {
3133 my ($self, @children) = @_;
3134
3135 $self->SUPER::remove (@children);
3136
3137 while (@children) {
3138 my $w = pop @children;
3139 push @children, $w->children;
3140 $w->set_invisible;
3141 }
2455} 3142}
2456 3143
2457sub on_refresh { 3144sub on_refresh {
2458 my ($self, $id, $cb) = @_; 3145 my ($self, $id, $cb) = @_;
2459 3146
2460 $self->{refresh_hook}{$id} = $cb; 3147 $self->{refresh_hook}{$id} = $cb;
2461} 3148}
2462 3149
3150sub on_post_alloc {
3151 my ($self, $id, $cb) = @_;
3152
3153 $self->{post_alloc_hook}{$id} = $cb;
3154}
3155
2463sub draw { 3156sub draw {
2464 my ($self) = @_; 3157 my ($self) = @_;
2465 3158
2466 while (my $rcb = delete $self->{refresh_hook}) { 3159 while ($self->{refresh_hook}) {
2467 $_->() for values %$rcb; 3160 $_->()
3161 for values %{delete $self->{refresh_hook}};
3162 }
3163
3164 if ($self->{check_size}) {
3165 my @queue = ([], []);
3166
3167 for (;;) {
3168 if ($self->{check_size}) {
3169 # heuristic: check containers last
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3171 for values %{delete $self->{check_size}}
3172 }
3173
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3175
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3177 ? @$widget{qw(user_w user_h)}
3178 : $widget->size_request;
3179
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183
3184 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h;
3186
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3188
3189 $widget->{parent}->check_size
3190 if $widget->{parent};
3191 }
3192 }
3193 }
3194
3195 while ($self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) {
3197 my ($widget, $w, $h) = @$_;
3198
3199 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0;
3201
3202 $widget->{w} = $w;
3203 $widget->{h} = $h;
3204 $widget->emit (size_allocate => $w, $h);
3205 }
3206 }
3207
3208 while ($self->{post_alloc_hook}) {
3209 $_->()
3210 for values %{delete $self->{post_alloc_hook}};
2468 } 3211 }
2469 3212
2470 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3213 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2471 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2472 glClear GL_COLOR_BUFFER_BIT; 3215 glClear GL_COLOR_BUFFER_BIT;
2473 3216
2474 glMatrixMode GL_PROJECTION; 3217 glMatrixMode GL_PROJECTION;
2475 glLoadIdentity; 3218 glLoadIdentity;
2476 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2477 glMatrixMode GL_MODELVIEW; 3220 glMatrixMode GL_MODELVIEW;
2478 glLoadIdentity; 3221 glLoadIdentity;
2479 3222
2480 $self->_draw; 3223 $self->_draw;
2481} 3224}
… …
2483############################################################################# 3226#############################################################################
2484 3227
2485package CFClient::UI; 3228package CFClient::UI;
2486 3229
2487$ROOT = new CFClient::UI::Root; 3230$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 3231$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2489 3232
24901 32331
2491 3234

Diff Legend

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