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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.237 by root, Thu May 25 21:36:45 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
314sub children {
315}
316
241sub set_max_size { 317sub set_max_size {
242 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
243 319
244 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
246} 322}
247 323
248# return top left coordinates 324sub set_tooltip {
249sub _topleft {
250 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
251 326
252 $self->{parent} 327 $tooltip =~ s/^\s+//;
253 or Carp::confess "no parent widget in _topleft\n";#d# 328 $tooltip =~ s/\s+$//;
254 329
255 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 330 return if $self->{tooltip} eq $tooltip;
331
332 $self->{tooltip} = $tooltip;
333
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip;
337 }
256} 338}
257 339
258# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
259sub coord2local { 341sub coord2local {
260 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
261 343
262 my ($X, $Y) = $self->_topleft; 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
263 ($x - $X, $y - $Y)
264} 345}
265 346
266# translate local coordinates to global coordinate system 347# translate local coordinates to global coordinate system
267sub coord2global { 348sub coord2global {
268 my ($self, $x, $y) = @_; 349 my ($self, $x, $y) = @_;
269 350
270 my ($X, $Y) = $self->_topleft; 351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
271 ($x + $X, $y + $Y)
272} 352}
273 353
274sub focus_in { 354sub focus_in {
275 my ($self) = @_; 355 my ($self) = @_;
276 356
277 return if $FOCUS == $self; 357 return if $FOCUS == $self;
278 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
279 359
280 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
281 361
282 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
283 363
284 $focus->update if $focus; 364 $focus->update if $focus;
285 $FOCUS->update; 365 $FOCUS->update;
286} 366}
287 367
… …
290 370
291 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
292 372
293 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
294 374
295 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
296 376
297 $focus->update if $focus; #? 377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS;
298} 381}
299 382
300sub mouse_motion { } 383sub mouse_motion { }
301sub button_up { } 384sub button_up { }
302sub key_down { } 385sub key_down { }
303sub key_up { } 386sub key_up { }
304 387
305sub button_down { 388sub button_down {
306 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
307 390
308 $self->focus_in; 391 $self->focus_in;
… …
342 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
343 glPushMatrix; 426 glPushMatrix;
344 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
345 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
346 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
347 glVertex 0 , 0; 430 glVertex 0 , 0;
348 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
349 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
350 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
351 glEnd; 434 glEnd;
352 glPopMatrix; 435 glPopMatrix;
353 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
354 } 437 }
355} 438}
356 439
357sub _draw { 440sub _draw {
358 my ($self) = @_; 441 my ($self) = @_;
… …
374 457
375sub set_parent { 458sub set_parent {
376 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
377 460
378 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
379} 471}
380 472
381sub check_size { 473sub check_size {
382 my ($self) = @_; 474 my ($self, $forced) = @_;
383 475
384 $self->{parent} 476 $self->{force_alloc} = 1 if $forced;
385 or return 1; 477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
386
387 my ($w, $h) = $self->{user_w} && $self->{user_h}
388 ? @$self{qw(user_w user_h)}
389 : $self->size_request;
390
391 if ($w != $self->{req_w} || $h != $self->{req_h}) {
392 $self->{req_w} = $w;
393 $self->{req_h} = $h;
394
395 $self->{parent}->check_size
396 or $self->size_allocate (
397 (List::Util::max $self->{w}, $w),
398 (List::Util::max $self->{h}, $h),
399 );
400
401 1
402 } else {
403 0
404 }
405} 478}
406 479
407sub update { 480sub update {
408 my ($self) = @_; 481 my ($self) = @_;
409 482
… …
415 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
416 489
417 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
418} 491}
419 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
420sub emit { 499sub emit {
421 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
422 501
423 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
424} 504}
425 505
426sub DESTROY { 506sub DESTROY {
427 my ($self) = @_; 507 my ($self) = @_;
428 508
509 delete $WIDGET{$self+0};
429 #$self->deactivate; 510 #$self->deactivate;
430} 511}
431 512
432############################################################################# 513#############################################################################
433 514
… …
442 my $class = shift; 523 my $class = shift;
443 524
444 # range [value, low, high, page] 525 # range [value, low, high, page]
445 526
446 $class->SUPER::new ( 527 $class->SUPER::new (
447 bg => [0, 0, 0, 0.2], 528 #bg => [0, 0, 0, 0.2],
448 active_bg => [1, 1, 1, 0.5], 529 #active_bg => [1, 1, 1, 0.5],
449 @_ 530 @_
450 ) 531 )
451} 532}
452 533
453sub _draw { 534sub _draw {
454 my ($self) = @_; 535 my ($self) = @_;
455 536
537 my $color = $FOCUS == $self && $self->{active_bg}
538 ? $self->{active_bg}
539 : $self->{bg};
540
541 if ($color && (@$color < 4 || $color->[3])) {
456 my ($w, $h) = @$self{qw(w h)}; 542 my ($w, $h) = @$self{qw(w h)};
457 543
458 glEnable GL_BLEND; 544 glEnable GL_BLEND;
459 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
460 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 546 glColor @$color;
461 547
462 glBegin GL_QUADS; 548 glBegin GL_QUADS;
463 glVertex 0 , 0; 549 glVertex 0 , 0;
464 glVertex 0 , $h; 550 glVertex 0 , $h;
465 glVertex $w, $h; 551 glVertex $w, $h;
466 glVertex $w, 0; 552 glVertex $w, 0;
467 glEnd; 553 glEnd;
468 554
469 glDisable GL_BLEND; 555 glDisable GL_BLEND;
556 }
470} 557}
471 558
472############################################################################# 559#############################################################################
473 560
474package CFClient::UI::Empty; 561package CFClient::UI::Empty;
… …
506 593
507 $self 594 $self
508} 595}
509 596
510sub add { 597sub add {
511 my ($self, $child) = @_; 598 my ($self, @widgets) = @_;
512 599
513 $child->set_parent ($self); 600 $_->set_parent ($self)
601 for @widgets;
514 602
515 use sort 'stable'; 603 use sort 'stable';
516 604
517 $self->{children} = [ 605 $self->{children} = [
518 sort { $a->{z} <=> $b->{z} } 606 sort { $a->{z} <=> $b->{z} }
519 @{$self->{children}}, $child 607 @{$self->{children}}, @widgets
520 ]; 608 ];
521 609
522 $child->check_size; 610 $self->check_size (1);
611 $self->update;
612}
613
614sub children {
615 @{ $_[0]{children} }
523} 616}
524 617
525sub remove { 618sub remove {
526 my ($self, $child) = @_; 619 my ($self, $child) = @_;
527 620
528 delete $child->{parent}; 621 delete $child->{parent};
529 $child->hide; 622 $child->hide;
530 623
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 625
533 $self->check_size; 626 $self->check_size (1);
534 $self->update; 627 $self->update;
535} 628}
536 629
537sub clear { 630sub clear {
538 my ($self) = @_; 631 my ($self) = @_;
… …
542 635
543 for (@$children) { 636 for (@$children) {
544 delete $_->{parent}; 637 delete $_->{parent};
545 $_->hide; 638 $_->hide;
546 } 639 }
640
641 $self->check_size;
642 $self->update;
547} 643}
548 644
549sub find_widget { 645sub find_widget {
550 my ($self, $x, $y) = @_; 646 my ($self, $x, $y) = @_;
551 647
… …
626} 722}
627 723
628sub update { 724sub update {
629 my ($self) = @_; 725 my ($self) = @_;
630 726
631 # we want to do this delayed... 727 $ROOT->on_post_alloc ($self => sub { $self->render_child });
632 $self->render_chld;
633 $self->SUPER::update; 728 $self->SUPER::update;
634}
635
636sub render_chld {
637 my ($self) = @_;
638
639 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
640 glClearColor 0, 0, 0, 1;
641 glClear GL_COLOR_BUFFER_BIT;
642 $self->child->draw;
643 };
644} 729}
645 730
646sub size_allocate { 731sub size_allocate {
647 my ($self, $w, $h) = @_; 732 my ($self, $w, $h) = @_;
648 733
649 $self->child->configure (0, 0, $w, $h); 734 $self->SUPER::size_allocate ($w, $h);
735 $self->update;
736}
650 737
738sub _render {
739 $_[0]{children}[0]->draw;
740}
741
742sub render_child {
743 my ($self) = @_;
744
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT;
748
651 $self->render_chld; 749 $self->_render;
750 };
652} 751}
653 752
654sub _draw { 753sub _draw {
655 my ($self) = @_; 754 my ($self) = @_;
656 755
657 my ($w, $h) = ($self->w, $self->h); 756 my ($w, $h) = ($self->w, $self->h);
658 757
659 my $tex = $self->{texture} 758 my $tex = $self->{texture}
660 or return; 759 or return;
661 760
662 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 761 glEnable GL_TEXTURE_2D;
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1;
666 764
667 $tex->draw_quad (0, 0, $w, $h); 765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
668 766
669 glDisable GL_BLEND;
670 glDisable GL_TEXTURE_2D; 767 glDisable GL_TEXTURE_2D;
671} 768}
672 769
673############################################################################# 770#############################################################################
674 771
675package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
676 773
677our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
678
679sub new { die }
680
681sub size_request {
682 my ($self) = @_;
683
684 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
685 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
686
687 @$self{qw(child_w child_h)}
688}
689
690sub _draw {
691 my ($self) = @_;
692
693 $self->{children}[1]->draw;
694}
695
696
697#############################################################################
698
699package CFClient::UI::Frame;
700
701our @ISA = CFClient::UI::Bin::;
702
703use CFClient::OpenGL;
704 775
705sub new { 776sub new {
706 my $class = shift; 777 my $class = shift;
707 778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
786sub size_request {
787 my ($self) = @_;
788
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
790
791 @$self{qw(child_w child_h)}
792}
793
794sub size_allocate {
795 my ($self, $w, $h) = @_;
796
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
800 $self->child->configure (0, 0, $w, $h);
801 $self->update;
802}
803
804sub set_offset {
805 my ($self, $x, $y) = @_;
806
807 $self->{view_x} = int $x;
808 $self->{view_y} = int $y;
809
810 $self->update;
811}
812
813# hmm, this does not work for topleft of $self... but we should not ask for that
814sub coord2local {
815 my ($self, $x, $y) = @_;
816
817 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
818}
819
820sub coord2global {
821 my ($self, $x, $y) = @_;
822
823 $x = List::Util::min $self->{w}, $x - $self->{view_x};
824 $y = List::Util::min $self->{h}, $y - $self->{view_y};
825
826 $self->SUPER::coord2global ($x, $y)
827}
828
829sub find_widget {
830 my ($self, $x, $y) = @_;
831
832 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
833 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
834 ) {
835 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
836 } else {
837 $self->CFClient::UI::Base::find_widget ($x, $y)
838 }
839}
840
841sub _render {
842 my ($self) = @_;
843
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845
846 $self->SUPER::_render;
847}
848
849#############################################################################
850
851package CFClient::UI::ScrolledWindow;
852
853our @ISA = CFClient::UI::HBox::;
854
855sub new {
856 my $class = shift;
857
858 my $self;
859
860 my $slider = new CFClient::UI::Slider
861 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]);
865 },
866 ;
867
708 my $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
709 bg => [1, 1, 1, 1], 869 vp => (new CFClient::UI::ViewPort expand => 1),
710 border_bg => [1, 1, 1, 1], 870 slider => $slider,
711 border => 0.8,
712 @_ 871 @_,
713 ); 872 );
714 873
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider});
877
715 $self 878 $self
716} 879}
717 880
881sub size_allocate {
882 my ($self, $w, $h) = @_;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 my $child = $self->{vp}->child;
887 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
888}
889
890#TODO# update range on size_allocate depending on child
891# update viewport offset on scroll
892
893#############################################################################
894
895package CFClient::UI::Frame;
896
897our @ISA = CFClient::UI::Bin::;
898
899use CFClient::OpenGL;
900
901sub new {
902 my $class = shift;
903
904 $class->SUPER::new (
905 bg => undef,
906 @_,
907 )
908}
909
718sub _draw { 910sub _draw {
719 my ($self) = @_; 911 my ($self) = @_;
720 912
721 my ($w, $h) = ($self->{w}, $self->{h}); 913 if ($self->{bg}) {
914 my ($w, $h) = @$self{qw(w h)};
722 915
723 glEnable GL_BLEND; 916 glEnable GL_BLEND;
724 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
725 glEnable GL_TEXTURE_2D; 918 glColor @{ $self->{bg} };
726 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
727 919
728# glBegin GL_QUADS; 920 glBegin GL_QUADS;
729# glColor 0, 0, 0, 0;
730# glVertex 0 , 0; 921 glVertex 0 , 0;
731# glVertex 0 , $h; 922 glVertex 0 , $h;
732# glVertex $w, $h; 923 glVertex $w, $h;
733# glVertex $w, 0; 924 glVertex $w, 0;
734# glEnd; 925 glEnd;
735 926
736
737 $self->child->draw;
738 glDisable GL_BLEND; 927 glDisable GL_BLEND;
739 glDisable GL_TEXTURE_2D; 928 }
929
930 $self->SUPER::_draw;
740} 931}
741 932
742############################################################################# 933#############################################################################
743 934
744package CFClient::UI::FancyFrame; 935package CFClient::UI::FancyFrame;
… …
755 my $class = shift; 946 my $class = shift;
756 947
757 # TODO: user_x, user_y, overwrite moveto? 948 # TODO: user_x, user_y, overwrite moveto?
758 949
759 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
760 bg => [1, 1, 1, 1], 951 bg => [1, 1, 1, 1],
761 border_bg => [1, 1, 1, 1], 952 border_bg => [1, 1, 1, 1],
762 border => 0.8, 953 border => 0.6,
954 is_toplevel => 1,
763 can_events => 1, 955 can_events => 1,
764 @_ 956 @_
765 ); 957 );
766 958
767 $self->{title} &&= new CFClient::UI::Label 959 $self->{title} &&= new CFClient::UI::Label
768 align => 0, 960 align => 0,
769 valign => 1, 961 valign => 1,
770 text => $self->{title}, 962 text => $self->{title},
771 fontsize => 1; 963 fontsize => $self->{border};
772 964
773 $self 965 $self
774} 966}
775 967
776sub border { 968sub border {
… …
792 my ($self, $w, $h) = @_; 984 my ($self, $w, $h) = @_;
793 985
794 $h -= List::Util::max 0, $self->border * 2; 986 $h -= List::Util::max 0, $self->border * 2;
795 $w -= List::Util::max 0, $self->border * 2; 987 $w -= List::Util::max 0, $self->border * 2;
796 988
797 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 989 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
798 if $self->{title}; 990 if $self->{title};
799 991
800 $self->child->configure ($self->border, $self->border, $w, $h); 992 $self->child->configure ($self->border, $self->border, $w, $h);
801} 993}
802 994
803sub button_down { 995sub button_down {
804 my ($self, $ev, $x, $y) = @_; 996 my ($self, $ev, $x, $y) = @_;
805 997
998 my ($w, $h) = @$self{qw(w h)};
806 my $border = $self->border; 999 my $border = $self->border;
807 1000
808 if ($x < $self->{w} && $x >= $self->{w} - $border 1001 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
809 && $y < $self->{h} && $y >= $self->{h} - $border) { 1002 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
810 1003
1004 if ($lr & $td) {
1005 my ($wx, $wy) = ($self->{x}, $self->{y});
811 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1006 my ($ox, $oy) = ($ev->{x}, $ev->{y});
812 my ($bw, $bh) = ($self->{w}, $self->{h}); 1007 my ($bw, $bh) = ($self->{w}, $self->{h});
813 1008
1009 my $mx = $x < $border;
1010 my $my = $y < $border;
1011
814 $self->{motion} = sub { 1012 $self->{motion} = sub {
815 my ($ev, $x, $y) = @_; 1013 my ($ev, $x, $y) = @_;
816 1014
817 ($x, $y) = ($ev->{x}, $ev->{y}); 1015 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy;
818 1017
819 $self->{user_w} = $bw + $x - $ox; 1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
820 $self->{user_h} = $bh + $y - $oy; 1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
821 $self->check_size; 1021 $self->check_size;
822 }; 1022 };
823 1023
824 } elsif ($x >= 0 && $x < $self->{w} 1024 } elsif ($lr ^ $td) {
825 && $y >= 0 && $y < $border) {
826
827 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1025 my ($ox, $oy) = ($ev->{x}, $ev->{y});
828 my ($bx, $by) = ($self->{x}, $self->{y}); 1026 my ($bx, $by) = ($self->{x}, $self->{y});
829 1027
830 $self->{motion} = sub { 1028 $self->{motion} = sub {
831 my ($ev, $x, $y) = @_; 1029 my ($ev, $x, $y) = @_;
… …
854 my ($self) = @_; 1052 my ($self) = @_;
855 1053
856 my ($w, $h ) = ($self->{w}, $self->{h}); 1054 my ($w, $h ) = ($self->{w}, $self->{h});
857 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
858 1056
859 glEnable GL_BLEND;
860 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
861 glEnable GL_TEXTURE_2D; 1057 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
863 1059
864 my $border = $self->border; 1060 my $border = $self->border;
865 1061
866 glColor @{ $self->{border_bg} }; 1062 glColor @{ $self->{border_bg} };
867 $tex[1]->draw_quad (0, 0, $w, $border); 1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
868 $tex[3]->draw_quad (0, $border, $border, $ch); 1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
869 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
870 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
871 1067
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
872 my $bg = $tex[0]; 1069 my $bg = $tex[0];
873 1070
874 # TODO: repeat texture not scale 1071 # TODO: repeat texture not scale
875 my $rep_x = $cw / $bg->{w}; 1072 my $rep_x = $cw / $bg->{w};
876 my $rep_y = $ch / $bg->{h}; 1073 my $rep_y = $ch / $bg->{h};
877 1074
878 glColor @{ $self->{bg} }; 1075 glColor @{ $self->{bg} };
879 1076
880 $bg->{s} = $rep_x; 1077 $bg->{s} = $rep_x;
881 $bg->{t} = $rep_y; 1078 $bg->{t} = $rep_y;
882 $bg->{wrap_mode} = 1; 1079 $bg->{wrap_mode} = 1;
883 $bg->draw_quad ($border, $border, $cw, $ch); 1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 }
884 1082
885 glDisable GL_TEXTURE_2D; 1083 glDisable GL_TEXTURE_2D;
886 glDisable GL_BLEND;
887 1084
888 $self->{title}->draw if $self->{title}; 1085 $self->{title}->draw if $self->{title};
1086
889 $self->child->draw; 1087 $self->child->draw;
890} 1088}
891 1089
892############################################################################# 1090#############################################################################
893 1091
… …
902sub new { 1100sub new {
903 my $class = shift; 1101 my $class = shift;
904 1102
905 $class->SUPER::new ( 1103 $class->SUPER::new (
906 col_expand => [], 1104 col_expand => [],
907 @_ 1105 @_,
908 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
909} 1111}
910 1112
911sub add { 1113sub add {
912 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
913 1115
914 $child->set_parent ($self); 1116 $child->set_parent ($self);
915 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
916 1118
917 $child->check_size; 1119 $self->check_size (1);
918} 1120}
919 1121
920# TODO: move to container class maybe? send childs a signal on removal? 1122# TODO: move to container class maybe? send children a signal on removal?
921sub clear { 1123sub clear {
922 my ($self) = @_; 1124 my ($self) = @_;
923 1125
924 my $children = delete $self->{children}; 1126 my @children = $self->children;
1127 delete $self->{children};
925 1128
926 for (grep $_, map @$_, grep $_, @$children) { 1129 for (@children) {
927 delete $_->{parent}; 1130 delete $_->{parent};
928 $_->hide; 1131 $_->hide;
929 } 1132 }
930 1133
1134 $self->check_size (1);
931 $self->update; 1135 $self->update;
932} 1136}
933 1137
934sub get_wh { 1138sub get_wh {
935 my ($self) = @_; 1139 my ($self) = @_;
… …
1112} 1316}
1113 1317
1114sub size_allocate { 1318sub size_allocate {
1115 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1116 1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1117 my $children = $self->{children}; 1323 my $children = $self->{children};
1118 1324
1119 my @h = map $_->{req_h}, @$children; 1325 my @h = map $_->{req_h}, @$children;
1120 1326
1121 my $req_h = List::Util::sum @h; 1327 my $req_h = List::Util::sum @h;
… …
1150 1356
1151############################################################################# 1357#############################################################################
1152 1358
1153package CFClient::UI::Label; 1359package CFClient::UI::Label;
1154 1360
1155our @ISA = CFClient::UI::Base::; 1361our @ISA = CFClient::UI::DrawBG::;
1156 1362
1157use CFClient::OpenGL; 1363use CFClient::OpenGL;
1158 1364
1159sub new { 1365sub new {
1160 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1161 1367
1162 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1163 fg => [1, 1, 1], 1369 fg => [1, 1, 1],
1370 #bg => none
1371 #active_bg => none
1164 #font => default_font 1372 #font => default_font
1373 #text => initial text
1374 #markup => initial narkup
1375 #max_w => maximum pixel width
1376 ellipsise => 3, # end
1377 layout => (new CFClient::Layout),
1165 fontsize => 1, 1378 fontsize => 1,
1166 text => "",
1167 align => -1, 1379 align => -1,
1168 valign => -1, 1380 valign => -1,
1169 padding => 2, 1381 padding => 2,
1170 layout => new CFClient::Layout,
1171 can_events => 0, 1382 can_events => 0,
1172 %arg 1383 %arg
1173 ); 1384 );
1174 1385
1175 if (exists $self->{template}) { 1386 if (exists $self->{template}) {
1176 my $layout = new CFClient::Layout; 1387 my $layout = new CFClient::Layout;
1177 $layout->set_text (delete $self->{template}); 1388 $layout->set_text (delete $self->{template});
1178 $self->{template} = $layout; 1389 $self->{template} = $layout;
1179 } 1390 }
1180 1391
1181 $self->set_text (delete $self->{text}) if exists $self->{text}; 1392 if (exists $self->{markup}) {
1182 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1393 $self->set_markup (delete $self->{markup});
1394 } else {
1395 $self->set_text (delete $self->{text});
1396 }
1183 1397
1184 $self 1398 $self
1185} 1399}
1186 1400
1187sub escape { 1401sub escape($) {
1188 local $_ = $_[1]; 1402 local $_ = $_[0];
1189 1403
1190 s/&/&amp;/g; 1404 s/&/&amp;/g;
1191 s/>/&gt;/g; 1405 s/>/&gt;/g;
1192 s/</&lt;/g; 1406 s/</&lt;/g;
1193 1407
1194 $_[1] 1408 $_
1409}
1410
1411sub update {
1412 my ($self) = @_;
1413
1414 delete $self->{texture};
1415 $self->SUPER::update;
1195} 1416}
1196 1417
1197sub set_text { 1418sub set_text {
1198 my ($self, $text) = @_; 1419 my ($self, $text) = @_;
1199 1420
1421 return if $self->{text} eq "T$text";
1422 $self->{text} = "T$text";
1423
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1200 $self->{layout}->set_text ($text); 1425 $self->{layout}->set_text ($text);
1201 1426
1202 delete $self->{texture}; 1427 $self->update;
1203 $self->check_size; 1428 $self->check_size;
1204 $self->update;
1205} 1429}
1206 1430
1207sub set_markup { 1431sub set_markup {
1208 my ($self, $markup) = @_; 1432 my ($self, $markup) = @_;
1209 1433
1434 return if $self->{text} eq "M$markup";
1435 $self->{text} = "M$markup";
1436
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1210 $self->{layout}->set_markup ($markup); 1440 $self->{layout}->set_markup ($markup);
1211 1441
1212 delete $self->{texture}; 1442 $self->update;
1213 $self->check_size; 1443 $self->check_size;
1214 $self->update;
1215} 1444}
1216 1445
1217sub size_request { 1446sub size_request {
1218 my ($self) = @_; 1447 my ($self) = @_;
1219 1448
1220 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1449 $self->{layout}->set_font ($self->{font}) if $self->{font};
1221 $self->{layout}->set_width ($self->{max_w} || -1); 1450 $self->{layout}->set_width ($self->{max_w} || -1);
1451 $self->{layout}->set_ellipsise ($self->{ellipsise});
1452 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1222 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1223 1454
1224 my ($w, $h) = $self->{layout}->size; 1455 my ($w, $h) = $self->{layout}->size;
1225 1456
1226 if (exists $self->{template}) { 1457 if (exists $self->{template}) {
… …
1248sub set_fontsize { 1479sub set_fontsize {
1249 my ($self, $fontsize) = @_; 1480 my ($self, $fontsize) = @_;
1250 1481
1251 $self->{fontsize} = $fontsize; 1482 $self->{fontsize} = $fontsize;
1252 delete $self->{texture}; 1483 delete $self->{texture};
1484
1485 $self->update;
1253 $self->check_size; 1486 $self->check_size;
1254 $self->update;
1255} 1487}
1256 1488
1257sub _draw { 1489sub _draw {
1258 my ($self) = @_; 1490 my ($self) = @_;
1259 1491
1492 $self->SUPER::_draw; # draw background, if applicable
1493
1260 my $tex = $self->{texture} ||= do { 1494 my $tex = $self->{texture} ||= do {
1495 $self->{layout}->set_foreground (@{$self->{fg}});
1261 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1496 $self->{layout}->set_font ($self->{font}) if $self->{font};
1262 $self->{layout}->set_width ($self->{w}); 1497 $self->{layout}->set_width ($self->{w});
1498 $self->{layout}->set_ellipsise ($self->{ellipsise});
1499 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1263 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501
1264 new_from_layout CFClient::Texture $self->{layout} 1502 my $tex = new_from_layout CFClient::Texture $self->{layout};
1503
1504 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1505 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1506 : ($self->{w} - $tex->{w}) * 0.5);
1507
1508 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1509 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1510 : ($self->{h} - $tex->{h}) * 0.5);
1511
1512 $tex
1265 }; 1513 };
1266 1514
1267 glEnable GL_BLEND;
1268 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1269 glEnable GL_TEXTURE_2D; 1515 glEnable GL_TEXTURE_2D;
1270 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1271 1517
1518 if ($tex->{format} == GL_ALPHA) {
1272 glColor @{$self->{fg}}; 1519 glColor @{$self->{fg}};
1273
1274 $self->{ox} = int (
1275 $self->{align} < 0 ? $self->{padding}
1276 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1277 : ($self->{w} - $tex->{w}) * 0.5
1278 );
1279
1280 $self->{oy} = int (
1281 $self->{valign} < 0 ? $self->{padding}
1282 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1283 : ($self->{h} - $tex->{h}) * 0.5
1284 );
1285
1286 $tex->draw_quad ($self->{ox}, $self->{oy}); 1520 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1521 } else {
1522 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1523 }
1287 1524
1288 glDisable GL_TEXTURE_2D; 1525 glDisable GL_TEXTURE_2D;
1289 glDisable GL_BLEND;
1290} 1526}
1291 1527
1292############################################################################# 1528#############################################################################
1293 1529
1294package CFClient::UI::EntryBase; 1530package CFClient::UI::EntryBase;
… …
1307 active_fg => [0, 0, 0], 1543 active_fg => [0, 0, 0],
1308 can_hover => 1, 1544 can_hover => 1,
1309 can_focus => 1, 1545 can_focus => 1,
1310 valign => 0, 1546 valign => 0,
1311 can_events => 1, 1547 can_events => 1,
1548 #text => ...
1312 @_ 1549 @_
1313 ) 1550 )
1314} 1551}
1315 1552
1316sub _set_text { 1553sub _set_text {
… …
1326 $self->{text} = $text; 1563 $self->{text} = $text;
1327 1564
1328 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1329 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1330 1567
1331 $self->emit (changed => $self->{text}); 1568 $self->_emit (changed => $self->{text});
1332}
1333
1334sub get_text {
1335 $_[0]{text}
1336}
1337
1338sub size_request {
1339 my ($self) = @_;
1340
1341 my ($w, $h) = $self->SUPER::size_request;
1342
1343 ($w + 1, $h) # add 1 for cursor
1344}
1345
1346sub size_allocate {
1347 my ($self, $w, $h) = @_;
1348
1349 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1350} 1569}
1351 1570
1352sub set_text { 1571sub set_text {
1353 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1354 1573
1355 $self->{cursor} = length $text; 1574 $self->{cursor} = length $text;
1356 $self->_set_text ($text); 1575 $self->_set_text ($text);
1357 $self->update; 1576 $self->update;
1577 $self->check_size;
1578}
1579
1580sub get_text {
1581 $_[0]{text}
1582}
1583
1584sub size_request {
1585 my ($self) = @_;
1586
1587 my ($w, $h) = $self->SUPER::size_request;
1588
1589 ($w + 1, $h) # add 1 for cursor
1358} 1590}
1359 1591
1360sub key_down { 1592sub key_down {
1361 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1362 1594
… …
1364 my $sym = $ev->{sym}; 1596 my $sym = $ev->{sym};
1365 my $uni = $ev->{unicode}; 1597 my $uni = $ev->{unicode};
1366 1598
1367 my $text = $self->get_text; 1599 my $text = $self->get_text;
1368 1600
1369 if ($sym == 8) { 1601 if ($uni == 8) {
1370 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1602 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1371 } elsif ($sym == 127) { 1603 } elsif ($uni == 127) {
1372 substr $text, $self->{cursor}, 1, ""; 1604 substr $text, $self->{cursor}, 1, "";
1373 } elsif ($sym == CFClient::SDLK_LEFT) { 1605 } elsif ($sym == CFClient::SDLK_LEFT) {
1374 --$self->{cursor} if $self->{cursor}; 1606 --$self->{cursor} if $self->{cursor};
1375 } elsif ($sym == CFClient::SDLK_RIGHT) { 1607 } elsif ($sym == CFClient::SDLK_RIGHT) {
1376 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1608 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1377 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1378 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1379 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1380 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1381 } elsif ($sym == 27) { 1613 } elsif ($uni == 27) {
1382 $self->emit ('escape'); 1614 $self->_emit ('escape');
1383 } elsif ($uni) { 1615 } elsif ($uni) {
1384 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1385 } 1617 }
1386 1618
1387 $self->_set_text ($text); 1619 $self->_set_text ($text);
1388 $self->update; 1620 $self->update;
1621 $self->check_size;
1389} 1622}
1390 1623
1391sub focus_in { 1624sub focus_in {
1392 my ($self) = @_; 1625 my ($self) = @_;
1393 1626
… …
1473 if ($sym == 13) { 1706 if ($sym == 13) {
1474 unshift @{$self->{history}}, 1707 unshift @{$self->{history}},
1475 my $txt = $self->get_text; 1708 my $txt = $self->get_text;
1476 $self->{history_pointer} = -1; 1709 $self->{history_pointer} = -1;
1477 $self->{history_saveback} = ''; 1710 $self->{history_saveback} = '';
1478 $self->emit (activate => $txt); 1711 $self->_emit (activate => $txt);
1479 $self->update; 1712 $self->update;
1480 1713
1481 } elsif ($sym == CFClient::SDLK_UP) { 1714 } elsif ($sym == CFClient::SDLK_UP) {
1482 if ($self->{history_pointer} < 0) { 1715 if ($self->{history_pointer} < 0) {
1483 $self->{history_saveback} = $self->get_text; 1716 $self->{history_saveback} = $self->get_text;
… …
1522 my $class = shift; 1755 my $class = shift;
1523 1756
1524 $class->SUPER::new ( 1757 $class->SUPER::new (
1525 padding => 4, 1758 padding => 4,
1526 fg => [1, 1, 1], 1759 fg => [1, 1, 1],
1527 bg => [1, 1, 1, 0.2],
1528 active_fg => [0, 0, 1], 1760 active_fg => [0, 0, 1],
1529 can_hover => 1, 1761 can_hover => 1,
1530 align => 0, 1762 align => 0,
1531 valign => 0, 1763 valign => 0,
1532 can_events => 1, 1764 can_events => 1,
1533 @_ 1765 @_
1534 ) 1766 )
1535} 1767}
1536 1768
1769sub activate { }
1770
1537sub button_up { 1771sub button_up {
1538 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1539 1773
1774 $self->emit ("activate")
1540 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1541 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1542 $self->emit ("activate");
1543 }
1544} 1777}
1545 1778
1546sub _draw { 1779sub _draw {
1547 my ($self) = @_; 1780 my ($self) = @_;
1548 1781
… …
1550 1783
1551 if ($GRAB == $self) { 1784 if ($GRAB == $self) {
1552 $self->{fg} = $self->{active_fg}; 1785 $self->{fg} = $self->{active_fg};
1553 } 1786 }
1554 1787
1555 glEnable GL_BLEND;
1556 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1557 glEnable GL_TEXTURE_2D; 1788 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 glColor 0, 0, 0, 1; 1790 glColor 0, 0, 0, 1;
1560 1791
1561 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1792 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1562 1793
1563 glDisable GL_TEXTURE_2D; 1794 glDisable GL_TEXTURE_2D;
1564 glDisable GL_BLEND;
1565 1795
1566 $self->SUPER::_draw; 1796 $self->SUPER::_draw;
1567} 1797}
1568 1798
1569############################################################################# 1799#############################################################################
… …
1583 1813
1584 $class->SUPER::new ( 1814 $class->SUPER::new (
1585 padding => 2, 1815 padding => 2,
1586 fg => [1, 1, 1], 1816 fg => [1, 1, 1],
1587 active_fg => [1, 1, 0], 1817 active_fg => [1, 1, 0],
1818 bg => [0, 0, 0, 0.2],
1819 active_bg => [1, 1, 1, 0.5],
1588 state => 0, 1820 state => 0,
1589 can_hover => 1, 1821 can_hover => 1,
1590 @_ 1822 @_
1591 ) 1823 )
1592} 1824}
… …
1601 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1602 1834
1603 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1604 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1605 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1606 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1607 } 1839 }
1608} 1840}
1609 1841
1610sub _draw { 1842sub _draw {
1611 my ($self) = @_; 1843 my ($self) = @_;
… …
1616 1848
1617 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1849 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1618 1850
1619 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1620 1852
1621 glEnable GL_BLEND; 1853 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854
1622 glEnable GL_TEXTURE_2D; 1855 glEnable GL_TEXTURE_2D;
1623 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1624
1625 my $tex = $self->{state} ? $tex[1] : $tex[0];
1626
1627 $tex->draw_quad (0, 0, $s, $s); 1856 $tex->draw_quad_alpha (0, 0, $s, $s);
1628
1629 glDisable GL_TEXTURE_2D; 1857 glDisable GL_TEXTURE_2D;
1630 glDisable GL_BLEND;
1631} 1858}
1632 1859
1633############################################################################# 1860#############################################################################
1634 1861
1635package CFClient::UI::Image; 1862package CFClient::UI::Image;
… …
1678 glTranslate 0, -$self->{w}, 0; 1905 glTranslate 0, -$self->{w}, 0;
1679 1906
1680 ($w, $h) = ($h, $w); 1907 ($w, $h) = ($h, $w);
1681 } 1908 }
1682 1909
1683 glEnable GL_BLEND;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1686 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1911 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1687 1912
1688 $tex->draw_quad (0, 0, $w, $h); 1913 $tex->draw_quad_alpha (0, 0, $w, $h);
1689 1914
1690 glDisable GL_BLEND;
1691 glDisable GL_TEXTURE_2D; 1915 glDisable GL_TEXTURE_2D;
1692} 1916}
1693 1917
1694############################################################################# 1918#############################################################################
1695 1919
… …
1743} 1967}
1744 1968
1745sub set_max { 1969sub set_max {
1746 my ($self, $max) = @_; 1970 my ($self, $max) = @_;
1747 1971
1972 return if $self->{max_val} == $max;
1973
1748 $self->{max_val} = $max; 1974 $self->{max_val} = $max;
1975 $self->update;
1749} 1976}
1750 1977
1751sub set_value { 1978sub set_value {
1752 my ($self, $val, $max) = @_; 1979 my ($self, $val, $max) = @_;
1753 1980
1754 $self->set_max ($max) 1981 $self->set_max ($max)
1755 if defined $max; 1982 if defined $max;
1756 1983
1757 $max = $self->{max_val}; 1984 return if $self->{val} == $val;
1985
1758 $self->{val} = $val; 1986 $self->{val} = $val;
1759
1760 $self->update; 1987 $self->update;
1761} 1988}
1762 1989
1763sub _draw { 1990sub _draw {
1764 my ($self) = @_; 1991 my ($self) = @_;
… …
1847 2074
1848 $self->{value}->set_fontsize ($fsize); 2075 $self->{value}->set_fontsize ($fsize);
1849 $self->{max} ->set_fontsize ($fsize); 2076 $self->{max} ->set_fontsize ($fsize);
1850} 2077}
1851 2078
2079sub set_max {
2080 my ($self, $max) = @_;
2081
2082 $self->{gauge}->set_max ($max);
2083 $self->{max}->set_text ($max);
2084}
2085
1852sub set_value { 2086sub set_value {
1853 my ($self, $val, $max) = @_; 2087 my ($self, $val, $max) = @_;
1854 2088
1855 $self->set_max ($max) 2089 $self->set_max ($max)
1856 if defined $max; 2090 if defined $max;
1857 2091
1858 $self->{gauge}->set_value ($val, $max); 2092 $self->{gauge}->set_value ($val, $max);
1859 $self->{value}->set_text ($val); 2093 $self->{value}->set_text ($val);
1860}
1861
1862sub set_max {
1863 my ($self, $max) = @_;
1864
1865 $self->{gauge}->set_max ($max);
1866 $self->{max}->set_text ($max);
1867} 2094}
1868 2095
1869############################################################################# 2096#############################################################################
1870 2097
1871package CFClient::UI::Slider; 2098package CFClient::UI::Slider;
… …
1881 qw(s1_slider.png s1_slider_bg.png); 2108 qw(s1_slider.png s1_slider_bg.png);
1882 2109
1883sub new { 2110sub new {
1884 my $class = shift; 2111 my $class = shift;
1885 2112
1886 # range [value, low, high, page] 2113 # range [value, low, high, page, unit]
1887 2114
1888 # TODO: 0-width page 2115 # TODO: 0-width page
1889 # TODO: req_w/h are wrong with vertical 2116 # TODO: req_w/h are wrong with vertical
1890 # TODO: calculations are off 2117 # TODO: calculations are off
1891 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
1892 fg => [1, 1, 1], 2119 fg => [1, 1, 1],
1893 active_fg => [0, 0, 0], 2120 active_fg => [0, 0, 0],
2121 bg => [0, 0, 0, 0.2],
2122 active_bg => [1, 1, 1, 0.5],
1894 range => [0, 0, 100, 10], 2123 range => [0, 0, 100, 10, 0],
1895 req_w => 20, 2124 req_w => $::WIDTH / 80,
1896 req_h => 20, 2125 req_h => $::WIDTH / 80,
1897 vertical => 0, 2126 vertical => 0,
1898 can_hover => 1, 2127 can_hover => 1,
1899 inner_pad => 5, 2128 inner_pad => 0.02,
1900 @_ 2129 @_
1901 ); 2130 );
1902 2131
2132 $self->set_value ($self->{range}[0]);
2133 $self->update;
2134
1903 $self 2135 $self
2136}
2137
2138sub set_range {
2139 my ($self, $range) = @_;
2140
2141 $self->{range} = $range;
2142
2143 $self->update;
2144}
2145
2146sub set_value {
2147 my ($self, $value) = @_;
2148
2149 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2150
2151 $hi = $lo + 1 if $hi <= $lo;
2152
2153 $page = $hi - $lo if $page > $hi - $lo;
2154
2155 $value = $lo if $value < $lo;
2156 $value = $hi - $page if $value > $hi - $page;
2157
2158 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2159 if $unit;
2160
2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2162
2163 if ($value != $old_value) {
2164 $self->_emit (changed => $value);
2165 $self->update;
2166 }
1904} 2167}
1905 2168
1906sub size_request { 2169sub size_request {
1907 my ($self) = @_; 2170 my ($self) = @_;
1908 2171
… …
1914 2177
1915sub button_down { 2178sub button_down {
1916 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
1917 2180
1918 $self->SUPER::button_down ($ev, $x, $y); 2181 $self->SUPER::button_down ($ev, $x, $y);
2182
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184
1919 $self->mouse_motion ($ev, $x, $y); 2185 $self->mouse_motion ($ev, $x, $y);
1920} 2186}
1921 2187
1922sub mouse_motion { 2188sub mouse_motion {
1923 my ($self, $ev, $x, $y) = @_; 2189 my ($self, $ev, $x, $y) = @_;
1924 2190
1925 if ($GRAB == $self) { 2191 if ($GRAB == $self) {
2192 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2193
2194 my (undef, $lo, $hi, $page) = @{$self->{range}};
2195
2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197
2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2199 }
2200}
2201
2202sub update {
2203 my ($self) = @_;
2204
2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2206 $self->set_value ($self->{range}[0]);
2207
1926 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2208 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100;
1927 2210
1928 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2211 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1929 2212
1930 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2213 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1931 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2214 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1932 2215
1933 $x -= $inner_pad_px; # substract the padding 2216 $value = ($value - $lo) / $range;
1934 $x = $x * ($hi - $lo) / $inner_w + $lo; 2217 $value = $value * $self->{scale} + $self->{offset};
1935 $x = $lo if $x < $lo;
1936 $x = $hi - $page if $x > $hi - $page;
1937 $self->{range}[0] = $x;
1938 2218
1939 $self->emit (changed => $x); 2219 $self->{knob_x} = $value - $knob_w * 0.5;
1940 $self->update; 2220 $self->{knob_w} = $knob_w;
1941 } 2221 });
1942}
1943 2222
1944# the inner_* stuff is for generating a padding for the slider handle, 2223 $self->SUPER::update;
1945# so that the handle doesn't leave the texture. This calculation isn't 100%
1946# correct propably, but it does the job for now
1947sub _calc_inner_pad_px {
1948 my ($self, $w) = @_;
1949 ($w / 100) * $self->{inner_pad} # % to pixels
1950} 2224}
1951 2225
1952sub _draw { 2226sub _draw {
1953 my ($self) = @_; 2227 my ($self) = @_;
1954 2228
1955 $self->SUPER::_draw (); 2229 $self->SUPER::_draw ();
1956 2230
1957 my ($w, $h) = @$self{qw(w h)}; 2231 glScale $self->{w}, $self->{h};
1958 2232
1959 if ($self->{vertical}) { 2233 if ($self->{vertical}) {
1960 # draw a vertical slider like a rotated horizontal slider 2234 # draw a vertical slider like a rotated horizontal slider
1961 2235
2236 glTranslate 1, 0, 0;
1962 glRotate 90, 0, 0, 1; 2237 glRotate 90, 0, 0, 1;
1963 glTranslate 0, -$self->{w}, 0;
1964
1965 ($w, $h) = ($h, $w);
1966 } 2238 }
1967 2239
1968 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2240 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1969 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2241 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1970 2242
1971 my ($value, $lo, $hi, $page) = @{$self->{range}};
1972
1973 $hi = $value + 1 if $lo == $hi;
1974
1975 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1976 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1977
1978 $page = int $page * $inner_w / ($hi - $lo);
1979 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1980
1981 $w -= $page;
1982 $page &= ~1;
1983 glTranslate $page * 0.5, 0, 0;
1984 $page ||= 2;
1985
1986 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1987 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1988
1989 glEnable GL_BLEND;
1990 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1991 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
1992 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1993 2245
1994 # draw background 2246 # draw background
1995 $tex[1]->draw_quad (0, 0, $w, $h); 2247 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1996 2248
1997 # draw handle 2249 # draw handle
1998 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2250 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1999 2251
2000 glDisable GL_BLEND;
2001 glDisable GL_TEXTURE_2D; 2252 glDisable GL_TEXTURE_2D;
2002} 2253}
2254
2255#############################################################################
2256
2257package CFClient::UI::ValSlider;
2258
2259our @ISA = CFClient::UI::HBox::;
2260
2261sub new {
2262 my ($class, %arg) = @_;
2263
2264 my $range = delete $arg{range};
2265
2266 my $self = $class->SUPER::new (
2267 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2268 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2269 to_value => sub { shift },
2270 from_value => sub { shift },
2271 %arg,
2272 );
2273
2274 $self->{slider}->connect (changed => sub {
2275 my ($self, $value) = @_;
2276 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2277 $self->{parent}->emit (changed => $value);
2278 });
2279
2280# $self->{entry}->connect (changed => sub {
2281# my ($self, $value) = @_;
2282# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2283# $self->{parent}->emit (changed => $value);
2284# });
2285
2286 $self->add ($self->{slider}, $self->{entry});
2287
2288 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2289
2290 $self
2291}
2292
2293sub set_range { shift->{slider}->set_range (@_) }
2294sub set_value { shift->{slider}->set_value (@_) }
2003 2295
2004############################################################################# 2296#############################################################################
2005 2297
2006package CFClient::UI::TextView; 2298package CFClient::UI::TextView;
2007 2299
… …
2016 fontsize => 1, 2308 fontsize => 1,
2017 can_events => 0, 2309 can_events => 0,
2018 #font => default_font 2310 #font => default_font
2019 @_, 2311 @_,
2020 2312
2021 layout => (new CFClient::Layout), 2313 layout => (new CFClient::Layout 1),
2022 par => [], 2314 par => [],
2023 height => 0, 2315 height => 0,
2024 children => [ 2316 children => [
2025 (new CFClient::UI::Empty expand => 1), 2317 (new CFClient::UI::Empty expand => 1),
2026 (new CFClient::UI::Slider vertical => 1), 2318 (new CFClient::UI::Slider vertical => 1),
2027 ], 2319 ],
2028 ); 2320 );
2029 2321
2030 $self->{children}[1]->connect (changed => sub { 2322 $self->{children}[1]->connect (changed => sub { $self->update });
2031 $self->update;
2032 });
2033 2323
2034 $self 2324 $self
2035} 2325}
2036 2326
2037sub set_fontsize { 2327sub set_fontsize {
2038 my ($self, $fontsize) = @_; 2328 my ($self, $fontsize) = @_;
2039 2329
2040 $self->{fontsize} = $fontsize; 2330 $self->{fontsize} = $fontsize;
2041 $self->reflow; 2331 $self->reflow;
2042}
2043
2044sub text_height {
2045 my ($self, $text) = @_;
2046
2047 my $layout = $self->{layout};
2048
2049 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2050 $layout->set_width ($self->{w});
2051 $layout->set_text ($text);
2052
2053 ($layout->size)[1]
2054}
2055
2056sub reflow {
2057 my ($self) = @_;
2058
2059 $self->{need_reflow}++;
2060 $self->update;
2061} 2332}
2062 2333
2063sub size_allocate { 2334sub size_allocate {
2064 my ($self, $w, $h) = @_; 2335 my ($self, $w, $h) = @_;
2065 2336
… …
2070 $self->{layout}->set_width ($self->{children}[0]{w}); 2341 $self->{layout}->set_width ($self->{children}[0]{w});
2071 2342
2072 $self->reflow; 2343 $self->reflow;
2073} 2344}
2074 2345
2346sub text_size {
2347 my ($self, $text, $indent) = @_;
2348
2349 my $layout = $self->{layout};
2350
2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $layout->set_width ($self->{children}[0]{w} - $indent);
2353 $layout->set_markup ($text);
2354
2355 $layout->size
2356}
2357
2358sub reflow {
2359 my ($self) = @_;
2360
2361 $self->{need_reflow}++;
2362 $self->update;
2363}
2364
2365sub set_offset {
2366 my ($self, $offset) = @_;
2367
2368 # todo: base offset on lines or so, not on pixels
2369 $self->{children}[1]->set_value ($offset);
2370}
2371
2372sub clear {
2373 my ($self) = @_;
2374
2375 $self->{par} = [];
2376 $self->{height} = 0;
2377 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2378}
2379
2075sub add_paragraph { 2380sub add_paragraph {
2076 my ($self, $color, $text) = @_; 2381 my ($self, $color, $text, $indent) = @_;
2077 2382
2078 #TODO: intelligently "reformat" paragraph 2383 for my $line (split /\n/, $text) {
2079 2384 my ($w, $h) = $self->text_size ($line);
2080 my $height = $self->text_height ($text);
2081
2082 $self->{height} += $height; 2385 $self->{height} += $h;
2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2387 }
2083 2388
2084 push @{$self->{par}}, [$height, $color, $text];
2085
2086 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2389 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2087 $self->{children}[1]->update;
2088} 2390}
2089 2391
2090sub update { 2392sub update {
2091 my ($self) = @_; 2393 my ($self) = @_;
2092 2394
… …
2094 2396
2095 return unless $self->{h} > 0; 2397 return unless $self->{h} > 0;
2096 2398
2097 delete $self->{texture}; 2399 delete $self->{texture};
2098 2400
2099 $ROOT->on_refresh ($self, sub { 2401 $ROOT->on_post_alloc ($self, sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403
2100 if (delete $self->{need_reflow}) { 2404 if (delete $self->{need_reflow}) {
2101 my $height = 0; 2405 my $height = 0;
2102 2406
2103 $height += $_->[0] = $self->text_height ($_->[2]) 2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
2104 for @{$self->{par}}; 2411 for (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2413 $layout->set_width ($W - $_->[3]);
2414 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3];
2417 $_->[1] = $h;
2418 }
2419
2420 $height += $_->[1];
2421 }
2105 2422
2106 $self->{height} = $height; 2423 $self->{height} = $height;
2107 2424
2108 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2109 2426
2110 delete $self->{texture}; 2427 delete $self->{texture};
2111 } 2428 }
2112 2429
2113 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2114 glClearColor 0, 0, 0, 1; 2431 glClearColor 0.5, 0.5, 0.5, 0;
2115 glClear GL_COLOR_BUFFER_BIT; 2432 glClear GL_COLOR_BUFFER_BIT;
2116 2433
2434 my $top = int $self->{children}[1]{range}[0];
2435
2436 my $y0 = $top;
2437 my $y1 = $top + $H;
2438
2439 my $y = 0;
2440
2441 my $layout = $self->{layout};
2442
2443 $layout->set_font ($self->{font}) if $self->{font};
2444
2117 glEnable GL_BLEND; 2445 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off
2118 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2447 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2119 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121
2122 my $top = int $self->{children}[1]{range}[0];
2123
2124 my $y0 = $top;
2125 my $y1 = $top + $self->{h};
2126
2127 my $y = 0;
2128
2129 my $layout = $self->{layout};
2130
2131 $layout->set_font ($self->{font}) if $self->{font};
2132 2448
2133 for my $par (@{$self->{par}}) { 2449 for my $par (@{$self->{par}}) {
2134 my $h = $par->[0]; 2450 my $h = $par->[1];
2135 2451
2136 if ($y0 < $y + $h && $y < $y1) { 2452 if ($y0 < $y + $h && $y < $y1) {
2453 $layout->set_foreground (@{ $par->[2] });
2454 $layout->set_width ($W - $par->[3]);
2137 $layout->set_text ($par->[2]); 2455 $layout->set_markup ($par->[4]);
2138 2456
2139 glColor @{ $par->[1] }; 2457 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2140 my ($W, $H) = $layout->size; 2458
2141 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2459 glRasterPos $par->[3], $y - $y0;
2460 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2142 } 2461 }
2143 2462
2144 $y += $h; 2463 $y += $h;
2145 } 2464 }
2146 2465
2147 glDisable GL_TEXTURE_2D;
2148 glDisable GL_BLEND; 2466 glDisable GL_BLEND;
2149 }; 2467 };
2150 }); 2468 });
2151} 2469}
2152 2470
2153sub _draw { 2471sub _draw {
2154 my ($self) = @_; 2472 my ($self) = @_;
2155 2473
2156 if ($self->{texture}) {
2157 glEnable GL_TEXTURE_2D; 2474 glEnable GL_TEXTURE_2D;
2158 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2476 glColor 1, 1, 1, 1;
2159 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2477 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2160 glDisable GL_TEXTURE_2D; 2478 glDisable GL_TEXTURE_2D;
2161 }
2162 2479
2163 $self->{children}[1]->draw; 2480 $self->{children}[1]->draw;
2164 2481
2165} 2482}
2166 2483
… …
2234 2551
2235 # TODO: use animation 2552 # TODO: use animation
2236 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2237 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2238 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2239 $self->emit ("open"); 2556 $self->_emit ("open");
2240 } else { 2557 } else {
2241 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2242 $self->emit ("close"); 2559 $self->_emit ("close");
2243 } 2560 }
2244 2561
2245 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2246} 2563}
2247 2564
2248############################################################################# 2565#############################################################################
2249 2566
2250package CFClient::UI::Tooltip; 2567package CFClient::UI::Tooltip;
… …
2260 @_, 2577 @_,
2261 can_events => 0, 2578 can_events => 0,
2262 ) 2579 )
2263} 2580}
2264 2581
2265sub set_markup { 2582sub set_tooltip_from {
2266 my ($self, $text) = @_; 2583 my ($self, $widget) = @_;
2267 2584
2268 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2585 $self->add (new CFClient::UI::Label
2269 $self->{label}->set_markup ($text); 2586 markup => $widget->{tooltip},
2270 $self->add ($self->{label}); 2587 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588 fontsize => 0.8,
2589 fg => [0, 0, 0, 1],
2590 ellipsise => 0,
2591 font => ($widget->{tooltip_font} || $::FONT_PROP),
2592 );
2271} 2593}
2272 2594
2273sub size_request { 2595sub size_request {
2274 my ($self) = @_; 2596 my ($self) = @_;
2275
2276 $self->child->set_max_size ($::WIDTH * 0.3);
2277 2597
2278 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2598 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2279 2599
2280 ($w + 4, $h + 4) 2600 ($w + 4, $h + 4)
2281} 2601}
… …
2287} 2607}
2288 2608
2289sub _draw { 2609sub _draw {
2290 my ($self) = @_; 2610 my ($self) = @_;
2291 2611
2292 glPushMatrix;
2293 glTranslate 0.375, 0.375; 2612 glTranslate 0.375, 0.375;
2294 2613
2295 my ($w, $h) = @$self{qw(w h)}; 2614 my ($w, $h) = @$self{qw(w h)};
2296 2615
2297 glColor 1, 0.8, 0.4; 2616 glColor 1, 0.8, 0.4;
… …
2308 glVertex 0 , $h; 2627 glVertex 0 , $h;
2309 glVertex $w, $h; 2628 glVertex $w, $h;
2310 glVertex $w, 0; 2629 glVertex $w, 0;
2311 glEnd; 2630 glEnd;
2312 2631
2313 glPopMatrix; 2632 glTranslate 2 - 0.375, 2 - 0.375;
2314
2315 glTranslate 2, 2;
2316 $self->SUPER::_draw; 2633 $self->SUPER::_draw;
2317} 2634}
2318 2635
2319############################################################################# 2636#############################################################################
2320 2637
… …
2325use CFClient::OpenGL; 2642use CFClient::OpenGL;
2326 2643
2327sub new { 2644sub new {
2328 my $class = shift; 2645 my $class = shift;
2329 2646
2330 $class->SUPER::new ( 2647 my $self = $class->SUPER::new (
2331 aspect => 1, 2648 aspect => 1,
2649 can_events => 0,
2332 @_, 2650 @_,
2333 ) 2651 );
2652
2653 if ($self->{anim} && $self->{animspeed}) {
2654 Scalar::Util::weaken (my $widget = $self);
2655
2656 $self->{timer} = Event->timer (
2657 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2658 hard => 1,
2659 interval => $self->{animspeed},
2660 cb => sub {
2661 ++$widget->{frame};
2662 $widget->update;
2663 },
2664 );
2665 }
2666
2667 $self
2334} 2668}
2335 2669
2336sub size_request { 2670sub size_request {
2337 (32, 8) 2671 (32, 8)
2338} 2672}
2339 2673
2674sub update {
2675 my ($self) = @_;
2676
2677 return unless $self->{visible};
2678
2679 $self->SUPER::update;
2680}
2681
2340sub draw { 2682sub _draw {
2341 my ($self) = @_; 2683 my ($self) = @_;
2342 2684
2685 return unless $::CONN;
2686
2687 my $face;
2688
2689 if ($self->{frame}) {
2690 my $anim = $::CONN->{anim}[$self->{anim}];
2691
2692 $face = $anim->[ $self->{frame} % @$anim ]
2693 if $anim && @$anim;
2694 }
2695
2343 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2344 2697
2345 if ($tex) { 2698 if ($tex) {
2346 glEnable GL_BLEND;
2347 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2348 glEnable GL_TEXTURE_2D; 2699 glEnable GL_TEXTURE_2D;
2349 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2350 glColor 1, 1, 1, 1; 2701 glColor 1, 1, 1, 1;
2351 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2352 glDisable GL_TEXTURE_2D; 2703 glDisable GL_TEXTURE_2D;
2353 glDisable GL_BLEND;
2354 } 2704 }
2705}
2706
2707sub DESTROY {
2708 my ($self) = @_;
2709
2710 $self->{timer}->cancel
2711 if $self->{timer};
2712
2713 $self->SUPER::DESTROY;
2355} 2714}
2356 2715
2357############################################################################# 2716#############################################################################
2358 2717
2718package CFClient::UI::Inventory;
2719
2720our @ISA = CFClient::UI::ScrolledWindow::;
2721
2722sub new {
2723 my $class = shift;
2724
2725 my $self = $class->SUPER::new (
2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727 @_,
2728 );
2729
2730 $self
2731}
2732
2733sub set_items {
2734 my ($self, $items) = @_;
2735
2736 $self->{scrolled}->clear;
2737 return unless $items;
2738
2739 my @items = sort {
2740 ($a->{type} <=> $b->{type})
2741 or ($a->{name} cmp $b->{name})
2742 } @$items;
2743
2744 $self->{real_items} = \@items;
2745
2746 my $row = 0;
2747 for my $item (@items) {
2748 CFClient::Item::update_widgets $item;
2749
2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754 $row++;
2755 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763}
2764
2765#############################################################################
2766
2767package CFClient::UI::Menu;
2768
2769our @ISA = CFClient::UI::FancyFrame::;
2770
2771use CFClient::OpenGL;
2772
2773sub new {
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 items => [],
2778 z => 100,
2779 @_,
2780 );
2781
2782 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2783
2784 for my $item (@{ $self->{items} }) {
2785 my ($widget, $cb) = @$item;
2786
2787 # handle various types of items, only text for now
2788 if (!ref $widget) {
2789 $widget = new CFClient::UI::Label
2790 can_hover => 1,
2791 can_events => 1,
2792 text => $widget;
2793 }
2794
2795 $self->{item}{$widget} = $item;
2796
2797 $self->{vbox}->add ($widget);
2798 }
2799
2800 $self
2801}
2802
2803# popup given the event (must be a mouse button down event currently)
2804sub popup {
2805 my ($self, $ev) = @_;
2806
2807 $self->_emit ("popdown");
2808
2809 # maybe save $GRAB? must be careful about events...
2810 $GRAB = $self;
2811 $self->{button} = $ev->{button};
2812
2813 $self->show;
2814 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815}
2816
2817sub mouse_motion {
2818 my ($self, $ev, $x, $y) = @_;
2819
2820 # TODO: should use vbox->find_widget or so
2821 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822 $self->{hover} = $self->{item}{$HOVER};
2823}
2824
2825sub button_up {
2826 my ($self, $ev, $x, $y) = @_;
2827
2828 if ($ev->{button} == $self->{button}) {
2829 undef $GRAB;
2830 $self->hide;
2831
2832 $self->_emit ("popdown");
2833 $self->{hover}[1]->() if $self->{hover};
2834 }
2835}
2836
2837#############################################################################
2838
2839package CFClient::UI::Statusbox;
2840
2841our @ISA = CFClient::UI::VBox::;
2842
2843sub new {
2844 my $class = shift;
2845
2846 $class->SUPER::new (
2847 fontsize => 0.8,
2848 @_,
2849 )
2850}
2851
2852sub reorder {
2853 my ($self) = @_;
2854 my $NOW = time;
2855
2856 while (my ($k, $v) = each %{ $self->{item} }) {
2857 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2858 }
2859
2860 my @widgets;
2861
2862 my @items = sort {
2863 $a->{pri} <=> $b->{pri}
2864 or $b->{id} <=> $a->{id}
2865 } values %{ $self->{item} };
2866
2867 my $count = 10 + 1;
2868 for my $item (@items) {
2869 last unless --$count;
2870
2871 push @widgets, $item->{label} ||= do {
2872 # TODO: doesn't handle markup well (read as: at all)
2873 my $short = $item->{count} > 1
2874 ? "<b>$item->{count} ×</b> $item->{text}"
2875 : $item->{text};
2876
2877 for ($short) {
2878 s/^\s+//;
2879 s/\s+/ /g;
2880 }
2881
2882 new CFClient::UI::Label
2883 markup => $short,
2884 tooltip => $item->{tooltip},
2885 tooltip_font => $::FONT_PROP,
2886 tooltip_width => 0.67,
2887 fontsize => $item->{fontsize} || $self->{fontsize},
2888 max_w => $::WIDTH * 0.44,
2889 fg => $item->{fg},
2890 can_events => 1,
2891 can_hover => 1
2892 };
2893 }
2894
2895 $self->clear;
2896 $self->SUPER::add (reverse @widgets);
2897}
2898
2899sub add {
2900 my ($self, $text, %arg) = @_;
2901
2902 $text =~ s/^\s+//;
2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2906
2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2908
2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2910
2911 if (my $item = $self->{item}{$group}) {
2912 if ($item->{text} eq $text) {
2913 $item->{count}++;
2914 } else {
2915 $item->{count} = 1;
2916 $item->{text} = $item->{tooltip} = $text;
2917 }
2918 $item->{id} = ++$self->{id};
2919 $item->{timeout} = $timeout;
2920 delete $item->{label};
2921 } else {
2922 $self->{item}{$group} = {
2923 id => ++$self->{id},
2924 text => $text,
2925 timeout => $timeout,
2926 tooltip => $text,
2927 fg => [0.8, 0.8, 0.8, 0.8],
2928 pri => 0,
2929 count => 1,
2930 %arg,
2931 };
2932 }
2933
2934 $self->reorder;
2935}
2936
2937sub reconfigure {
2938 my ($self) = @_;
2939
2940 delete $_->{label}
2941 for values %{ $self->{item} || {} };
2942
2943 $self->reorder;
2944 $self->SUPER::reconfigure;
2945}
2946
2947#############################################################################
2948
2359package CFClient::UI::Root; 2949package CFClient::UI::Root;
2360 2950
2361our @ISA = CFClient::UI::Container::; 2951our @ISA = CFClient::UI::Container::;
2362 2952
2363use CFClient::OpenGL; 2953use CFClient::OpenGL;
2364 2954
2365sub check_size { 2955sub new {
2366 my ($self) = @_; 2956 my $class = shift;
2367 2957
2368 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2958 $class->SUPER::new (
2369} 2959 @_,
2370 2960 )
2371sub size_request {
2372 ($::WIDTH, $::HEIGHT)
2373} 2961}
2374 2962
2375sub configure { 2963sub configure {
2376 my ($self, $x, $y, $w, $h) = @_; 2964 my ($self, $x, $y, $w, $h) = @_;
2377 2965
2378 $self->SUPER::configure ($x, $y, $w, $h); 2966 $self->{w} = $w;
2967 $self->{h} = $h;
2968}
2379 2969
2970sub check_size {
2971 my ($self) = @_;
2972
2973 $self->size_allocate ($self->{w}, $self->{h})
2974 if $self->{w};
2975}
2976
2977sub size_request {
2978 my ($self) = @_;
2979
2980 ($self->{w}, $self->{h})
2981}
2982
2983sub size_allocate {
2984 my ($self, $w, $h) = @_;
2985
2380 for my $child (@{$self->{children}}) { 2986 for my $child ($self->children) {
2381 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2382 2988
2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2990 if exists $child->{req_x};
2991
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2993 if exists $child->{req_y};
2994
2383 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2384 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997
2385 $child->configure ($X, $Y, $W,$H); 2998 $child->configure ($X, $Y, $W, $H);
2386 } 2999 }
2387} 3000}
2388 3001
2389sub _topleft { 3002sub coord2local {
2390 my ($self, $x, $y) = @_; 3003 my ($self, $x, $y) = @_;
2391 3004
2392 ($x, $y) 3005 ($x, $y)
2393} 3006}
2394 3007
3008sub coord2global {
3009 my ($self, $x, $y) = @_;
3010
3011 ($x, $y)
3012}
3013
2395sub update { 3014sub update {
2396 my ($self) = @_; 3015 my ($self) = @_;
2397 3016
2398 $self->check_size; 3017 $self->check_size;
2399 ::refresh (); 3018 $::WANT_REFRESH++;
2400} 3019}
2401 3020
2402sub add { 3021sub add {
2403 my ($self, $child) = @_; 3022 my ($self, @children) = @_;
2404 3023
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029
3030 for my $child (@children) {
3031 $child->{is_toplevel} = 1;
3032
2405 # integerize window positions 3033 # integerise window positions
2406 $child->{x} = int $child->{x}; 3034 $child->{x} = int $child->{x};
2407 $child->{y} = int $child->{y}; 3035 $child->{y} = int $child->{y};
3036 }
2408 3037
2409 $self->SUPER::add ($child); 3038 $self->SUPER::add (@children);
3039}
3040
3041sub remove {
3042 my ($self, @children) = @_;
3043
3044 $self->SUPER::remove (@children);
3045
3046 while (@children) {
3047 my $w = pop @children;
3048 push @children, $w->children;
3049 $w->set_invisible;
3050 }
2410} 3051}
2411 3052
2412sub on_refresh { 3053sub on_refresh {
2413 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
2414 3055
2415 $self->{refresh_hook}{$id} = $cb; 3056 $self->{refresh_hook}{$id} = $cb;
2416} 3057}
2417 3058
3059sub on_post_alloc {
3060 my ($self, $id, $cb) = @_;
3061
3062 $self->{post_alloc_hook}{$id} = $cb;
3063}
3064
2418sub draw { 3065sub draw {
2419 my ($self) = @_; 3066 my ($self) = @_;
2420 3067
2421 while (my $rcb = delete $self->{refresh_hook}) { 3068 while ($self->{refresh_hook}) {
2422 $_->() for values %$rcb; 3069 $_->()
3070 for values %{delete $self->{refresh_hook}};
3071 }
3072
3073 if ($self->{check_size}) {
3074 my @queue = ([], []);
3075
3076 for (;;) {
3077 if ($self->{check_size}) {
3078 # heuristic: check containers last
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3080 for values %{delete $self->{check_size}}
3081 }
3082
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3084
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3086 ? @$widget{qw(user_w user_h)}
3087 : $widget->size_request;
3088
3089 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092
3093 $widget->{req_w} = $w;
3094 $widget->{req_h} = $h;
3095
3096 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3097
3098 $widget->{parent}->check_size
3099 if $widget->{parent};
3100 }
3101 }
3102 }
3103
3104 while ($self->{size_alloc}) {
3105 for (values %{delete $self->{size_alloc}}) {
3106 my ($widget, $w, $h) = @$_;
3107
3108 $w = 0 if $w < 0;
3109 $h = 0 if $h < 0;
3110
3111 $widget->{w} = $w;
3112 $widget->{h} = $h;
3113 $widget->emit (size_allocate => $w, $h);
3114 }
3115 }
3116
3117 while ($self->{post_alloc_hook}) {
3118 $_->()
3119 for values %{delete $self->{post_alloc_hook}};
2423 } 3120 }
2424 3121
2425 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3122 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2426 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2427 glClear GL_COLOR_BUFFER_BIT; 3124 glClear GL_COLOR_BUFFER_BIT;
2428 3125
2429 glMatrixMode GL_PROJECTION; 3126 glMatrixMode GL_PROJECTION;
2430 glLoadIdentity; 3127 glLoadIdentity;
2431 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2432 glMatrixMode GL_MODELVIEW; 3129 glMatrixMode GL_MODELVIEW;
2433 glLoadIdentity; 3130 glLoadIdentity;
2434 3131
2435 $self->_draw; 3132 $self->_draw;
2436} 3133}
… …
2438############################################################################# 3135#############################################################################
2439 3136
2440package CFClient::UI; 3137package CFClient::UI;
2441 3138
2442$ROOT = new CFClient::UI::Root; 3139$ROOT = new CFClient::UI::Root;
2443$TOOLTIP = new CFClient::UI::Tooltip; 3140$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2444 3141
24451 31421
2446 3143

Diff Legend

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