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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.233 by root, Thu May 25 03:42:40 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} 315}
243 316
244sub set_max_size { 317sub set_max_size {
245 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
246 319
247 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
249} 322}
250 323
251# return top left coordinates 324sub set_tooltip {
252sub _topleft {
253 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
254 326
255 $self->{parent} 327 $self->{tooltip} = $tooltip;
256 or Carp::confess "no parent widget in _topleft\n";#d#
257 328
258 $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 }
259} 333}
260 334
261# translate global coordinates to local coordinate system 335# translate global coordinates to local coordinate system
262sub coord2local { 336sub coord2local {
263 my ($self, $x, $y) = @_; 337 my ($self, $x, $y) = @_;
264 338
265 my ($X, $Y) = $self->_topleft; 339 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266 ($x - $X, $y - $Y)
267} 340}
268 341
269# translate local coordinates to global coordinate system 342# translate local coordinates to global coordinate system
270sub coord2global { 343sub coord2global {
271 my ($self, $x, $y) = @_; 344 my ($self, $x, $y) = @_;
272 345
273 my ($X, $Y) = $self->_topleft; 346 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274 ($x + $X, $y + $Y)
275} 347}
276 348
277sub focus_in { 349sub focus_in {
278 my ($self) = @_; 350 my ($self) = @_;
279 351
280 return if $FOCUS == $self; 352 return if $FOCUS == $self;
281 return unless $self->{can_focus}; 353 return unless $self->{can_focus};
282 354
283 my $focus = $FOCUS; $FOCUS = $self; 355 my $focus = $FOCUS; $FOCUS = $self;
284 356
285 $self->emit (focus_in => $focus); 357 $self->_emit (focus_in => $focus);
286 358
287 $focus->update if $focus; 359 $focus->update if $focus;
288 $FOCUS->update; 360 $FOCUS->update;
289} 361}
290 362
… …
293 365
294 return unless $FOCUS == $self; 366 return unless $FOCUS == $self;
295 367
296 my $focus = $FOCUS; undef $FOCUS; 368 my $focus = $FOCUS; undef $FOCUS;
297 369
298 $self->emit (focus_out => $focus); 370 $self->_emit (focus_out => $focus);
299 371
300 $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;
301} 376}
302 377
303sub mouse_motion { } 378sub mouse_motion { }
304sub button_up { } 379sub button_up { }
305sub key_down { } 380sub key_down { }
306sub key_up { } 381sub key_up { }
307 382
308sub button_down { 383sub button_down {
309 my ($self, $ev, $x, $y) = @_; 384 my ($self, $ev, $x, $y) = @_;
310 385
311 $self->focus_in; 386 $self->focus_in;
… …
351 glVertex $self->{w}, 0; 426 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h}; 427 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h}; 428 glVertex 0 , $self->{h};
354 glEnd; 429 glEnd;
355 glPopMatrix; 430 glPopMatrix;
356 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;
357 } 432 }
358} 433}
359 434
360sub _draw { 435sub _draw {
361 my ($self) = @_; 436 my ($self) = @_;
… …
377 452
378sub set_parent { 453sub set_parent {
379 my ($self, $parent) = @_; 454 my ($self, $parent) = @_;
380 455
381 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;
382} 463}
383 464
384sub check_size { 465sub check_size {
385 my ($self) = @_; 466 my ($self, $forced) = @_;
386 467
387 $self->{parent} 468 $self->{force_alloc} = 1 if $forced;
388 or return 1; 469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408} 470}
409 471
410sub update { 472sub update {
411 my ($self) = @_; 473 my ($self) = @_;
412 474
… …
418 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
419 481
420 push @{ $self->{signal_cb}{$signal} }, $cb; 482 push @{ $self->{signal_cb}{$signal} }, $cb;
421} 483}
422 484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
423sub emit { 491sub emit {
424 my ($self, $signal, @args) = @_; 492 my ($self, $signal, @args) = @_;
425 493
426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
427} 496}
428 497
429sub DESTROY { 498sub DESTROY {
430 my ($self) = @_; 499 my ($self) = @_;
431 500
501 delete $WIDGET{$self+0};
432 #$self->deactivate; 502 #$self->deactivate;
433} 503}
434 504
435############################################################################# 505#############################################################################
436 506
… …
445 my $class = shift; 515 my $class = shift;
446 516
447 # range [value, low, high, page] 517 # range [value, low, high, page]
448 518
449 $class->SUPER::new ( 519 $class->SUPER::new (
450 bg => [0, 0, 0, 0.2], 520 #bg => [0, 0, 0, 0.2],
451 active_bg => [1, 1, 1, 0.5], 521 #active_bg => [1, 1, 1, 0.5],
452 @_ 522 @_
453 ) 523 )
454} 524}
455 525
456sub _draw { 526sub _draw {
457 my ($self) = @_; 527 my ($self) = @_;
458 528
529 my $color = $FOCUS == $self && $self->{active_bg}
530 ? $self->{active_bg}
531 : $self->{bg};
532
533 if ($color && (@$color < 4 || $color->[3])) {
459 my ($w, $h) = @$self{qw(w h)}; 534 my ($w, $h) = @$self{qw(w h)};
460 535
461 glEnable GL_BLEND; 536 glEnable GL_BLEND;
462 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 538 glColor @$color;
464 539
465 glBegin GL_QUADS; 540 glBegin GL_QUADS;
466 glVertex 0 , 0; 541 glVertex 0 , 0;
467 glVertex 0 , $h; 542 glVertex 0 , $h;
468 glVertex $w, $h; 543 glVertex $w, $h;
469 glVertex $w, 0; 544 glVertex $w, 0;
470 glEnd; 545 glEnd;
471 546
472 glDisable GL_BLEND; 547 glDisable GL_BLEND;
548 }
473} 549}
474 550
475############################################################################# 551#############################################################################
476 552
477package CFClient::UI::Empty; 553package CFClient::UI::Empty;
… …
509 585
510 $self 586 $self
511} 587}
512 588
513sub add { 589sub add {
514 my ($self, $child) = @_; 590 my ($self, @widgets) = @_;
515 591
516 $child->set_parent ($self); 592 $_->set_parent ($self)
593 for @widgets;
517 594
518 use sort 'stable'; 595 use sort 'stable';
519 596
520 $self->{children} = [ 597 $self->{children} = [
521 sort { $a->{z} <=> $b->{z} } 598 sort { $a->{z} <=> $b->{z} }
522 @{$self->{children}}, $child 599 @{$self->{children}}, @widgets
523 ]; 600 ];
524 601
525 $child->check_size; 602 $self->check_size (1);
603 $self->update;
526} 604}
527 605
528sub children { 606sub children {
529 @{ $_[0]{children} } 607 @{ $_[0]{children} }
530} 608}
… …
549 627
550 for (@$children) { 628 for (@$children) {
551 delete $_->{parent}; 629 delete $_->{parent};
552 $_->hide; 630 $_->hide;
553 } 631 }
632
633 $self->check_size;
634 $self->update;
554} 635}
555 636
556sub find_widget { 637sub find_widget {
557 my ($self, $x, $y) = @_; 638 my ($self, $x, $y) = @_;
558 639
… …
633} 714}
634 715
635sub update { 716sub update {
636 my ($self) = @_; 717 my ($self) = @_;
637 718
638 # we want to do this delayed... 719 $ROOT->on_post_alloc ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 720 $self->SUPER::update;
641}
642
643sub render_chld {
644 my ($self) = @_;
645
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1;
648 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw;
650 };
651} 721}
652 722
653sub size_allocate { 723sub size_allocate {
654 my ($self, $w, $h) = @_; 724 my ($self, $w, $h) = @_;
655 725
656 $self->child->configure (0, 0, $w, $h); 726 $self->SUPER::size_allocate ($w, $h);
727 $self->update;
728}
657 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
658 $self->render_chld; 741 $self->_render;
742 };
659} 743}
660 744
661sub _draw { 745sub _draw {
662 my ($self) = @_; 746 my ($self) = @_;
663 747
664 my ($w, $h) = ($self->w, $self->h); 748 my ($w, $h) = ($self->w, $self->h);
665 749
666 my $tex = $self->{texture} 750 my $tex = $self->{texture}
667 or return; 751 or return;
668 752
669 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 753 glEnable GL_TEXTURE_2D;
672 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;
673 756
674 $tex->draw_quad (0, 0, $w, $h); 757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675 758
676 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
678} 760}
679 761
680############################################################################# 762#############################################################################
681 763
682package CFClient::UI::ViewPort; 764package CFClient::UI::ViewPort;
683 765
684our @ISA = CFClient::UI::Window::; 766our @ISA = CFClient::UI::Window::;
685 767
686sub new { die }
687
688sub size_request { 768sub size_request {
689 my ($self) = @_; 769 my ($self) = @_;
690 770
691 @$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)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693 772
694 @$self{qw(child_w child_h)} 773 @$self{qw(child_w child_h)}
695} 774}
696 775
697sub _draw { 776sub size_allocate {
698 my ($self) = @_; 777 my ($self, $w, $h) = @_;
699 778
700 $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;
701} 783}
702 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}
703 829
704############################################################################# 830#############################################################################
705 831
706package CFClient::UI::Frame; 832package CFClient::UI::ScrolledWindow;
707 833
708our @ISA = CFClient::UI::Bin::; 834our @ISA = CFClient::UI::HBox::;
709
710use CFClient::OpenGL;
711 835
712sub new { 836sub new {
713 my $class = shift; 837 my $class = shift;
714 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
715 my $self = $class->SUPER::new ( 849 $self = $class->SUPER::new (
716 bg => [1, 1, 1, 1], 850 vp => (new CFClient::UI::ViewPort expand => 1),
717 border_bg => [1, 1, 1, 1], 851 slider => $slider,
718 border => 0.8,
719 @_ 852 @_,
720 ); 853 );
721 854
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider});
858
722 $self 859 $self
723} 860}
724 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
725sub _draw { 891sub _draw {
726 my ($self) = @_; 892 my ($self) = @_;
727 893
728 my ($w, $h) = ($self->{w}, $self->{h}); 894 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)};
729 896
730 glEnable GL_BLEND; 897 glEnable GL_BLEND;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732 glEnable GL_TEXTURE_2D; 899 glColor @{ $self->{bg} };
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734 900
735# glBegin GL_QUADS; 901 glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0; 902 glVertex 0 , 0;
738# glVertex 0 , $h; 903 glVertex 0 , $h;
739# glVertex $w, $h; 904 glVertex $w, $h;
740# glVertex $w, 0; 905 glVertex $w, 0;
741# glEnd; 906 glEnd;
742 907
743
744 $self->child->draw;
745 glDisable GL_BLEND; 908 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D; 909 }
910
911 $self->SUPER::_draw;
747} 912}
748 913
749############################################################################# 914#############################################################################
750 915
751package CFClient::UI::FancyFrame; 916package CFClient::UI::FancyFrame;
… …
762 my $class = shift; 927 my $class = shift;
763 928
764 # TODO: user_x, user_y, overwrite moveto? 929 # TODO: user_x, user_y, overwrite moveto?
765 930
766 my $self = $class->SUPER::new ( 931 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1], 932 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1], 933 border_bg => [1, 1, 1, 1],
769 border => 0.8, 934 border => 0.6,
935 is_toplevel => 1,
770 can_events => 1, 936 can_events => 1,
771 @_ 937 @_
772 ); 938 );
773 939
774 $self->{title} &&= new CFClient::UI::Label 940 $self->{title} &&= new CFClient::UI::Label
775 align => 0, 941 align => 0,
776 valign => 1, 942 valign => 1,
777 text => $self->{title}, 943 text => $self->{title},
778 fontsize => 1; 944 fontsize => $self->{border};
779 945
780 $self 946 $self
781} 947}
782 948
783sub border { 949sub border {
… …
799 my ($self, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
800 966
801 $h -= List::Util::max 0, $self->border * 2; 967 $h -= List::Util::max 0, $self->border * 2;
802 $w -= List::Util::max 0, $self->border * 2; 968 $w -= List::Util::max 0, $self->border * 2;
803 969
804 $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)
805 if $self->{title}; 971 if $self->{title};
806 972
807 $self->child->configure ($self->border, $self->border, $w, $h); 973 $self->child->configure ($self->border, $self->border, $w, $h);
808} 974}
809 975
810sub button_down { 976sub button_down {
811 my ($self, $ev, $x, $y) = @_; 977 my ($self, $ev, $x, $y) = @_;
812 978
979 my ($w, $h) = @$self{qw(w h)};
813 my $border = $self->border; 980 my $border = $self->border;
814 981
815 if ($x < $self->{w} && $x >= $self->{w} - $border 982 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816 && $y < $self->{h} && $y >= $self->{h} - $border) { 983 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817 984
985 if ($lr & $td) {
986 my ($wx, $wy) = ($self->{x}, $self->{y});
818 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 987 my ($ox, $oy) = ($ev->{x}, $ev->{y});
819 my ($bw, $bh) = ($self->{w}, $self->{h}); 988 my ($bw, $bh) = ($self->{w}, $self->{h});
820 989
990 my $mx = $x < $border;
991 my $my = $y < $border;
992
821 $self->{motion} = sub { 993 $self->{motion} = sub {
822 my ($ev, $x, $y) = @_; 994 my ($ev, $x, $y) = @_;
823 995
824 ($x, $y) = ($ev->{x}, $ev->{y}); 996 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy;
825 998
826 $self->{user_w} = $bw + $x - $ox; 999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827 $self->{user_h} = $bh + $y - $oy; 1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
828 $self->check_size; 1002 $self->check_size;
829 }; 1003 };
830 1004
831 } elsif ($x >= 0 && $x < $self->{w} 1005 } elsif ($lr ^ $td) {
832 && $y >= 0 && $y < $border) {
833
834 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1006 my ($ox, $oy) = ($ev->{x}, $ev->{y});
835 my ($bx, $by) = ($self->{x}, $self->{y}); 1007 my ($bx, $by) = ($self->{x}, $self->{y});
836 1008
837 $self->{motion} = sub { 1009 $self->{motion} = sub {
838 my ($ev, $x, $y) = @_; 1010 my ($ev, $x, $y) = @_;
… …
861 my ($self) = @_; 1033 my ($self) = @_;
862 1034
863 my ($w, $h ) = ($self->{w}, $self->{h}); 1035 my ($w, $h ) = ($self->{w}, $self->{h});
864 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865 1037
866 glEnable GL_BLEND;
867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868 glEnable GL_TEXTURE_2D; 1038 glEnable GL_TEXTURE_2D;
869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870 1040
871 my $border = $self->border; 1041 my $border = $self->border;
872 1042
873 glColor @{ $self->{border_bg} }; 1043 glColor @{ $self->{border_bg} };
874 $tex[1]->draw_quad (0, 0, $w, $border); 1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
875 $tex[3]->draw_quad (0, $border, $border, $ch); 1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
878 1048
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
879 my $bg = $tex[0]; 1050 my $bg = $tex[0];
880 1051
881 # TODO: repeat texture not scale 1052 # TODO: repeat texture not scale
882 my $rep_x = $cw / $bg->{w}; 1053 my $rep_x = $cw / $bg->{w};
883 my $rep_y = $ch / $bg->{h}; 1054 my $rep_y = $ch / $bg->{h};
884 1055
885 glColor @{ $self->{bg} }; 1056 glColor @{ $self->{bg} };
886 1057
887 $bg->{s} = $rep_x; 1058 $bg->{s} = $rep_x;
888 $bg->{t} = $rep_y; 1059 $bg->{t} = $rep_y;
889 $bg->{wrap_mode} = 1; 1060 $bg->{wrap_mode} = 1;
890 $bg->draw_quad ($border, $border, $cw, $ch); 1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 }
891 1063
892 glDisable GL_TEXTURE_2D; 1064 glDisable GL_TEXTURE_2D;
893 glDisable GL_BLEND;
894 1065
895 $self->{title}->draw if $self->{title}; 1066 $self->{title}->draw if $self->{title};
1067
896 $self->child->draw; 1068 $self->child->draw;
897} 1069}
898 1070
899############################################################################# 1071#############################################################################
900 1072
… …
1124} 1296}
1125 1297
1126sub size_allocate { 1298sub size_allocate {
1127 my ($self, $w, $h) = @_; 1299 my ($self, $w, $h) = @_;
1128 1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1129 my $children = $self->{children}; 1303 my $children = $self->{children};
1130 1304
1131 my @h = map $_->{req_h}, @$children; 1305 my @h = map $_->{req_h}, @$children;
1132 1306
1133 my $req_h = List::Util::sum @h; 1307 my $req_h = List::Util::sum @h;
… …
1162 1336
1163############################################################################# 1337#############################################################################
1164 1338
1165package CFClient::UI::Label; 1339package CFClient::UI::Label;
1166 1340
1167our @ISA = CFClient::UI::Base::; 1341our @ISA = CFClient::UI::DrawBG::;
1168 1342
1169use CFClient::OpenGL; 1343use CFClient::OpenGL;
1170 1344
1171sub new { 1345sub new {
1172 my ($class, %arg) = @_; 1346 my ($class, %arg) = @_;
1173 1347
1174 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1175 fg => [1, 1, 1], 1349 fg => [1, 1, 1],
1350 #bg => none
1351 #active_bg => none
1176 #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),
1177 fontsize => 1, 1358 fontsize => 1,
1178 text => "",
1179 align => -1, 1359 align => -1,
1180 valign => -1, 1360 valign => -1,
1181 padding => 2, 1361 padding => 2,
1182 layout => new CFClient::Layout,
1183 can_events => 0, 1362 can_events => 0,
1184 %arg 1363 %arg
1185 ); 1364 );
1186 1365
1187 if (exists $self->{template}) { 1366 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout; 1367 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template}); 1368 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout; 1369 $self->{template} = $layout;
1191 } 1370 }
1192 1371
1193 $self->set_text (delete $self->{text}) if exists $self->{text}; 1372 if (exists $self->{markup}) {
1194 $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 }
1195 1377
1196 $self 1378 $self
1197} 1379}
1198 1380
1199sub escape { 1381sub escape($) {
1200 local $_ = $_[1]; 1382 local $_ = $_[0];
1201 1383
1202 s/&/&amp;/g; 1384 s/&/&amp;/g;
1203 s/>/&gt;/g; 1385 s/>/&gt;/g;
1204 s/</&lt;/g; 1386 s/</&lt;/g;
1205 1387
1206 $_[1] 1388 $_
1389}
1390
1391sub update {
1392 my ($self) = @_;
1393
1394 delete $self->{texture};
1395 $self->SUPER::update;
1207} 1396}
1208 1397
1209sub set_text { 1398sub set_text {
1210 my ($self, $text) = @_; 1399 my ($self, $text) = @_;
1211 1400
1401 return if $self->{text} eq "T$text";
1402 $self->{text} = "T$text";
1403
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212 $self->{layout}->set_text ($text); 1405 $self->{layout}->set_text ($text);
1213 1406
1214 delete $self->{texture}; 1407 $self->update;
1215 $self->check_size; 1408 $self->check_size;
1216 $self->update;
1217} 1409}
1218 1410
1219sub set_markup { 1411sub set_markup {
1220 my ($self, $markup) = @_; 1412 my ($self, $markup) = @_;
1221 1413
1414 return if $self->{text} eq "M$markup";
1415 $self->{text} = "M$markup";
1416
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222 $self->{layout}->set_markup ($markup); 1420 $self->{layout}->set_markup ($markup);
1223 1421
1224 delete $self->{texture}; 1422 $self->update;
1225 $self->check_size; 1423 $self->check_size;
1226 $self->update;
1227} 1424}
1228 1425
1229sub size_request { 1426sub size_request {
1230 my ($self) = @_; 1427 my ($self) = @_;
1231 1428
1232 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1429 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $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});
1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235 1434
1236 my ($w, $h) = $self->{layout}->size; 1435 my ($w, $h) = $self->{layout}->size;
1237 1436
1238 if (exists $self->{template}) { 1437 if (exists $self->{template}) {
… …
1260sub set_fontsize { 1459sub set_fontsize {
1261 my ($self, $fontsize) = @_; 1460 my ($self, $fontsize) = @_;
1262 1461
1263 $self->{fontsize} = $fontsize; 1462 $self->{fontsize} = $fontsize;
1264 delete $self->{texture}; 1463 delete $self->{texture};
1464
1465 $self->update;
1265 $self->check_size; 1466 $self->check_size;
1266 $self->update;
1267} 1467}
1268 1468
1269sub _draw { 1469sub _draw {
1270 my ($self) = @_; 1470 my ($self) = @_;
1271 1471
1472 $self->SUPER::_draw; # draw background, if applicable
1473
1272 my $tex = $self->{texture} ||= do { 1474 my $tex = $self->{texture} ||= do {
1475 $self->{layout}->set_foreground (@{$self->{fg}});
1273 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1476 $self->{layout}->set_font ($self->{font}) if $self->{font};
1274 $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});
1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481
1276 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
1277 }; 1493 };
1278 1494
1279 glEnable GL_BLEND;
1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281 glEnable GL_TEXTURE_2D; 1495 glEnable GL_TEXTURE_2D;
1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283 1497
1498 if ($tex->{format} == GL_ALPHA) {
1284 glColor @{$self->{fg}}; 1499 glColor @{$self->{fg}};
1285
1286 $self->{ox} = int (
1287 $self->{align} < 0 ? $self->{padding}
1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1291
1292 $self->{oy} = int (
1293 $self->{valign} < 0 ? $self->{padding}
1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1297
1298 $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 }
1299 1504
1300 glDisable GL_TEXTURE_2D; 1505 glDisable GL_TEXTURE_2D;
1301 glDisable GL_BLEND;
1302} 1506}
1303 1507
1304############################################################################# 1508#############################################################################
1305 1509
1306package CFClient::UI::EntryBase; 1510package CFClient::UI::EntryBase;
… …
1319 active_fg => [0, 0, 0], 1523 active_fg => [0, 0, 0],
1320 can_hover => 1, 1524 can_hover => 1,
1321 can_focus => 1, 1525 can_focus => 1,
1322 valign => 0, 1526 valign => 0,
1323 can_events => 1, 1527 can_events => 1,
1528 #text => ...
1324 @_ 1529 @_
1325 ) 1530 )
1326} 1531}
1327 1532
1328sub _set_text { 1533sub _set_text {
… …
1338 $self->{text} = $text; 1543 $self->{text} = $text;
1339 1544
1340 $text =~ s/./*/g if $self->{hidden}; 1545 $text =~ s/./*/g if $self->{hidden};
1341 $self->{layout}->set_text ("$text "); 1546 $self->{layout}->set_text ("$text ");
1342 1547
1343 $self->emit (changed => $self->{text}); 1548 $self->_emit (changed => $self->{text});
1344}
1345
1346sub get_text {
1347 $_[0]{text}
1348}
1349
1350sub size_request {
1351 my ($self) = @_;
1352
1353 my ($w, $h) = $self->SUPER::size_request;
1354
1355 ($w + 1, $h) # add 1 for cursor
1356}
1357
1358sub size_allocate {
1359 my ($self, $w, $h) = @_;
1360
1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1362} 1549}
1363 1550
1364sub set_text { 1551sub set_text {
1365 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1366 1553
1367 $self->{cursor} = length $text; 1554 $self->{cursor} = length $text;
1368 $self->_set_text ($text); 1555 $self->_set_text ($text);
1369 $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
1370} 1570}
1371 1571
1372sub key_down { 1572sub key_down {
1373 my ($self, $ev) = @_; 1573 my ($self, $ev) = @_;
1374 1574
… …
1376 my $sym = $ev->{sym}; 1576 my $sym = $ev->{sym};
1377 my $uni = $ev->{unicode}; 1577 my $uni = $ev->{unicode};
1378 1578
1379 my $text = $self->get_text; 1579 my $text = $self->get_text;
1380 1580
1381 if ($sym == 8) { 1581 if ($uni == 8) {
1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1582 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383 } elsif ($sym == 127) { 1583 } elsif ($uni == 127) {
1384 substr $text, $self->{cursor}, 1, ""; 1584 substr $text, $self->{cursor}, 1, "";
1385 } elsif ($sym == CFClient::SDLK_LEFT) { 1585 } elsif ($sym == CFClient::SDLK_LEFT) {
1386 --$self->{cursor} if $self->{cursor}; 1586 --$self->{cursor} if $self->{cursor};
1387 } elsif ($sym == CFClient::SDLK_RIGHT) { 1587 } elsif ($sym == CFClient::SDLK_RIGHT) {
1388 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1588 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1389 } elsif ($sym == CFClient::SDLK_HOME) { 1589 } elsif ($sym == CFClient::SDLK_HOME) {
1390 $self->{cursor} = 0; 1590 $self->{cursor} = 0;
1391 } elsif ($sym == CFClient::SDLK_END) { 1591 } elsif ($sym == CFClient::SDLK_END) {
1392 $self->{cursor} = length $text; 1592 $self->{cursor} = length $text;
1393 } elsif ($sym == 27) { 1593 } elsif ($uni == 27) {
1394 $self->emit ('escape'); 1594 $self->_emit ('escape');
1395 } elsif ($uni) { 1595 } elsif ($uni) {
1396 substr $text, $self->{cursor}++, 0, chr $uni; 1596 substr $text, $self->{cursor}++, 0, chr $uni;
1397 } 1597 }
1398 1598
1399 $self->_set_text ($text); 1599 $self->_set_text ($text);
1400 $self->update; 1600 $self->update;
1601 $self->check_size;
1401} 1602}
1402 1603
1403sub focus_in { 1604sub focus_in {
1404 my ($self) = @_; 1605 my ($self) = @_;
1405 1606
… …
1485 if ($sym == 13) { 1686 if ($sym == 13) {
1486 unshift @{$self->{history}}, 1687 unshift @{$self->{history}},
1487 my $txt = $self->get_text; 1688 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1; 1689 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = ''; 1690 $self->{history_saveback} = '';
1490 $self->emit (activate => $txt); 1691 $self->_emit (activate => $txt);
1491 $self->update; 1692 $self->update;
1492 1693
1493 } elsif ($sym == CFClient::SDLK_UP) { 1694 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) { 1695 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text; 1696 $self->{history_saveback} = $self->get_text;
… …
1534 my $class = shift; 1735 my $class = shift;
1535 1736
1536 $class->SUPER::new ( 1737 $class->SUPER::new (
1537 padding => 4, 1738 padding => 4,
1538 fg => [1, 1, 1], 1739 fg => [1, 1, 1],
1539 bg => [1, 1, 1, 0.2],
1540 active_fg => [0, 0, 1], 1740 active_fg => [0, 0, 1],
1541 can_hover => 1, 1741 can_hover => 1,
1542 align => 0, 1742 align => 0,
1543 valign => 0, 1743 valign => 0,
1544 can_events => 1, 1744 can_events => 1,
1545 @_ 1745 @_
1546 ) 1746 )
1547} 1747}
1548 1748
1749sub activate { }
1750
1549sub button_up { 1751sub button_up {
1550 my ($self, $ev, $x, $y) = @_; 1752 my ($self, $ev, $x, $y) = @_;
1551 1753
1754 $self->emit ("activate")
1552 if ($x >= 0 && $x < $self->{w} 1755 if $x >= 0 && $x < $self->{w}
1553 && $y >= 0 && $y < $self->{h}) { 1756 && $y >= 0 && $y < $self->{h};
1554 $self->emit ("activate");
1555 }
1556} 1757}
1557 1758
1558sub _draw { 1759sub _draw {
1559 my ($self) = @_; 1760 my ($self) = @_;
1560 1761
… …
1562 1763
1563 if ($GRAB == $self) { 1764 if ($GRAB == $self) {
1564 $self->{fg} = $self->{active_fg}; 1765 $self->{fg} = $self->{active_fg};
1565 } 1766 }
1566 1767
1567 glEnable GL_BLEND;
1568 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569 glEnable GL_TEXTURE_2D; 1768 glEnable GL_TEXTURE_2D;
1570 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571 glColor 0, 0, 0, 1; 1770 glColor 0, 0, 0, 1;
1572 1771
1573 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1772 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574 1773
1575 glDisable GL_TEXTURE_2D; 1774 glDisable GL_TEXTURE_2D;
1576 glDisable GL_BLEND;
1577 1775
1578 $self->SUPER::_draw; 1776 $self->SUPER::_draw;
1579} 1777}
1580 1778
1581############################################################################# 1779#############################################################################
… …
1595 1793
1596 $class->SUPER::new ( 1794 $class->SUPER::new (
1597 padding => 2, 1795 padding => 2,
1598 fg => [1, 1, 1], 1796 fg => [1, 1, 1],
1599 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],
1600 state => 0, 1800 state => 0,
1601 can_hover => 1, 1801 can_hover => 1,
1602 @_ 1802 @_
1603 ) 1803 )
1604} 1804}
… …
1613 my ($self, $ev, $x, $y) = @_; 1813 my ($self, $ev, $x, $y) = @_;
1614 1814
1615 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1616 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1617 $self->{state} = !$self->{state}; 1817 $self->{state} = !$self->{state};
1618 $self->emit (changed => $self->{state}); 1818 $self->_emit (changed => $self->{state});
1619 } 1819 }
1620} 1820}
1621 1821
1622sub _draw { 1822sub _draw {
1623 my ($self) = @_; 1823 my ($self) = @_;
… …
1628 1828
1629 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;
1630 1830
1631 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632 1832
1633 glEnable GL_BLEND; 1833 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834
1634 glEnable GL_TEXTURE_2D; 1835 glEnable GL_TEXTURE_2D;
1635 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637 my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639 $tex->draw_quad (0, 0, $s, $s); 1836 $tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641 glDisable GL_TEXTURE_2D; 1837 glDisable GL_TEXTURE_2D;
1642 glDisable GL_BLEND;
1643} 1838}
1644 1839
1645############################################################################# 1840#############################################################################
1646 1841
1647package CFClient::UI::Image; 1842package CFClient::UI::Image;
… …
1690 glTranslate 0, -$self->{w}, 0; 1885 glTranslate 0, -$self->{w}, 0;
1691 1886
1692 ($w, $h) = ($h, $w); 1887 ($w, $h) = ($h, $w);
1693 } 1888 }
1694 1889
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D; 1890 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1891 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699 1892
1700 $tex->draw_quad (0, 0, $w, $h); 1893 $tex->draw_quad_alpha (0, 0, $w, $h);
1701 1894
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D; 1895 glDisable GL_TEXTURE_2D;
1704} 1896}
1705 1897
1706############################################################################# 1898#############################################################################
1707 1899
… …
1755} 1947}
1756 1948
1757sub set_max { 1949sub set_max {
1758 my ($self, $max) = @_; 1950 my ($self, $max) = @_;
1759 1951
1952 return if $self->{max_val} == $max;
1953
1760 $self->{max_val} = $max; 1954 $self->{max_val} = $max;
1955 $self->update;
1761} 1956}
1762 1957
1763sub set_value { 1958sub set_value {
1764 my ($self, $val, $max) = @_; 1959 my ($self, $val, $max) = @_;
1765 1960
1766 $self->set_max ($max) 1961 $self->set_max ($max)
1767 if defined $max; 1962 if defined $max;
1768 1963
1769 $max = $self->{max_val}; 1964 return if $self->{val} == $val;
1965
1770 $self->{val} = $val; 1966 $self->{val} = $val;
1771
1772 $self->update; 1967 $self->update;
1773} 1968}
1774 1969
1775sub _draw { 1970sub _draw {
1776 my ($self) = @_; 1971 my ($self) = @_;
… …
1859 2054
1860 $self->{value}->set_fontsize ($fsize); 2055 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 2056 $self->{max} ->set_fontsize ($fsize);
1862} 2057}
1863 2058
2059sub set_max {
2060 my ($self, $max) = @_;
2061
2062 $self->{gauge}->set_max ($max);
2063 $self->{max}->set_text ($max);
2064}
2065
1864sub set_value { 2066sub set_value {
1865 my ($self, $val, $max) = @_; 2067 my ($self, $val, $max) = @_;
1866 2068
1867 $self->set_max ($max) 2069 $self->set_max ($max)
1868 if defined $max; 2070 if defined $max;
1869 2071
1870 $self->{gauge}->set_value ($val, $max); 2072 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 2073 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 2074}
1880 2075
1881############################################################################# 2076#############################################################################
1882 2077
1883package CFClient::UI::Slider; 2078package CFClient::UI::Slider;
… …
1893 qw(s1_slider.png s1_slider_bg.png); 2088 qw(s1_slider.png s1_slider_bg.png);
1894 2089
1895sub new { 2090sub new {
1896 my $class = shift; 2091 my $class = shift;
1897 2092
1898 # range [value, low, high, page] 2093 # range [value, low, high, page, unit]
1899 2094
1900 # TODO: 0-width page 2095 # TODO: 0-width page
1901 # TODO: req_w/h are wrong with vertical 2096 # TODO: req_w/h are wrong with vertical
1902 # TODO: calculations are off 2097 # TODO: calculations are off
1903 my $self = $class->SUPER::new ( 2098 my $self = $class->SUPER::new (
1904 fg => [1, 1, 1], 2099 fg => [1, 1, 1],
1905 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],
1906 range => [0, 0, 100, 10], 2103 range => [0, 0, 100, 10, 0],
1907 req_w => 20, 2104 req_w => $::WIDTH / 80,
1908 req_h => 20, 2105 req_h => $::WIDTH / 80,
1909 vertical => 0, 2106 vertical => 0,
1910 can_hover => 1, 2107 can_hover => 1,
1911 inner_pad => 5, 2108 inner_pad => 0.02,
1912 @_ 2109 @_
1913 ); 2110 );
1914 2111
2112 $self->set_value ($self->{range}[0]);
2113 $self->update;
2114
1915 $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 }
1916} 2147}
1917 2148
1918sub size_request { 2149sub size_request {
1919 my ($self) = @_; 2150 my ($self) = @_;
1920 2151
… …
1926 2157
1927sub button_down { 2158sub button_down {
1928 my ($self, $ev, $x, $y) = @_; 2159 my ($self, $ev, $x, $y) = @_;
1929 2160
1930 $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
1931 $self->mouse_motion ($ev, $x, $y); 2165 $self->mouse_motion ($ev, $x, $y);
1932} 2166}
1933 2167
1934sub mouse_motion { 2168sub mouse_motion {
1935 my ($self, $ev, $x, $y) = @_; 2169 my ($self, $ev, $x, $y) = @_;
1936 2170
1937 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
1938 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2188 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100;
1939 2190
1940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2191 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1941 2192
1942 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2193 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1943 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2194 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1944 2195
1945 $x -= $inner_pad_px; # substract the padding 2196 $value = ($value - $lo) / $range;
1946 $x = $x * ($hi - $lo) / $inner_w + $lo; 2197 $value = $value * $self->{scale} + $self->{offset};
1947 $x = $lo if $x < $lo;
1948 $x = $hi - $page if $x > $hi - $page;
1949 $self->{range}[0] = $x;
1950 2198
1951 $self->emit (changed => $x); 2199 $self->{knob_x} = $value - $knob_w * 0.5;
1952 $self->update; 2200 $self->{knob_w} = $knob_w;
1953 } 2201 });
1954}
1955 2202
1956# the inner_* stuff is for generating a padding for the slider handle, 2203 $self->SUPER::update;
1957# so that the handle doesn't leave the texture. This calculation isn't 100%
1958# correct propably, but it does the job for now
1959sub _calc_inner_pad_px {
1960 my ($self, $w) = @_;
1961 ($w / 100) * $self->{inner_pad} # % to pixels
1962} 2204}
1963 2205
1964sub _draw { 2206sub _draw {
1965 my ($self) = @_; 2207 my ($self) = @_;
1966 2208
1967 $self->SUPER::_draw (); 2209 $self->SUPER::_draw ();
1968 2210
1969 my ($w, $h) = @$self{qw(w h)}; 2211 glScale $self->{w}, $self->{h};
1970 2212
1971 if ($self->{vertical}) { 2213 if ($self->{vertical}) {
1972 # draw a vertical slider like a rotated horizontal slider 2214 # draw a vertical slider like a rotated horizontal slider
1973 2215
2216 glTranslate 1, 0, 0;
1974 glRotate 90, 0, 0, 1; 2217 glRotate 90, 0, 0, 1;
1975 glTranslate 0, -$self->{w}, 0;
1976
1977 ($w, $h) = ($h, $w);
1978 } 2218 }
1979 2219
1980 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2220 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2221 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982 2222
1983 my ($value, $lo, $hi, $page) = @{$self->{range}};
1984
1985 $hi = $value + 1 if $lo == $hi;
1986
1987 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1988 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1989
1990 $page = int $page * $inner_w / ($hi - $lo);
1991 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1992
1993 $w -= $page;
1994 $page &= ~1;
1995 glTranslate $page * 0.5, 0, 0;
1996 $page ||= 2;
1997
1998 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000
2001 glEnable GL_BLEND;
2002 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003 glEnable GL_TEXTURE_2D; 2223 glEnable GL_TEXTURE_2D;
2004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005 2225
2006 # draw background 2226 # draw background
2007 $tex[1]->draw_quad (0, 0, $w, $h); 2227 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008 2228
2009 # draw handle 2229 # draw handle
2010 $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);
2011 2231
2012 glDisable GL_BLEND;
2013 glDisable GL_TEXTURE_2D; 2232 glDisable GL_TEXTURE_2D;
2014} 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 (@_) }
2015 2275
2016############################################################################# 2276#############################################################################
2017 2277
2018package CFClient::UI::TextView; 2278package CFClient::UI::TextView;
2019 2279
… …
2028 fontsize => 1, 2288 fontsize => 1,
2029 can_events => 0, 2289 can_events => 0,
2030 #font => default_font 2290 #font => default_font
2031 @_, 2291 @_,
2032 2292
2033 layout => (new CFClient::Layout), 2293 layout => (new CFClient::Layout 1),
2034 par => [], 2294 par => [],
2035 height => 0, 2295 height => 0,
2036 children => [ 2296 children => [
2037 (new CFClient::UI::Empty expand => 1), 2297 (new CFClient::UI::Empty expand => 1),
2038 (new CFClient::UI::Slider vertical => 1), 2298 (new CFClient::UI::Slider vertical => 1),
2039 ], 2299 ],
2040 ); 2300 );
2041 2301
2042 $self->{children}[1]->connect (changed => sub { 2302 $self->{children}[1]->connect (changed => sub { $self->update });
2043 $self->update;
2044 });
2045 2303
2046 $self 2304 $self
2047} 2305}
2048 2306
2049sub set_fontsize { 2307sub set_fontsize {
2050 my ($self, $fontsize) = @_; 2308 my ($self, $fontsize) = @_;
2051 2309
2052 $self->{fontsize} = $fontsize; 2310 $self->{fontsize} = $fontsize;
2053 $self->reflow; 2311 $self->reflow;
2054}
2055
2056sub text_height {
2057 my ($self, $text) = @_;
2058
2059 my $layout = $self->{layout};
2060
2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062 $layout->set_width ($self->{w});
2063 $layout->set_text ($text);
2064
2065 ($layout->size)[1]
2066}
2067
2068sub reflow {
2069 my ($self) = @_;
2070
2071 $self->{need_reflow}++;
2072 $self->update;
2073} 2312}
2074 2313
2075sub size_allocate { 2314sub size_allocate {
2076 my ($self, $w, $h) = @_; 2315 my ($self, $w, $h) = @_;
2077 2316
… …
2082 $self->{layout}->set_width ($self->{children}[0]{w}); 2321 $self->{layout}->set_width ($self->{children}[0]{w});
2083 2322
2084 $self->reflow; 2323 $self->reflow;
2085} 2324}
2086 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
2087sub add_paragraph { 2360sub add_paragraph {
2088 my ($self, $color, $text) = @_; 2361 my ($self, $color, $text, $indent) = @_;
2089 2362
2090 #TODO: intelligently "reformat" paragraph 2363 for my $line (split /\n/, $text) {
2091 2364 my ($w, $h) = $self->text_size ($line);
2092 my $height = $self->text_height ($text);
2093
2094 $self->{height} += $height; 2365 $self->{height} += $h;
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2367 }
2095 2368
2096 push @{$self->{par}}, [$height, $color, $text];
2097
2098 $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]);
2099 $self->{children}[1]->update;
2100} 2370}
2101 2371
2102sub update { 2372sub update {
2103 my ($self) = @_; 2373 my ($self) = @_;
2104 2374
… …
2106 2376
2107 return unless $self->{h} > 0; 2377 return unless $self->{h} > 0;
2108 2378
2109 delete $self->{texture}; 2379 delete $self->{texture};
2110 2380
2111 $ROOT->on_refresh ($self, sub { 2381 $ROOT->on_post_alloc ($self, sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383
2112 if (delete $self->{need_reflow}) { 2384 if (delete $self->{need_reflow}) {
2113 my $height = 0; 2385 my $height = 0;
2114 2386
2115 $height += $_->[0] = $self->text_height ($_->[2]) 2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2116 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 }
2117 2402
2118 $self->{height} = $height; 2403 $self->{height} = $height;
2119 2404
2120 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2121 2406
2122 delete $self->{texture}; 2407 delete $self->{texture};
2123 } 2408 }
2124 2409
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2126 glClearColor 0, 0, 0, 1; 2411 glClearColor 0.5, 0.5, 0.5, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2412 glClear GL_COLOR_BUFFER_BIT;
2128 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
2129 glEnable GL_BLEND; 2425 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D;
2132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133
2134 my $top = int $self->{children}[1]{range}[0];
2135
2136 my $y0 = $top;
2137 my $y1 = $top + $self->{h};
2138
2139 my $y = 0;
2140
2141 my $layout = $self->{layout};
2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144 2428
2145 for my $par (@{$self->{par}}) { 2429 for my $par (@{$self->{par}}) {
2146 my $h = $par->[0]; 2430 my $h = $par->[1];
2147 2431
2148 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]);
2149 $layout->set_text ($par->[2]); 2435 $layout->set_markup ($par->[4]);
2150 2436
2151 glColor @{ $par->[1] }; 2437 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2152 my ($W, $H) = $layout->size; 2438
2153 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;
2154 } 2441 }
2155 2442
2156 $y += $h; 2443 $y += $h;
2157 } 2444 }
2158 2445
2159 glDisable GL_TEXTURE_2D;
2160 glDisable GL_BLEND; 2446 glDisable GL_BLEND;
2161 }; 2447 };
2162 }); 2448 });
2163} 2449}
2164 2450
2165sub _draw { 2451sub _draw {
2166 my ($self) = @_; 2452 my ($self) = @_;
2167 2453
2168 if ($self->{texture}) {
2169 glEnable GL_TEXTURE_2D; 2454 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2456 glColor 1, 1, 1, 1;
2172 $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});
2173 glDisable GL_TEXTURE_2D; 2458 glDisable GL_TEXTURE_2D;
2174 }
2175 2459
2176 $self->{children}[1]->draw; 2460 $self->{children}[1]->draw;
2177 2461
2178} 2462}
2179 2463
… …
2247 2531
2248 # TODO: use animation 2532 # TODO: use animation
2249 if ($self->{state} = !$self->{state}) { 2533 if ($self->{state} = !$self->{state}) {
2250 $CFClient::UI::ROOT->add ($self->{other}); 2534 $CFClient::UI::ROOT->add ($self->{other});
2251 $self->{other}->move ($self->coord2global (0, $self->{h})); 2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2252 $self->emit ("open"); 2536 $self->_emit ("open");
2253 } else { 2537 } else {
2254 $CFClient::UI::ROOT->remove ($self->{other}); 2538 $CFClient::UI::ROOT->remove ($self->{other});
2255 $self->emit ("close"); 2539 $self->_emit ("close");
2256 } 2540 }
2257 2541
2258 $self->emit (changed => $self->{state}); 2542 $self->_emit (changed => $self->{state});
2259} 2543}
2260 2544
2261############################################################################# 2545#############################################################################
2262 2546
2263package CFClient::UI::Tooltip; 2547package CFClient::UI::Tooltip;
… …
2273 @_, 2557 @_,
2274 can_events => 0, 2558 can_events => 0,
2275 ) 2559 )
2276} 2560}
2277 2561
2278sub set_markup { 2562sub set_tooltip_from {
2279 my ($self, $text) = @_; 2563 my ($self, $widget) = @_;
2280 2564
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2565 $self->add (new CFClient::UI::Label
2282 $self->{label}->set_markup ($text); 2566 markup => $widget->{tooltip},
2283 $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 );
2284} 2573}
2285 2574
2286sub size_request { 2575sub size_request {
2287 my ($self) = @_; 2576 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290 2577
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2578 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292 2579
2293 ($w + 4, $h + 4) 2580 ($w + 4, $h + 4)
2294} 2581}
… …
2300} 2587}
2301 2588
2302sub _draw { 2589sub _draw {
2303 my ($self) = @_; 2590 my ($self) = @_;
2304 2591
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375; 2592 glTranslate 0.375, 0.375;
2307 2593
2308 my ($w, $h) = @$self{qw(w h)}; 2594 my ($w, $h) = @$self{qw(w h)};
2309 2595
2310 glColor 1, 0.8, 0.4; 2596 glColor 1, 0.8, 0.4;
… …
2321 glVertex 0 , $h; 2607 glVertex 0 , $h;
2322 glVertex $w, $h; 2608 glVertex $w, $h;
2323 glVertex $w, 0; 2609 glVertex $w, 0;
2324 glEnd; 2610 glEnd;
2325 2611
2326 glPopMatrix; 2612 glTranslate 2 - 0.375, 2 - 0.375;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw; 2613 $self->SUPER::_draw;
2330} 2614}
2331 2615
2332############################################################################# 2616#############################################################################
2333 2617
… …
2338use CFClient::OpenGL; 2622use CFClient::OpenGL;
2339 2623
2340sub new { 2624sub new {
2341 my $class = shift; 2625 my $class = shift;
2342 2626
2343 $class->SUPER::new ( 2627 my $self = $class->SUPER::new (
2344 aspect => 1, 2628 aspect => 1,
2345 @_, 2629 @_,
2346 ) 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
2347} 2647}
2348 2648
2349sub size_request { 2649sub size_request {
2350 (32, 8) 2650 (32, 8)
2351} 2651}
2352 2652
2653sub update {
2654 my ($self) = @_;
2655
2656 return unless $self->{visible};
2657
2658 $self->SUPER::update;
2659}
2660
2353sub draw { 2661sub _draw {
2354 my ($self) = @_; 2662 my ($self) = @_;
2355 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
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2357 2676
2358 if ($tex) { 2677 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D; 2678 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1; 2680 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D; 2682 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 } 2683 }
2684}
2685
2686sub DESTROY {
2687 my ($self) = @_;
2688
2689 $self->{timer}->cancel
2690 if $self->{timer};
2691
2692 $self->SUPER::DESTROY;
2368} 2693}
2369 2694
2370############################################################################# 2695#############################################################################
2371 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 return unless $text;
2999
3000 my $timeout = time + ((delete $arg{timeout}) || 60);
3001
3002 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3003
3004 if (my $item = $self->{item}{$group}) {
3005 if ($item->{text} eq $text) {
3006 $item->{count}++;
3007 } else {
3008 $item->{count} = 1;
3009 $item->{text} = $item->{tooltip} = $text;
3010 }
3011 $item->{id} = ++$self->{id};
3012 $item->{timeout} = $timeout;
3013 delete $item->{label};
3014 } else {
3015 $self->{item}{$group} = {
3016 id => ++$self->{id},
3017 text => $text,
3018 timeout => $timeout,
3019 tooltip => $text,
3020 fg => [0.8, 0.8, 0.8, 0.8],
3021 pri => 0,
3022 count => 1,
3023 %arg,
3024 };
3025 }
3026
3027 $self->reorder;
3028}
3029
3030sub reconfigure {
3031 my ($self) = @_;
3032
3033 delete $_->{label}
3034 for values %{ $self->{item} || {} };
3035
3036 $self->reorder;
3037 $self->SUPER::reconfigure;
3038}
3039
3040#############################################################################
3041
2372package CFClient::UI::Root; 3042package CFClient::UI::Root;
2373 3043
2374our @ISA = CFClient::UI::Container::; 3044our @ISA = CFClient::UI::Container::;
2375 3045
2376use CFClient::OpenGL; 3046use CFClient::OpenGL;
2377 3047
2378sub check_size { 3048sub new {
2379 my ($self) = @_; 3049 my $class = shift;
2380 3050
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3051 $class->SUPER::new (
2382} 3052 @_,
2383 3053 )
2384sub size_request {
2385 ($::WIDTH, $::HEIGHT)
2386} 3054}
2387 3055
2388sub configure { 3056sub configure {
2389 my ($self, $x, $y, $w, $h) = @_; 3057 my ($self, $x, $y, $w, $h) = @_;
2390 3058
2391 $self->SUPER::configure ($x, $y, $w, $h); 3059 $self->{w} = $w;
3060 $self->{h} = $h;
3061}
2392 3062
3063sub check_size {
3064 my ($self) = @_;
3065
3066 $self->size_allocate ($self->{w}, $self->{h})
3067 if $self->{w};
3068}
3069
3070sub size_request {
3071 my ($self) = @_;
3072
3073 ($self->{w}, $self->{h})
3074}
3075
3076sub size_allocate {
3077 my ($self, $w, $h) = @_;
3078
2393 for my $child (@{$self->{children}}) { 3079 for my $child ($self->children) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3080 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395 3081
3082 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3083 if exists $child->{req_x};
3084
3085 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3086 if exists $child->{req_y};
3087
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3088 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3089 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3090
2398 $child->configure ($X, $Y, $W,$H); 3091 $child->configure ($X, $Y, $W, $H);
2399 } 3092 }
2400} 3093}
2401 3094
2402sub _topleft { 3095sub coord2local {
2403 my ($self, $x, $y) = @_; 3096 my ($self, $x, $y) = @_;
2404 3097
2405 ($x, $y) 3098 ($x, $y)
2406} 3099}
2407 3100
3101sub coord2global {
3102 my ($self, $x, $y) = @_;
3103
3104 ($x, $y)
3105}
3106
2408sub update { 3107sub update {
2409 my ($self) = @_; 3108 my ($self) = @_;
2410 3109
2411 $self->check_size; 3110 $self->check_size;
2412 ::refresh (); 3111 $::WANT_REFRESH++;
2413} 3112}
2414 3113
2415sub add { 3114sub add {
2416 my ($self, $child) = @_; 3115 my ($self, @children) = @_;
2417 3116
3117 for (my @widgets = @children; my $w = pop @widgets; ) {
3118 push @widgets, $w->children;
3119 $w->{root} = $self;
3120 $w->{visible} = 1;
3121 }
3122
3123 for my $child (@children) {
3124 $child->{is_toplevel} = 1;
3125
2418 # integerize window positions 3126 # integerise window positions
2419 $child->{x} = int $child->{x}; 3127 $child->{x} = int $child->{x};
2420 $child->{y} = int $child->{y}; 3128 $child->{y} = int $child->{y};
3129 }
2421 3130
2422 $self->SUPER::add ($child); 3131 $self->SUPER::add (@children);
3132}
3133
3134sub remove {
3135 my ($self, @children) = @_;
3136
3137 $self->SUPER::remove (@children);
3138
3139 while (@children) {
3140 my $w = pop @children;
3141 push @children, $w->children;
3142 $w->set_invisible;
3143 }
2423} 3144}
2424 3145
2425sub on_refresh { 3146sub on_refresh {
2426 my ($self, $id, $cb) = @_; 3147 my ($self, $id, $cb) = @_;
2427 3148
2428 $self->{refresh_hook}{$id} = $cb; 3149 $self->{refresh_hook}{$id} = $cb;
2429} 3150}
2430 3151
3152sub on_post_alloc {
3153 my ($self, $id, $cb) = @_;
3154
3155 $self->{post_alloc_hook}{$id} = $cb;
3156}
3157
2431sub draw { 3158sub draw {
2432 my ($self) = @_; 3159 my ($self) = @_;
2433 3160
2434 while (my $rcb = delete $self->{refresh_hook}) { 3161 while ($self->{refresh_hook}) {
2435 $_->() for values %$rcb; 3162 $_->()
3163 for values %{delete $self->{refresh_hook}};
3164 }
3165
3166 if ($self->{check_size}) {
3167 my @queue = ([], []);
3168
3169 for (;;) {
3170 if ($self->{check_size}) {
3171 # heuristic: check containers last
3172 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3173 for values %{delete $self->{check_size}}
3174 }
3175
3176 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3177
3178 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3179 ? @$widget{qw(user_w user_h)}
3180 : $widget->size_request;
3181
3182 if (delete $widget->{force_alloc}
3183 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3184 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3185
3186 $widget->{req_w} = $w;
3187 $widget->{req_h} = $h;
3188
3189 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3190
3191 $widget->{parent}->check_size
3192 if $widget->{parent};
3193 }
3194 }
3195 }
3196
3197 while ($self->{size_alloc}) {
3198 for (values %{delete $self->{size_alloc}}) {
3199 my ($widget, $w, $h) = @$_;
3200
3201 $w = 0 if $w < 0;
3202 $h = 0 if $h < 0;
3203
3204 $widget->{w} = $w;
3205 $widget->{h} = $h;
3206 $widget->emit (size_allocate => $w, $h);
3207 }
3208 }
3209
3210 while ($self->{post_alloc_hook}) {
3211 $_->()
3212 for values %{delete $self->{post_alloc_hook}};
2436 } 3213 }
2437 3214
2438 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3215 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3216 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440 glClear GL_COLOR_BUFFER_BIT; 3217 glClear GL_COLOR_BUFFER_BIT;
2441 3218
2442 glMatrixMode GL_PROJECTION; 3219 glMatrixMode GL_PROJECTION;
2443 glLoadIdentity; 3220 glLoadIdentity;
2444 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3221 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2445 glMatrixMode GL_MODELVIEW; 3222 glMatrixMode GL_MODELVIEW;
2446 glLoadIdentity; 3223 glLoadIdentity;
2447 3224
2448 $self->_draw; 3225 $self->_draw;
2449} 3226}
… …
2451############################################################################# 3228#############################################################################
2452 3229
2453package CFClient::UI; 3230package CFClient::UI;
2454 3231
2455$ROOT = new CFClient::UI::Root; 3232$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip; 3233$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457 3234
24581 32351
2459 3236

Diff Legend

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