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

Diff Legend

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