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.174 by root, Tue Apr 25 11:18:49 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
30 $TOOLTIP->show; 32 $TOOLTIP->show;
31 33
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 35
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 37 if $x + $TOOLTIP->{w} > $::WIDTH;
37 38
38 $TOOLTIP->move ($x, $y); 39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
39 } 42 }
40 43
41 return; 44 return;
42 } 45 }
43 } 46 }
… …
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48} 51}
49 52
50# class methods for events 53# class methods for events
51sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 56 if $FOCUS;
54} 57}
55 58
56sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 61 if $FOCUS;
59} 62}
60 63
61sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
62 my ($ev) = @_; 65 my ($ev) = @_;
… …
71 check_tooltip; 74 check_tooltip;
72 } 75 }
73 76
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 78
76 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 81}
81 82
82sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
83 my ($ev) = @_; 84 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
85 86
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 88
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 90
90 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 93
95 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 96 $grab->update if $grab;
98 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 114
116 check_tooltip; 115 check_tooltip;
117 } 116 }
118 117
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 119 if $HOVER;
123} 120}
124 121
125# convert position array to integers 122# convert position array to integers
126sub harmonize { 123sub harmonize {
127 my ($vals) = @_; 124 my ($vals) = @_;
… …
131 for (@$vals) { 128 for (@$vals) {
132 my $i = int $_ + $rem; 129 my $i = int $_ + $rem;
133 $rem += $_ - $i; 130 $rem += $_ - $i;
134 $_ = $i; 131 $_ = $i;
135 } 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;
136} 169}
137 170
138############################################################################# 171#############################################################################
139 172
140package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
158 if (/^connect_(.*)$/) { 191 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 192 $self->connect ($1 => delete $self->{$_});
160 } 193 }
161 } 194 }
162 195
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
163 $self 198 $self
164} 199}
165 200
166sub destroy { 201sub destroy {
167 my ($self) = @_; 202 my ($self) = @_;
… …
170 %$self = (); 205 %$self = ();
171} 206}
172 207
173sub show { 208sub show {
174 my ($self) = @_; 209 my ($self) = @_;
175
176 return if $self->{parent}; 210 return if $self->{parent};
177 211
178 $CFClient::UI::ROOT->add ($self); 212 $CFClient::UI::ROOT->add ($self);
179} 213}
180 214
181sub hide { 215sub show_centered {
182 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};
183 234
184 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
185 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;
186 248
187 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
188 if $self->{parent}; 250 if $self->{parent};
189} 251}
190 252
… …
232 $self->{y} = $y; 294 $self->{y} = $y;
233 $self->update; 295 $self->update;
234 } 296 }
235 297
236 if ($self->{w} != $w || $self->{h} != $h) { 298 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 300 }
243} 301}
244 302
245sub size_allocate { 303sub size_allocate {
246 # nothing to be done 304 # nothing to be done
247} 305}
248 306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
249sub children { 314sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 315}
261 316
262sub set_max_size { 317sub set_max_size {
263 my ($self, $w, $h) = @_; 318 my ($self, $w, $h) = @_;
264 319
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 320 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 321 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 322}
268 323
269# return top left coordinates 324sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 325 my ($self, $tooltip) = @_;
272 326
273 $self->{parent} 327 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 328 $tooltip =~ s/\s+$//;
275 329
276 $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 }
277} 338}
278 339
279# translate global coordinates to local coordinate system 340# translate global coordinates to local coordinate system
280sub coord2local { 341sub coord2local {
281 my ($self, $x, $y) = @_; 342 my ($self, $x, $y) = @_;
282 343
283 my ($X, $Y) = $self->_topleft; 344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 345}
286 346
287# translate local coordinates to global coordinate system 347# translate local coordinates to global coordinate system
288sub coord2global { 348sub coord2global {
289 my ($self, $x, $y) = @_; 349 my ($self, $x, $y) = @_;
290 350
291 my ($X, $Y) = $self->_topleft; 351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 352}
294 353
295sub focus_in { 354sub focus_in {
296 my ($self) = @_; 355 my ($self) = @_;
297 356
298 return if $FOCUS == $self; 357 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
300 359
301 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
302 361
303 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
304 363
305 $focus->update if $focus; 364 $focus->update if $focus;
306 $FOCUS->update; 365 $FOCUS->update;
307} 366}
308 367
… …
311 370
312 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
313 372
314 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
315 374
316 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
317 376
318 $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;
319} 381}
320 382
321sub mouse_motion { } 383sub mouse_motion { }
322sub button_up { } 384sub button_up { }
323sub key_down { } 385sub key_down { }
324sub key_up { } 386sub key_up { }
325 387
326sub button_down { 388sub button_down {
327 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
328 390
329 $self->focus_in; 391 $self->focus_in;
… …
363 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix; 426 glPushMatrix;
365 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 430 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
370 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
371 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
372 glEnd; 434 glEnd;
373 glPopMatrix; 435 glPopMatrix;
374 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;
375 } 437 }
376} 438}
377 439
378sub _draw { 440sub _draw {
379 my ($self) = @_; 441 my ($self) = @_;
… …
395 457
396sub set_parent { 458sub set_parent {
397 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
398 460
399 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;
400} 471}
401 472
402sub check_size { 473sub check_size {
403 my ($self) = @_; 474 my ($self, $forced) = @_;
404 475
405 $self->{parent} 476 $self->{force_alloc} = 1 if $forced;
406 or return 1; 477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 478}
427 479
428sub update { 480sub update {
429 my ($self) = @_; 481 my ($self) = @_;
430 482
… …
436 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
437 489
438 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
439} 491}
440 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
441sub emit { 499sub emit {
442 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
443 501
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
445} 504}
446 505
447sub DESTROY { 506sub DESTROY {
448 my ($self) = @_; 507 my ($self) = @_;
449 508
509 delete $WIDGET{$self+0};
450 #$self->deactivate; 510 #$self->deactivate;
451} 511}
452 512
453############################################################################# 513#############################################################################
454 514
… …
463 my $class = shift; 523 my $class = shift;
464 524
465 # range [value, low, high, page] 525 # range [value, low, high, page]
466 526
467 $class->SUPER::new ( 527 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 528 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 529 #active_bg => [1, 1, 1, 0.5],
470 @_ 530 @_
471 ) 531 )
472} 532}
473 533
474sub _draw { 534sub _draw {
475 my ($self) = @_; 535 my ($self) = @_;
476 536
537 my $color = $FOCUS == $self && $self->{active_bg}
538 ? $self->{active_bg}
539 : $self->{bg};
540
541 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 542 my ($w, $h) = @$self{qw(w h)};
478 543
479 glEnable GL_BLEND; 544 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 546 glColor @$color;
482 547
483 glBegin GL_QUADS; 548 glBegin GL_QUADS;
484 glVertex 0 , 0; 549 glVertex 0 , 0;
485 glVertex 0 , $h; 550 glVertex 0 , $h;
486 glVertex $w, $h; 551 glVertex $w, $h;
487 glVertex $w, 0; 552 glVertex $w, 0;
488 glEnd; 553 glEnd;
489 554
490 glDisable GL_BLEND; 555 glDisable GL_BLEND;
556 }
491} 557}
492 558
493############################################################################# 559#############################################################################
494 560
495package CFClient::UI::Empty; 561package CFClient::UI::Empty;
… …
527 593
528 $self 594 $self
529} 595}
530 596
531sub add { 597sub add {
532 my ($self, $child) = @_; 598 my ($self, @widgets) = @_;
533 599
534 $child->set_parent ($self); 600 $_->set_parent ($self)
601 for @widgets;
535 602
536 use sort 'stable'; 603 use sort 'stable';
537 604
538 $self->{children} = [ 605 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 606 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 607 @{$self->{children}}, @widgets
541 ]; 608 ];
542 609
543 $child->check_size; 610 $self->check_size (1);
611 $self->update;
544} 612}
545 613
546sub children { 614sub children {
547 @{ $_[0]{children} } 615 @{ $_[0]{children} }
548} 616}
… …
553 delete $child->{parent}; 621 delete $child->{parent};
554 $child->hide; 622 $child->hide;
555 623
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 625
558 $self->check_size; 626 $self->check_size (1);
559 $self->update; 627 $self->update;
560} 628}
561 629
562sub clear { 630sub clear {
563 my ($self) = @_; 631 my ($self) = @_;
… …
567 635
568 for (@$children) { 636 for (@$children) {
569 delete $_->{parent}; 637 delete $_->{parent};
570 $_->hide; 638 $_->hide;
571 } 639 }
640
641 $self->check_size;
642 $self->update;
572} 643}
573 644
574sub find_widget { 645sub find_widget {
575 my ($self, $x, $y) = @_; 646 my ($self, $x, $y) = @_;
576 647
… …
651} 722}
652 723
653sub update { 724sub update {
654 my ($self) = @_; 725 my ($self) = @_;
655 726
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 727 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 728 $self->SUPER::update;
658} 729}
659 730
660sub size_allocate { 731sub size_allocate {
661 my ($self, $w, $h) = @_; 732 my ($self, $w, $h) = @_;
662 733
663 $self->SUPER::size_allocate ($w, $h); 734 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 735 $self->update;
736}
737
738sub _render {
739 $_[0]{children}[0]->draw;
665} 740}
666 741
667sub render_child { 742sub render_child {
668 my ($self) = @_; 743 my ($self) = @_;
669 744
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 746 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 747 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 748
749 $self->_render;
674 }; 750 };
675} 751}
676 752
677sub _draw { 753sub _draw {
678 my ($self) = @_; 754 my ($self) = @_;
… …
680 my ($w, $h) = ($self->w, $self->h); 756 my ($w, $h) = ($self->w, $self->h);
681 757
682 my $tex = $self->{texture} 758 my $tex = $self->{texture}
683 or return; 759 or return;
684 760
685 glEnable GL_BLEND;
686 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
687 glEnable GL_TEXTURE_2D; 761 glEnable GL_TEXTURE_2D;
688 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
689 glColor 0, 0, 0, 1; 763 glColor 1, 1, 1, 1;
690 764
691 $tex->draw_quad (0, 0, $w, $h); 765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
692 766
693 glDisable GL_BLEND;
694 glDisable GL_TEXTURE_2D; 767 glDisable GL_TEXTURE_2D;
695} 768}
696 769
697############################################################################# 770#############################################################################
698 771
699package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
700 773
701our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
702
703sub new { die }
704
705sub size_request {
706 my ($self) = @_;
707
708 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
709 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
710
711 @$self{qw(child_w child_h)}
712}
713
714sub _draw {
715 my ($self) = @_;
716
717 $self->{children}[1]->draw;
718}
719
720
721#############################################################################
722
723package CFClient::UI::Frame;
724
725our @ISA = CFClient::UI::Bin::;
726
727use CFClient::OpenGL;
728 775
729sub new { 776sub new {
730 my $class = shift; 777 my $class = shift;
731 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
732 my $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
733 bg => [1, 1, 1, 1], 869 vp => (new CFClient::UI::ViewPort expand => 1),
734 border_bg => [1, 1, 1, 1], 870 slider => $slider,
735 border => 0.8,
736 @_ 871 @_,
737 ); 872 );
738 873
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider});
877
739 $self 878 $self
740} 879}
741 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
742sub _draw { 910sub _draw {
743 my ($self) = @_; 911 my ($self) = @_;
744 912
745 my ($w, $h) = ($self->{w}, $self->{h}); 913 if ($self->{bg}) {
914 my ($w, $h) = @$self{qw(w h)};
746 915
747 glEnable GL_BLEND; 916 glEnable GL_BLEND;
748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 917 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D; 918 glColor @{ $self->{bg} };
750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
751 919
752# glBegin GL_QUADS; 920 glBegin GL_QUADS;
753# glColor 0, 0, 0, 0;
754# glVertex 0 , 0; 921 glVertex 0 , 0;
755# glVertex 0 , $h; 922 glVertex 0 , $h;
756# glVertex $w, $h; 923 glVertex $w, $h;
757# glVertex $w, 0; 924 glVertex $w, 0;
758# glEnd; 925 glEnd;
759 926
760
761 $self->child->draw;
762 glDisable GL_BLEND; 927 glDisable GL_BLEND;
763 glDisable GL_TEXTURE_2D; 928 }
929
930 $self->SUPER::_draw;
764} 931}
765 932
766############################################################################# 933#############################################################################
767 934
768package CFClient::UI::FancyFrame; 935package CFClient::UI::FancyFrame;
… …
779 my $class = shift; 946 my $class = shift;
780 947
781 # TODO: user_x, user_y, overwrite moveto? 948 # TODO: user_x, user_y, overwrite moveto?
782 949
783 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
784 bg => [1, 1, 1, 1], 951 bg => [1, 1, 1, 1],
785 border_bg => [1, 1, 1, 1], 952 border_bg => [1, 1, 1, 1],
786 border => 0.8, 953 border => 0.6,
954 is_toplevel => 1,
787 can_events => 1, 955 can_events => 1,
788 @_ 956 @_
789 ); 957 );
790 958
791 $self->{title} &&= new CFClient::UI::Label 959 $self->{title} &&= new CFClient::UI::Label
792 align => 0, 960 align => 0,
793 valign => 1, 961 valign => 1,
794 text => $self->{title}, 962 text => $self->{title},
795 fontsize => 1; 963 fontsize => $self->{border};
796 964
797 $self 965 $self
798} 966}
799 967
800sub border { 968sub border {
… …
816 my ($self, $w, $h) = @_; 984 my ($self, $w, $h) = @_;
817 985
818 $h -= List::Util::max 0, $self->border * 2; 986 $h -= List::Util::max 0, $self->border * 2;
819 $w -= List::Util::max 0, $self->border * 2; 987 $w -= List::Util::max 0, $self->border * 2;
820 988
821 $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)
822 if $self->{title}; 990 if $self->{title};
823 991
824 $self->child->configure ($self->border, $self->border, $w, $h); 992 $self->child->configure ($self->border, $self->border, $w, $h);
825} 993}
826 994
827sub button_down { 995sub button_down {
828 my ($self, $ev, $x, $y) = @_; 996 my ($self, $ev, $x, $y) = @_;
829 997
998 my ($w, $h) = @$self{qw(w h)};
830 my $border = $self->border; 999 my $border = $self->border;
831 1000
832 if ($x < $self->{w} && $x >= $self->{w} - $border 1001 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
833 && $y < $self->{h} && $y >= $self->{h} - $border) { 1002 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
834 1003
1004 if ($lr & $td) {
1005 my ($wx, $wy) = ($self->{x}, $self->{y});
835 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1006 my ($ox, $oy) = ($ev->{x}, $ev->{y});
836 my ($bw, $bh) = ($self->{w}, $self->{h}); 1007 my ($bw, $bh) = ($self->{w}, $self->{h});
837 1008
1009 my $mx = $x < $border;
1010 my $my = $y < $border;
1011
838 $self->{motion} = sub { 1012 $self->{motion} = sub {
839 my ($ev, $x, $y) = @_; 1013 my ($ev, $x, $y) = @_;
840 1014
841 ($x, $y) = ($ev->{x}, $ev->{y}); 1015 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy;
842 1017
843 $self->{user_w} = $bw + $x - $ox; 1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
844 $self->{user_h} = $bh + $y - $oy; 1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
845 $self->check_size; 1021 $self->check_size;
846 }; 1022 };
847 1023
848 } elsif ($x >= 0 && $x < $self->{w} 1024 } elsif ($lr ^ $td) {
849 && $y >= 0 && $y < $border) {
850
851 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1025 my ($ox, $oy) = ($ev->{x}, $ev->{y});
852 my ($bx, $by) = ($self->{x}, $self->{y}); 1026 my ($bx, $by) = ($self->{x}, $self->{y});
853 1027
854 $self->{motion} = sub { 1028 $self->{motion} = sub {
855 my ($ev, $x, $y) = @_; 1029 my ($ev, $x, $y) = @_;
… …
878 my ($self) = @_; 1052 my ($self) = @_;
879 1053
880 my ($w, $h ) = ($self->{w}, $self->{h}); 1054 my ($w, $h ) = ($self->{w}, $self->{h});
881 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1055 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
882 1056
883 glEnable GL_BLEND;
884 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
885 glEnable GL_TEXTURE_2D; 1057 glEnable GL_TEXTURE_2D;
886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
887 1059
888 my $border = $self->border; 1060 my $border = $self->border;
889 1061
890 glColor @{ $self->{border_bg} }; 1062 glColor @{ $self->{border_bg} };
891 $tex[1]->draw_quad (0, 0, $w, $border); 1063 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
892 $tex[3]->draw_quad (0, $border, $border, $ch); 1064 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
893 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1065 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
894 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1066 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
895 1067
1068 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
896 my $bg = $tex[0]; 1069 my $bg = $tex[0];
897 1070
898 # TODO: repeat texture not scale 1071 # TODO: repeat texture not scale
899 my $rep_x = $cw / $bg->{w}; 1072 my $rep_x = $cw / $bg->{w};
900 my $rep_y = $ch / $bg->{h}; 1073 my $rep_y = $ch / $bg->{h};
901 1074
902 glColor @{ $self->{bg} }; 1075 glColor @{ $self->{bg} };
903 1076
904 $bg->{s} = $rep_x; 1077 $bg->{s} = $rep_x;
905 $bg->{t} = $rep_y; 1078 $bg->{t} = $rep_y;
906 $bg->{wrap_mode} = 1; 1079 $bg->{wrap_mode} = 1;
907 $bg->draw_quad ($border, $border, $cw, $ch); 1080 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081 }
908 1082
909 glDisable GL_TEXTURE_2D; 1083 glDisable GL_TEXTURE_2D;
910 glDisable GL_BLEND;
911 1084
912 $self->{title}->draw if $self->{title}; 1085 $self->{title}->draw if $self->{title};
1086
913 $self->child->draw; 1087 $self->child->draw;
914} 1088}
915 1089
916############################################################################# 1090#############################################################################
917 1091
… …
926sub new { 1100sub new {
927 my $class = shift; 1101 my $class = shift;
928 1102
929 $class->SUPER::new ( 1103 $class->SUPER::new (
930 col_expand => [], 1104 col_expand => [],
931 @_ 1105 @_,
932 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
933} 1111}
934 1112
935sub add { 1113sub add {
936 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
937 1115
938 $child->set_parent ($self); 1116 $child->set_parent ($self);
939 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
940 1118
941 $child->check_size; 1119 $self->check_size (1);
942} 1120}
943 1121
944sub children {
945 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946}
947
948# 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?
949sub clear { 1123sub clear {
950 my ($self) = @_; 1124 my ($self) = @_;
951 1125
952 my @children = $self->children; 1126 my @children = $self->children;
953 delete $self->{children}; 1127 delete $self->{children};
… …
955 for (@children) { 1129 for (@children) {
956 delete $_->{parent}; 1130 delete $_->{parent};
957 $_->hide; 1131 $_->hide;
958 } 1132 }
959 1133
1134 $self->check_size (1);
960 $self->update; 1135 $self->update;
961} 1136}
962 1137
963sub get_wh { 1138sub get_wh {
964 my ($self) = @_; 1139 my ($self) = @_;
… …
1141} 1316}
1142 1317
1143sub size_allocate { 1318sub size_allocate {
1144 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1145 1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1146 my $children = $self->{children}; 1323 my $children = $self->{children};
1147 1324
1148 my @h = map $_->{req_h}, @$children; 1325 my @h = map $_->{req_h}, @$children;
1149 1326
1150 my $req_h = List::Util::sum @h; 1327 my $req_h = List::Util::sum @h;
… …
1179 1356
1180############################################################################# 1357#############################################################################
1181 1358
1182package CFClient::UI::Label; 1359package CFClient::UI::Label;
1183 1360
1184our @ISA = CFClient::UI::Base::; 1361our @ISA = CFClient::UI::DrawBG::;
1185 1362
1186use CFClient::OpenGL; 1363use CFClient::OpenGL;
1187 1364
1188sub new { 1365sub new {
1189 my ($class, %arg) = @_; 1366 my ($class, %arg) = @_;
1190 1367
1191 my $self = $class->SUPER::new ( 1368 my $self = $class->SUPER::new (
1192 fg => [1, 1, 1], 1369 fg => [1, 1, 1],
1370 #bg => none
1371 #active_bg => none
1193 #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),
1194 fontsize => 1, 1378 fontsize => 1,
1195 text => "",
1196 align => -1, 1379 align => -1,
1197 valign => -1, 1380 valign => -1,
1198 padding => 2, 1381 padding => 2,
1199 layout => new CFClient::Layout,
1200 can_events => 0, 1382 can_events => 0,
1201 %arg 1383 %arg
1202 ); 1384 );
1203 1385
1204 if (exists $self->{template}) { 1386 if (exists $self->{template}) {
1205 my $layout = new CFClient::Layout; 1387 my $layout = new CFClient::Layout;
1206 $layout->set_text (delete $self->{template}); 1388 $layout->set_text (delete $self->{template});
1207 $self->{template} = $layout; 1389 $self->{template} = $layout;
1208 } 1390 }
1209 1391
1210 $self->set_text (delete $self->{text}) if exists $self->{text}; 1392 if (exists $self->{markup}) {
1211 $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 }
1212 1397
1213 $self 1398 $self
1214} 1399}
1215 1400
1216sub escape { 1401sub escape($) {
1217 local $_ = $_[1]; 1402 local $_ = $_[0];
1218 1403
1219 s/&/&amp;/g; 1404 s/&/&amp;/g;
1220 s/>/&gt;/g; 1405 s/>/&gt;/g;
1221 s/</&lt;/g; 1406 s/</&lt;/g;
1222 1407
1223 $_[1] 1408 $_
1224} 1409}
1225 1410
1226sub update { 1411sub update {
1227 my ($self) = @_; 1412 my ($self) = @_;
1228 1413
1229 delete $self->{texture}; 1414 delete $self->{texture};
1230 $self->SUPER::update; 1415 $self->SUPER::update;
1231} 1416}
1232 1417
1233sub reconfigure {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237}
1238
1239sub set_text { 1418sub set_text {
1240 my ($self, $text) = @_; 1419 my ($self, $text) = @_;
1241 1420
1242 return if $self->{text} eq "T$text"; 1421 return if $self->{text} eq "T$text";
1243 $self->{text} = "T$text"; 1422 $self->{text} = "T$text";
1244 1423
1424 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1245 $self->{layout}->set_text ($text); 1425 $self->{layout}->set_text ($text);
1246 1426
1247 delete $self->{texture};
1248 $self->update; 1427 $self->update;
1249 $self->check_size; 1428 $self->check_size;
1250} 1429}
1251 1430
1252sub set_markup { 1431sub set_markup {
1253 my ($self, $markup) = @_; 1432 my ($self, $markup) = @_;
1254 1433
1255 return if $self->{text} eq "M$markup"; 1434 return if $self->{text} eq "M$markup";
1256 $self->{text} = "M$markup"; 1435 $self->{text} = "M$markup";
1257 1436
1437 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438
1439 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1258 $self->{layout}->set_markup ($markup); 1440 $self->{layout}->set_markup ($markup);
1259 1441
1260 delete $self->{texture};
1261 $self->update; 1442 $self->update;
1262 $self->check_size; 1443 $self->check_size;
1263} 1444}
1264 1445
1265sub size_request { 1446sub size_request {
1266 my ($self) = @_; 1447 my ($self) = @_;
1267 1448
1268 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1449 $self->{layout}->set_font ($self->{font}) if $self->{font};
1269 $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});
1270 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1453 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1271 1454
1272 my ($w, $h) = $self->{layout}->size; 1455 my ($w, $h) = $self->{layout}->size;
1273 1456
1274 if (exists $self->{template}) { 1457 if (exists $self->{template}) {
… …
1296sub set_fontsize { 1479sub set_fontsize {
1297 my ($self, $fontsize) = @_; 1480 my ($self, $fontsize) = @_;
1298 1481
1299 $self->{fontsize} = $fontsize; 1482 $self->{fontsize} = $fontsize;
1300 delete $self->{texture}; 1483 delete $self->{texture};
1484
1485 $self->update;
1301 $self->check_size; 1486 $self->check_size;
1302 $self->update;
1303} 1487}
1304 1488
1305sub _draw { 1489sub _draw {
1306 my ($self) = @_; 1490 my ($self) = @_;
1307 1491
1492 $self->SUPER::_draw; # draw background, if applicable
1493
1308 my $tex = $self->{texture} ||= do { 1494 my $tex = $self->{texture} ||= do {
1495 $self->{layout}->set_foreground (@{$self->{fg}});
1309 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1496 $self->{layout}->set_font ($self->{font}) if $self->{font};
1310 $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});
1311 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501
1312 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
1313 }; 1513 };
1314 1514
1315 glEnable GL_BLEND;
1316 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D; 1515 glEnable GL_TEXTURE_2D;
1318 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1516 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319 1517
1518 if ($tex->{format} == GL_ALPHA) {
1320 glColor @{$self->{fg}}; 1519 glColor @{$self->{fg}};
1321
1322 $self->{ox} = int (
1323 $self->{align} < 0 ? $self->{padding}
1324 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1325 : ($self->{w} - $tex->{w}) * 0.5
1326 );
1327
1328 $self->{oy} = int (
1329 $self->{valign} < 0 ? $self->{padding}
1330 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1331 : ($self->{h} - $tex->{h}) * 0.5
1332 );
1333
1334 $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 }
1335 1524
1336 glDisable GL_TEXTURE_2D; 1525 glDisable GL_TEXTURE_2D;
1337 glDisable GL_BLEND;
1338} 1526}
1339 1527
1340############################################################################# 1528#############################################################################
1341 1529
1342package CFClient::UI::EntryBase; 1530package CFClient::UI::EntryBase;
… …
1355 active_fg => [0, 0, 0], 1543 active_fg => [0, 0, 0],
1356 can_hover => 1, 1544 can_hover => 1,
1357 can_focus => 1, 1545 can_focus => 1,
1358 valign => 0, 1546 valign => 0,
1359 can_events => 1, 1547 can_events => 1,
1548 #text => ...
1360 @_ 1549 @_
1361 ) 1550 )
1362} 1551}
1363 1552
1364sub _set_text { 1553sub _set_text {
… …
1374 $self->{text} = $text; 1563 $self->{text} = $text;
1375 1564
1376 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1377 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1378 1567
1379 $self->emit (changed => $self->{text}); 1568 $self->_emit (changed => $self->{text});
1380}
1381
1382sub get_text {
1383 $_[0]{text}
1384}
1385
1386sub size_request {
1387 my ($self) = @_;
1388
1389 my ($w, $h) = $self->SUPER::size_request;
1390
1391 ($w + 1, $h) # add 1 for cursor
1392}
1393
1394sub size_allocate {
1395 my ($self, $w, $h) = @_;
1396
1397 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1398} 1569}
1399 1570
1400sub set_text { 1571sub set_text {
1401 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1402 1573
1403 $self->{cursor} = length $text; 1574 $self->{cursor} = length $text;
1404 $self->_set_text ($text); 1575 $self->_set_text ($text);
1405 $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
1406} 1590}
1407 1591
1408sub key_down { 1592sub key_down {
1409 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1410 1594
… …
1412 my $sym = $ev->{sym}; 1596 my $sym = $ev->{sym};
1413 my $uni = $ev->{unicode}; 1597 my $uni = $ev->{unicode};
1414 1598
1415 my $text = $self->get_text; 1599 my $text = $self->get_text;
1416 1600
1417 if ($sym == 8) { 1601 if ($uni == 8) {
1418 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1602 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1419 } elsif ($sym == 127) { 1603 } elsif ($uni == 127) {
1420 substr $text, $self->{cursor}, 1, ""; 1604 substr $text, $self->{cursor}, 1, "";
1421 } elsif ($sym == CFClient::SDLK_LEFT) { 1605 } elsif ($sym == CFClient::SDLK_LEFT) {
1422 --$self->{cursor} if $self->{cursor}; 1606 --$self->{cursor} if $self->{cursor};
1423 } elsif ($sym == CFClient::SDLK_RIGHT) { 1607 } elsif ($sym == CFClient::SDLK_RIGHT) {
1424 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1608 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1425 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1426 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1427 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1428 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1429 } elsif ($sym == 27) { 1613 } elsif ($uni == 27) {
1430 $self->emit ('escape'); 1614 $self->_emit ('escape');
1431 } elsif ($uni) { 1615 } elsif ($uni) {
1432 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1433 } 1617 }
1434 1618
1435 $self->_set_text ($text); 1619 $self->_set_text ($text);
1436 $self->update; 1620 $self->update;
1621 $self->check_size;
1437} 1622}
1438 1623
1439sub focus_in { 1624sub focus_in {
1440 my ($self) = @_; 1625 my ($self) = @_;
1441 1626
… …
1521 if ($sym == 13) { 1706 if ($sym == 13) {
1522 unshift @{$self->{history}}, 1707 unshift @{$self->{history}},
1523 my $txt = $self->get_text; 1708 my $txt = $self->get_text;
1524 $self->{history_pointer} = -1; 1709 $self->{history_pointer} = -1;
1525 $self->{history_saveback} = ''; 1710 $self->{history_saveback} = '';
1526 $self->emit (activate => $txt); 1711 $self->_emit (activate => $txt);
1527 $self->update; 1712 $self->update;
1528 1713
1529 } elsif ($sym == CFClient::SDLK_UP) { 1714 } elsif ($sym == CFClient::SDLK_UP) {
1530 if ($self->{history_pointer} < 0) { 1715 if ($self->{history_pointer} < 0) {
1531 $self->{history_saveback} = $self->get_text; 1716 $self->{history_saveback} = $self->get_text;
… …
1570 my $class = shift; 1755 my $class = shift;
1571 1756
1572 $class->SUPER::new ( 1757 $class->SUPER::new (
1573 padding => 4, 1758 padding => 4,
1574 fg => [1, 1, 1], 1759 fg => [1, 1, 1],
1575 bg => [1, 1, 1, 0.2],
1576 active_fg => [0, 0, 1], 1760 active_fg => [0, 0, 1],
1577 can_hover => 1, 1761 can_hover => 1,
1578 align => 0, 1762 align => 0,
1579 valign => 0, 1763 valign => 0,
1580 can_events => 1, 1764 can_events => 1,
1581 @_ 1765 @_
1582 ) 1766 )
1583} 1767}
1584 1768
1769sub activate { }
1770
1585sub button_up { 1771sub button_up {
1586 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1587 1773
1774 $self->emit ("activate")
1588 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1589 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1590 $self->emit ("activate");
1591 }
1592} 1777}
1593 1778
1594sub _draw { 1779sub _draw {
1595 my ($self) = @_; 1780 my ($self) = @_;
1596 1781
… …
1598 1783
1599 if ($GRAB == $self) { 1784 if ($GRAB == $self) {
1600 $self->{fg} = $self->{active_fg}; 1785 $self->{fg} = $self->{active_fg};
1601 } 1786 }
1602 1787
1603 glEnable GL_BLEND;
1604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1605 glEnable GL_TEXTURE_2D; 1788 glEnable GL_TEXTURE_2D;
1606 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1607 glColor 0, 0, 0, 1; 1790 glColor 0, 0, 0, 1;
1608 1791
1609 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1792 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1610 1793
1611 glDisable GL_TEXTURE_2D; 1794 glDisable GL_TEXTURE_2D;
1612 glDisable GL_BLEND;
1613 1795
1614 $self->SUPER::_draw; 1796 $self->SUPER::_draw;
1615} 1797}
1616 1798
1617############################################################################# 1799#############################################################################
… …
1631 1813
1632 $class->SUPER::new ( 1814 $class->SUPER::new (
1633 padding => 2, 1815 padding => 2,
1634 fg => [1, 1, 1], 1816 fg => [1, 1, 1],
1635 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],
1636 state => 0, 1820 state => 0,
1637 can_hover => 1, 1821 can_hover => 1,
1638 @_ 1822 @_
1639 ) 1823 )
1640} 1824}
… …
1649 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1650 1834
1651 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1652 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1653 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1654 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1655 } 1839 }
1656} 1840}
1657 1841
1658sub _draw { 1842sub _draw {
1659 my ($self) = @_; 1843 my ($self) = @_;
… …
1664 1848
1665 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;
1666 1850
1667 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1851 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1668 1852
1669 glEnable GL_BLEND; 1853 my $tex = $self->{state} ? $tex[1] : $tex[0];
1854
1670 glEnable GL_TEXTURE_2D; 1855 glEnable GL_TEXTURE_2D;
1671 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1672
1673 my $tex = $self->{state} ? $tex[1] : $tex[0];
1674
1675 $tex->draw_quad (0, 0, $s, $s); 1856 $tex->draw_quad_alpha (0, 0, $s, $s);
1676
1677 glDisable GL_TEXTURE_2D; 1857 glDisable GL_TEXTURE_2D;
1678 glDisable GL_BLEND;
1679} 1858}
1680 1859
1681############################################################################# 1860#############################################################################
1682 1861
1683package CFClient::UI::Image; 1862package CFClient::UI::Image;
… …
1726 glTranslate 0, -$self->{w}, 0; 1905 glTranslate 0, -$self->{w}, 0;
1727 1906
1728 ($w, $h) = ($h, $w); 1907 ($w, $h) = ($h, $w);
1729 } 1908 }
1730 1909
1731 glEnable GL_BLEND;
1732 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1733 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1734 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1911 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1735 1912
1736 $tex->draw_quad (0, 0, $w, $h); 1913 $tex->draw_quad_alpha (0, 0, $w, $h);
1737 1914
1738 glDisable GL_BLEND;
1739 glDisable GL_TEXTURE_2D; 1915 glDisable GL_TEXTURE_2D;
1740} 1916}
1741 1917
1742############################################################################# 1918#############################################################################
1743 1919
… …
1932 qw(s1_slider.png s1_slider_bg.png); 2108 qw(s1_slider.png s1_slider_bg.png);
1933 2109
1934sub new { 2110sub new {
1935 my $class = shift; 2111 my $class = shift;
1936 2112
1937 # range [value, low, high, page] 2113 # range [value, low, high, page, unit]
1938 2114
1939 # TODO: 0-width page 2115 # TODO: 0-width page
1940 # TODO: req_w/h are wrong with vertical 2116 # TODO: req_w/h are wrong with vertical
1941 # TODO: calculations are off 2117 # TODO: calculations are off
1942 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
1943 fg => [1, 1, 1], 2119 fg => [1, 1, 1],
1944 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],
1945 range => [0, 0, 100, 10], 2123 range => [0, 0, 100, 10, 0],
1946 req_w => 20, 2124 req_w => $::WIDTH / 80,
1947 req_h => 20, 2125 req_h => $::WIDTH / 80,
1948 vertical => 0, 2126 vertical => 0,
1949 can_hover => 1, 2127 can_hover => 1,
1950 inner_pad => 5, 2128 inner_pad => 0.02,
1951 @_ 2129 @_
1952 ); 2130 );
1953 2131
2132 $self->set_value ($self->{range}[0]);
2133 $self->update;
2134
1954 $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 }
1955} 2167}
1956 2168
1957sub size_request { 2169sub size_request {
1958 my ($self) = @_; 2170 my ($self) = @_;
1959 2171
… …
1965 2177
1966sub button_down { 2178sub button_down {
1967 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
1968 2180
1969 $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
1970 $self->mouse_motion ($ev, $x, $y); 2185 $self->mouse_motion ($ev, $x, $y);
1971} 2186}
1972 2187
1973sub mouse_motion { 2188sub mouse_motion {
1974 my ($self, $ev, $x, $y) = @_; 2189 my ($self, $ev, $x, $y) = @_;
1975 2190
1976 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
1977 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2208 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100;
1978 2210
1979 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2211 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1980 2212
1981 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2213 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1982 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2214 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1983 2215
1984 $x -= $inner_pad_px; # substract the padding 2216 $value = ($value - $lo) / $range;
1985 $x = $x * ($hi - $lo) / $inner_w + $lo; 2217 $value = $value * $self->{scale} + $self->{offset};
1986 $x = $lo if $x < $lo;
1987 $x = $hi - $page if $x > $hi - $page;
1988 $self->{range}[0] = $x;
1989 2218
1990 $self->emit (changed => $x); 2219 $self->{knob_x} = $value - $knob_w * 0.5;
1991 $self->update; 2220 $self->{knob_w} = $knob_w;
1992 } 2221 });
1993}
1994 2222
1995# the inner_* stuff is for generating a padding for the slider handle, 2223 $self->SUPER::update;
1996# so that the handle doesn't leave the texture. This calculation isn't 100%
1997# correct propably, but it does the job for now
1998sub _calc_inner_pad_px {
1999 my ($self, $w) = @_;
2000 ($w / 100) * $self->{inner_pad} # % to pixels
2001} 2224}
2002 2225
2003sub _draw { 2226sub _draw {
2004 my ($self) = @_; 2227 my ($self) = @_;
2005 2228
2006 $self->SUPER::_draw (); 2229 $self->SUPER::_draw ();
2007 2230
2008 my ($w, $h) = @$self{qw(w h)}; 2231 glScale $self->{w}, $self->{h};
2009 2232
2010 if ($self->{vertical}) { 2233 if ($self->{vertical}) {
2011 # draw a vertical slider like a rotated horizontal slider 2234 # draw a vertical slider like a rotated horizontal slider
2012 2235
2236 glTranslate 1, 0, 0;
2013 glRotate 90, 0, 0, 1; 2237 glRotate 90, 0, 0, 1;
2014 glTranslate 0, -$self->{w}, 0;
2015
2016 ($w, $h) = ($h, $w);
2017 } 2238 }
2018 2239
2019 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2240 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2020 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2241 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2021 2242
2022 my ($value, $lo, $hi, $page) = @{$self->{range}};
2023
2024 $hi = $value + 1 if $lo == $hi;
2025
2026 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2027 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2028
2029 $page = int $page * $inner_w / ($hi - $lo);
2030 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2031
2032 $w -= $page;
2033 $page &= ~1;
2034 glTranslate $page * 0.5, 0, 0;
2035 $page ||= 2;
2036
2037 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2038 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2039
2040 glEnable GL_BLEND;
2041 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2042 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
2043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2044 2245
2045 # draw background 2246 # draw background
2046 $tex[1]->draw_quad (0, 0, $w, $h); 2247 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2047 2248
2048 # draw handle 2249 # draw handle
2049 $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);
2050 2251
2051 glDisable GL_BLEND;
2052 glDisable GL_TEXTURE_2D; 2252 glDisable GL_TEXTURE_2D;
2053} 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 (@_) }
2054 2295
2055############################################################################# 2296#############################################################################
2056 2297
2057package CFClient::UI::TextView; 2298package CFClient::UI::TextView;
2058 2299
… …
2067 fontsize => 1, 2308 fontsize => 1,
2068 can_events => 0, 2309 can_events => 0,
2069 #font => default_font 2310 #font => default_font
2070 @_, 2311 @_,
2071 2312
2072 layout => (new CFClient::Layout), 2313 layout => (new CFClient::Layout 1),
2073 par => [], 2314 par => [],
2074 height => 0, 2315 height => 0,
2075 children => [ 2316 children => [
2076 (new CFClient::UI::Empty expand => 1), 2317 (new CFClient::UI::Empty expand => 1),
2077 (new CFClient::UI::Slider vertical => 1), 2318 (new CFClient::UI::Slider vertical => 1),
2078 ], 2319 ],
2079 ); 2320 );
2080 2321
2081 $self->{children}[1]->connect (changed => sub { 2322 $self->{children}[1]->connect (changed => sub { $self->update });
2082 $self->update;
2083 });
2084 2323
2085 $self 2324 $self
2086} 2325}
2087 2326
2088sub set_fontsize { 2327sub set_fontsize {
2089 my ($self, $fontsize) = @_; 2328 my ($self, $fontsize) = @_;
2090 2329
2091 $self->{fontsize} = $fontsize; 2330 $self->{fontsize} = $fontsize;
2092 $self->reflow; 2331 $self->reflow;
2093}
2094
2095sub text_height {
2096 my ($self, $text) = @_;
2097
2098 my $layout = $self->{layout};
2099
2100 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2101 $layout->set_width ($self->{w});
2102 $layout->set_text ($text);
2103
2104 ($layout->size)[1]
2105}
2106
2107sub reflow {
2108 my ($self) = @_;
2109
2110 $self->{need_reflow}++;
2111 $self->update;
2112} 2332}
2113 2333
2114sub size_allocate { 2334sub size_allocate {
2115 my ($self, $w, $h) = @_; 2335 my ($self, $w, $h) = @_;
2116 2336
… …
2121 $self->{layout}->set_width ($self->{children}[0]{w}); 2341 $self->{layout}->set_width ($self->{children}[0]{w});
2122 2342
2123 $self->reflow; 2343 $self->reflow;
2124} 2344}
2125 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
2126sub add_paragraph { 2380sub add_paragraph {
2127 my ($self, $color, $text) = @_; 2381 my ($self, $color, $text, $indent) = @_;
2128 2382
2129 #TODO: intelligently "reformat" paragraph 2383 for my $line (split /\n/, $text) {
2130 2384 my ($w, $h) = $self->text_size ($line);
2131 my $height = $self->text_height ($text);
2132
2133 $self->{height} += $height; 2385 $self->{height} += $h;
2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2387 }
2134 2388
2135 push @{$self->{par}}, [$height, $color, $text];
2136
2137 $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]);
2138 $self->{children}[1]->update;
2139} 2390}
2140 2391
2141sub update { 2392sub update {
2142 my ($self) = @_; 2393 my ($self) = @_;
2143 2394
… …
2145 2396
2146 return unless $self->{h} > 0; 2397 return unless $self->{h} > 0;
2147 2398
2148 delete $self->{texture}; 2399 delete $self->{texture};
2149 2400
2150 $ROOT->on_refresh ($self, sub { 2401 $ROOT->on_post_alloc ($self, sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403
2151 if (delete $self->{need_reflow}) { 2404 if (delete $self->{need_reflow}) {
2152 my $height = 0; 2405 my $height = 0;
2153 2406
2154 $height += $_->[0] = $self->text_height ($_->[2]) 2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
2155 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 }
2156 2422
2157 $self->{height} = $height; 2423 $self->{height} = $height;
2158 2424
2159 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2160 2426
2161 delete $self->{texture}; 2427 delete $self->{texture};
2162 } 2428 }
2163 2429
2164 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2165 glClearColor 0, 0, 0, 1; 2431 glClearColor 0.5, 0.5, 0.5, 0;
2166 glClear GL_COLOR_BUFFER_BIT; 2432 glClear GL_COLOR_BUFFER_BIT;
2167 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
2168 glEnable GL_BLEND; 2445 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off
2169 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2447 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D;
2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2172
2173 my $top = int $self->{children}[1]{range}[0];
2174
2175 my $y0 = $top;
2176 my $y1 = $top + $self->{h};
2177
2178 my $y = 0;
2179
2180 my $layout = $self->{layout};
2181
2182 $layout->set_font ($self->{font}) if $self->{font};
2183 2448
2184 for my $par (@{$self->{par}}) { 2449 for my $par (@{$self->{par}}) {
2185 my $h = $par->[0]; 2450 my $h = $par->[1];
2186 2451
2187 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]);
2188 $layout->set_text ($par->[2]); 2455 $layout->set_markup ($par->[4]);
2189 2456
2190 glColor @{ $par->[1] }; 2457 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2191 my ($W, $H) = $layout->size; 2458
2192 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;
2193 } 2461 }
2194 2462
2195 $y += $h; 2463 $y += $h;
2196 } 2464 }
2197 2465
2198 glDisable GL_TEXTURE_2D;
2199 glDisable GL_BLEND; 2466 glDisable GL_BLEND;
2200 }; 2467 };
2201 }); 2468 });
2202} 2469}
2203 2470
2204sub _draw { 2471sub _draw {
2205 my ($self) = @_; 2472 my ($self) = @_;
2206 2473
2207 if ($self->{texture}) {
2208 glEnable GL_TEXTURE_2D; 2474 glEnable GL_TEXTURE_2D;
2209 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2475 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2210 glColor 1, 1, 1, 1; 2476 glColor 1, 1, 1, 1;
2211 $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});
2212 glDisable GL_TEXTURE_2D; 2478 glDisable GL_TEXTURE_2D;
2213 }
2214 2479
2215 $self->{children}[1]->draw; 2480 $self->{children}[1]->draw;
2216 2481
2217} 2482}
2218 2483
… …
2286 2551
2287 # TODO: use animation 2552 # TODO: use animation
2288 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2289 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2290 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2291 $self->emit ("open"); 2556 $self->_emit ("open");
2292 } else { 2557 } else {
2293 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2294 $self->emit ("close"); 2559 $self->_emit ("close");
2295 } 2560 }
2296 2561
2297 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2298} 2563}
2299 2564
2300############################################################################# 2565#############################################################################
2301 2566
2302package CFClient::UI::Tooltip; 2567package CFClient::UI::Tooltip;
… …
2312 @_, 2577 @_,
2313 can_events => 0, 2578 can_events => 0,
2314 ) 2579 )
2315} 2580}
2316 2581
2317sub set_markup { 2582sub set_tooltip_from {
2318 my ($self, $text) = @_; 2583 my ($self, $widget) = @_;
2319 2584
2320 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2585 $self->add (new CFClient::UI::Label
2321 $self->{label}->set_markup ($text); 2586 markup => $widget->{tooltip},
2322 $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 );
2323} 2593}
2324 2594
2325sub size_request { 2595sub size_request {
2326 my ($self) = @_; 2596 my ($self) = @_;
2327
2328 $self->child->set_max_size ($::WIDTH * 0.3);
2329 2597
2330 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2598 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2331 2599
2332 ($w + 4, $h + 4) 2600 ($w + 4, $h + 4)
2333} 2601}
… …
2339} 2607}
2340 2608
2341sub _draw { 2609sub _draw {
2342 my ($self) = @_; 2610 my ($self) = @_;
2343 2611
2344 glPushMatrix;
2345 glTranslate 0.375, 0.375; 2612 glTranslate 0.375, 0.375;
2346 2613
2347 my ($w, $h) = @$self{qw(w h)}; 2614 my ($w, $h) = @$self{qw(w h)};
2348 2615
2349 glColor 1, 0.8, 0.4; 2616 glColor 1, 0.8, 0.4;
… …
2360 glVertex 0 , $h; 2627 glVertex 0 , $h;
2361 glVertex $w, $h; 2628 glVertex $w, $h;
2362 glVertex $w, 0; 2629 glVertex $w, 0;
2363 glEnd; 2630 glEnd;
2364 2631
2365 glPopMatrix; 2632 glTranslate 2 - 0.375, 2 - 0.375;
2366
2367 glTranslate 2, 2;
2368 $self->SUPER::_draw; 2633 $self->SUPER::_draw;
2369} 2634}
2370 2635
2371############################################################################# 2636#############################################################################
2372 2637
… …
2377use CFClient::OpenGL; 2642use CFClient::OpenGL;
2378 2643
2379sub new { 2644sub new {
2380 my $class = shift; 2645 my $class = shift;
2381 2646
2382 $class->SUPER::new ( 2647 my $self = $class->SUPER::new (
2383 aspect => 1, 2648 aspect => 1,
2649 can_events => 0,
2384 @_, 2650 @_,
2385 ) 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
2386} 2668}
2387 2669
2388sub size_request { 2670sub size_request {
2389 (32, 8) 2671 (32, 8)
2390} 2672}
2391 2673
2674sub update {
2675 my ($self) = @_;
2676
2677 return unless $self->{visible};
2678
2679 $self->SUPER::update;
2680}
2681
2392sub draw { 2682sub _draw {
2393 my ($self) = @_; 2683 my ($self) = @_;
2394 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
2395 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2696 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2396 2697
2397 if ($tex) { 2698 if ($tex) {
2398 glEnable GL_BLEND;
2399 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2400 glEnable GL_TEXTURE_2D; 2699 glEnable GL_TEXTURE_2D;
2401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2402 glColor 1, 1, 1, 1; 2701 glColor 1, 1, 1, 1;
2403 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2702 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2404 glDisable GL_TEXTURE_2D; 2703 glDisable GL_TEXTURE_2D;
2405 glDisable GL_BLEND;
2406 } 2704 }
2705}
2706
2707sub DESTROY {
2708 my ($self) = @_;
2709
2710 $self->{timer}->cancel
2711 if $self->{timer};
2712
2713 $self->SUPER::DESTROY;
2407} 2714}
2408 2715
2409############################################################################# 2716#############################################################################
2410 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
2411package CFClient::UI::Root; 2949package CFClient::UI::Root;
2412 2950
2413our @ISA = CFClient::UI::Container::; 2951our @ISA = CFClient::UI::Container::;
2414 2952
2415use CFClient::OpenGL; 2953use CFClient::OpenGL;
2416 2954
2417sub check_size { 2955sub new {
2418 my ($self) = @_; 2956 my $class = shift;
2419 2957
2420 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2958 $class->SUPER::new (
2421} 2959 @_,
2422 2960 )
2423sub size_request {
2424 ($::WIDTH, $::HEIGHT)
2425} 2961}
2426 2962
2427sub configure { 2963sub configure {
2428 my ($self, $x, $y, $w, $h) = @_; 2964 my ($self, $x, $y, $w, $h) = @_;
2429 2965
2430 $self->SUPER::configure ($x, $y, $w, $h); 2966 $self->{w} = $w;
2967 $self->{h} = $h;
2968}
2431 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
2432 for my $child (@{$self->{children}}) { 2986 for my $child ($self->children) {
2433 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)};
2434 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
2435 $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;
2436 $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
2437 $child->configure ($X, $Y, $W,$H); 2998 $child->configure ($X, $Y, $W, $H);
2438 } 2999 }
2439} 3000}
2440 3001
2441sub _topleft { 3002sub coord2local {
2442 my ($self, $x, $y) = @_; 3003 my ($self, $x, $y) = @_;
2443 3004
2444 ($x, $y) 3005 ($x, $y)
2445} 3006}
2446 3007
3008sub coord2global {
3009 my ($self, $x, $y) = @_;
3010
3011 ($x, $y)
3012}
3013
2447sub update { 3014sub update {
2448 my ($self) = @_; 3015 my ($self) = @_;
2449 3016
2450 $self->check_size; 3017 $self->check_size;
2451 ::refresh (); 3018 $::WANT_REFRESH++;
2452} 3019}
2453 3020
2454sub add { 3021sub add {
2455 my ($self, $child) = @_; 3022 my ($self, @children) = @_;
2456 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
2457 # integerize window positions 3033 # integerise window positions
2458 $child->{x} = int $child->{x}; 3034 $child->{x} = int $child->{x};
2459 $child->{y} = int $child->{y}; 3035 $child->{y} = int $child->{y};
3036 }
2460 3037
2461 $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 }
2462} 3051}
2463 3052
2464sub on_refresh { 3053sub on_refresh {
2465 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
2466 3055
2467 $self->{refresh_hook}{$id} = $cb; 3056 $self->{refresh_hook}{$id} = $cb;
2468} 3057}
2469 3058
3059sub on_post_alloc {
3060 my ($self, $id, $cb) = @_;
3061
3062 $self->{post_alloc_hook}{$id} = $cb;
3063}
3064
2470sub draw { 3065sub draw {
2471 my ($self) = @_; 3066 my ($self) = @_;
2472 3067
2473 while (my $rcb = delete $self->{refresh_hook}) { 3068 while ($self->{refresh_hook}) {
2474 $_->() 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}};
2475 } 3120 }
2476 3121
2477 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3122 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2478 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3123 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2479 glClear GL_COLOR_BUFFER_BIT; 3124 glClear GL_COLOR_BUFFER_BIT;
2480 3125
2481 glMatrixMode GL_PROJECTION; 3126 glMatrixMode GL_PROJECTION;
2482 glLoadIdentity; 3127 glLoadIdentity;
2483 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3128 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2484 glMatrixMode GL_MODELVIEW; 3129 glMatrixMode GL_MODELVIEW;
2485 glLoadIdentity; 3130 glLoadIdentity;
2486 3131
2487 $self->_draw; 3132 $self->_draw;
2488} 3133}
… …
2490############################################################################# 3135#############################################################################
2491 3136
2492package CFClient::UI; 3137package CFClient::UI;
2493 3138
2494$ROOT = new CFClient::UI::Root; 3139$ROOT = new CFClient::UI::Root;
2495$TOOLTIP = new CFClient::UI::Tooltip; 3140$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2496 3141
24971 31421
2498 3143

Diff Legend

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