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.176 by root, Tue Apr 25 12:10:58 2006 UTC vs.
Revision 1.239 by root, Thu May 25 22:29:57 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
674# glColorMask 1, 1, 1, 0; 749 $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 }; 750 };
682} 751}
683 752
684sub _draw { 753sub _draw {
685 my ($self) = @_; 754 my ($self) = @_;
… …
687 my ($w, $h) = ($self->w, $self->h); 756 my ($w, $h) = ($self->w, $self->h);
688 757
689 my $tex = $self->{texture} 758 my $tex = $self->{texture}
690 or return; 759 or return;
691 760
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 761 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 763 glColor 1, 1, 1, 1;
697 764
698 $tex->draw_quad (0, 0, $w, $h); 765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 766
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 767 glDisable GL_TEXTURE_2D;
702} 768}
703 769
704############################################################################# 770#############################################################################
705 771
706package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
707 773
708our @ISA = CFClient::UI::Window::; 774our @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 775
736sub new { 776sub new {
737 my $class = shift; 777 my $class = shift;
738 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
739 my $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 869 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 870 slider => $slider,
742 border => 0.8,
743 @_ 871 @_,
744 ); 872 );
745 873
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider});
877
746 $self 878 $self
747} 879}
748 880
881sub update {
882 my ($self) = @_;
883
884 $self->SUPER::update;
885
886 # todo: overwrite size_allocate of child
887 my $child = $self->{vp}->child;
888 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
889}
890
891sub size_allocate {
892 my ($self, $w, $h) = @_;
893
894 $self->SUPER::size_allocate ($w, $h);
895
896 my $child = $self->{vp}->child;
897 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
898}
899
900#TODO# update range on size_allocate depending on child
901# update viewport offset on scroll
902
903#############################################################################
904
905package CFClient::UI::Frame;
906
907our @ISA = CFClient::UI::Bin::;
908
909use CFClient::OpenGL;
910
911sub new {
912 my $class = shift;
913
914 $class->SUPER::new (
915 bg => undef,
916 @_,
917 )
918}
919
749sub _draw { 920sub _draw {
750 my ($self) = @_; 921 my ($self) = @_;
751 922
752 my ($w, $h) = ($self->{w}, $self->{h}); 923 if ($self->{bg}) {
924 my ($w, $h) = @$self{qw(w h)};
753 925
754 glEnable GL_BLEND; 926 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 927 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 928 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 929
759# glBegin GL_QUADS; 930 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 931 glVertex 0 , 0;
762# glVertex 0 , $h; 932 glVertex 0 , $h;
763# glVertex $w, $h; 933 glVertex $w, $h;
764# glVertex $w, 0; 934 glVertex $w, 0;
765# glEnd; 935 glEnd;
766 936
767
768 $self->child->draw;
769 glDisable GL_BLEND; 937 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 938 }
939
940 $self->SUPER::_draw;
771} 941}
772 942
773############################################################################# 943#############################################################################
774 944
775package CFClient::UI::FancyFrame; 945package CFClient::UI::FancyFrame;
… …
786 my $class = shift; 956 my $class = shift;
787 957
788 # TODO: user_x, user_y, overwrite moveto? 958 # TODO: user_x, user_y, overwrite moveto?
789 959
790 my $self = $class->SUPER::new ( 960 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 961 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 962 border_bg => [1, 1, 1, 1],
793 border => 0.6, 963 border => 0.6,
964 is_toplevel => 1,
794 can_events => 1, 965 can_events => 1,
795 @_ 966 @_
796 ); 967 );
797 968
798 $self->{title} &&= new CFClient::UI::Label 969 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 970 align => 0,
… …
823 my ($self, $w, $h) = @_; 994 my ($self, $w, $h) = @_;
824 995
825 $h -= List::Util::max 0, $self->border * 2; 996 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 997 $w -= List::Util::max 0, $self->border * 2;
827 998
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829 if $self->{title}; 1000 if $self->{title};
830 1001
831 $self->child->configure ($self->border, $self->border, $w, $h); 1002 $self->child->configure ($self->border, $self->border, $w, $h);
832} 1003}
833 1004
… …
891 my ($self) = @_; 1062 my ($self) = @_;
892 1063
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1064 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1065 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 1066
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1067 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1069
901 my $border = $self->border; 1070 my $border = $self->border;
902 1071
903 glColor @{ $self->{border_bg} }; 1072 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1077
1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
909 my $bg = $tex[0]; 1079 my $bg = $tex[0];
910 1080
911 # TODO: repeat texture not scale 1081 # TODO: repeat texture not scale
912 my $rep_x = $cw / $bg->{w}; 1082 my $rep_x = $cw / $bg->{w};
913 my $rep_y = $ch / $bg->{h}; 1083 my $rep_y = $ch / $bg->{h};
914 1084
915 glColor @{ $self->{bg} }; 1085 glColor @{ $self->{bg} };
916 1086
917 $bg->{s} = $rep_x; 1087 $bg->{s} = $rep_x;
918 $bg->{t} = $rep_y; 1088 $bg->{t} = $rep_y;
919 $bg->{wrap_mode} = 1; 1089 $bg->{wrap_mode} = 1;
920 $bg->draw_quad ($border, $border, $cw, $ch); 1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 }
921 1092
922 glDisable GL_TEXTURE_2D; 1093 glDisable GL_TEXTURE_2D;
923 glDisable GL_BLEND;
924 1094
925 $self->{title}->draw if $self->{title}; 1095 $self->{title}->draw if $self->{title};
1096
926 $self->child->draw; 1097 $self->child->draw;
927} 1098}
928 1099
929############################################################################# 1100#############################################################################
930 1101
… …
939sub new { 1110sub new {
940 my $class = shift; 1111 my $class = shift;
941 1112
942 $class->SUPER::new ( 1113 $class->SUPER::new (
943 col_expand => [], 1114 col_expand => [],
944 @_ 1115 @_,
945 ) 1116 )
1117}
1118
1119sub children {
1120 grep $_, map @$_, grep $_, @{ $_[0]{children} }
946} 1121}
947 1122
948sub add { 1123sub add {
949 my ($self, $x, $y, $child) = @_; 1124 my ($self, $x, $y, $child) = @_;
950 1125
951 $child->set_parent ($self); 1126 $child->set_parent ($self);
952 $self->{children}[$y][$x] = $child; 1127 $self->{children}[$y][$x] = $child;
953 1128
954 $child->check_size; 1129 $self->check_size (1);
955} 1130}
956 1131
957sub children {
958 grep $_, map @$_, grep $_, @{ $_[0]{children} }
959}
960
961# TODO: move to container class maybe? send childs a signal on removal? 1132# TODO: move to container class maybe? send children a signal on removal?
962sub clear { 1133sub clear {
963 my ($self) = @_; 1134 my ($self) = @_;
964 1135
965 my @children = $self->children; 1136 my @children = $self->children;
966 delete $self->{children}; 1137 delete $self->{children};
… …
968 for (@children) { 1139 for (@children) {
969 delete $_->{parent}; 1140 delete $_->{parent};
970 $_->hide; 1141 $_->hide;
971 } 1142 }
972 1143
1144 $self->check_size (1);
973 $self->update; 1145 $self->update;
974} 1146}
975 1147
976sub get_wh { 1148sub get_wh {
977 my ($self) = @_; 1149 my ($self) = @_;
… …
1009sub size_allocate { 1181sub size_allocate {
1010 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1011 1183
1012 my ($ws, $hs) = $self->get_wh; 1184 my ($ws, $hs) = $self->get_wh;
1013 1185
1014 my $req_w = sum @$ws; 1186 my $req_w = (sum @$ws) || 1;
1015 my $req_h = sum @$hs; 1187 my $req_h = (sum @$hs) || 1;
1016 1188
1017 # TODO: nicer code && do row_expand 1189 # TODO: nicer code && do row_expand
1018 my @col_expand = @{$self->{col_expand}}; 1190 my @col_expand = @{$self->{col_expand}};
1019 @col_expand = (1) x @$ws unless @col_expand; 1191 @col_expand = (1) x @$ws unless @col_expand;
1020 my $col_expand = (sum @col_expand) || 1; 1192 my $col_expand = (sum @col_expand) || 1;
… …
1154} 1326}
1155 1327
1156sub size_allocate { 1328sub size_allocate {
1157 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1158 1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1159 my $children = $self->{children}; 1333 my $children = $self->{children};
1160 1334
1161 my @h = map $_->{req_h}, @$children; 1335 my @h = map $_->{req_h}, @$children;
1162 1336
1163 my $req_h = List::Util::sum @h; 1337 my $req_h = List::Util::sum @h;
… …
1192 1366
1193############################################################################# 1367#############################################################################
1194 1368
1195package CFClient::UI::Label; 1369package CFClient::UI::Label;
1196 1370
1197our @ISA = CFClient::UI::Base::; 1371our @ISA = CFClient::UI::DrawBG::;
1198 1372
1199use CFClient::OpenGL; 1373use CFClient::OpenGL;
1200 1374
1201sub new { 1375sub new {
1202 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1203 1377
1204 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
1205 fg => [1, 1, 1], 1379 fg => [1, 1, 1],
1380 #bg => none
1381 #active_bg => none
1206 #font => default_font 1382 #font => default_font
1383 #text => initial text
1384 #markup => initial narkup
1385 #max_w => maximum pixel width
1386 ellipsise => 3, # end
1387 layout => (new CFClient::Layout),
1207 fontsize => 1, 1388 fontsize => 1,
1208 text => "",
1209 align => -1, 1389 align => -1,
1210 valign => -1, 1390 valign => -1,
1211 padding => 2, 1391 padding => 2,
1212 layout => new CFClient::Layout,
1213 can_events => 0, 1392 can_events => 0,
1214 %arg 1393 %arg
1215 ); 1394 );
1216 1395
1217 if (exists $self->{template}) { 1396 if (exists $self->{template}) {
1218 my $layout = new CFClient::Layout; 1397 my $layout = new CFClient::Layout;
1219 $layout->set_text (delete $self->{template}); 1398 $layout->set_text (delete $self->{template});
1220 $self->{template} = $layout; 1399 $self->{template} = $layout;
1221 } 1400 }
1222 1401
1223 $self->set_text (delete $self->{text}) if exists $self->{text}; 1402 if (exists $self->{markup}) {
1224 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1403 $self->set_markup (delete $self->{markup});
1404 } else {
1405 $self->set_text (delete $self->{text});
1406 }
1225 1407
1226 $self 1408 $self
1227} 1409}
1228 1410
1229sub escape { 1411sub escape($) {
1230 local $_ = $_[1]; 1412 local $_ = $_[0];
1231 1413
1232 s/&/&amp;/g; 1414 s/&/&amp;/g;
1233 s/>/&gt;/g; 1415 s/>/&gt;/g;
1234 s/</&lt;/g; 1416 s/</&lt;/g;
1235 1417
1236 $_[1] 1418 $_
1237} 1419}
1238 1420
1239sub update { 1421sub update {
1240 my ($self) = @_; 1422 my ($self) = @_;
1241 1423
1242 delete $self->{texture}; 1424 delete $self->{texture};
1243 $self->SUPER::update; 1425 $self->SUPER::update;
1244} 1426}
1245 1427
1246sub reconfigure {
1247 my ($self) = @_;
1248
1249 delete $self->{texture};
1250}
1251
1252sub set_text { 1428sub set_text {
1253 my ($self, $text) = @_; 1429 my ($self, $text) = @_;
1254 1430
1255 return if $self->{text} eq "T$text"; 1431 return if $self->{text} eq "T$text";
1256 $self->{text} = "T$text"; 1432 $self->{text} = "T$text";
1257 1433
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1258 $self->{layout}->set_text ($text); 1435 $self->{layout}->set_text ($text);
1259 1436
1260 delete $self->{texture};
1261 $self->update; 1437 $self->update;
1262 $self->check_size; 1438 $self->check_size;
1263} 1439}
1264 1440
1265sub set_markup { 1441sub set_markup {
1266 my ($self, $markup) = @_; 1442 my ($self, $markup) = @_;
1267 1443
1268 return if $self->{text} eq "M$markup"; 1444 return if $self->{text} eq "M$markup";
1269 $self->{text} = "M$markup"; 1445 $self->{text} = "M$markup";
1270 1446
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448
1449 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1271 $self->{layout}->set_markup ($markup); 1450 $self->{layout}->set_markup ($markup);
1272 1451
1273 delete $self->{texture};
1274 $self->update; 1452 $self->update;
1275 $self->check_size; 1453 $self->check_size;
1276} 1454}
1277 1455
1278sub size_request { 1456sub size_request {
1279 my ($self) = @_; 1457 my ($self) = @_;
1280 1458
1281 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1459 $self->{layout}->set_font ($self->{font}) if $self->{font};
1282 $self->{layout}->set_width ($self->{max_w} || -1); 1460 $self->{layout}->set_width ($self->{max_w} || -1);
1461 $self->{layout}->set_ellipsise ($self->{ellipsise});
1462 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1283 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1463 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1284 1464
1285 my ($w, $h) = $self->{layout}->size; 1465 my ($w, $h) = $self->{layout}->size;
1286 1466
1287 if (exists $self->{template}) { 1467 if (exists $self->{template}) {
… …
1309sub set_fontsize { 1489sub set_fontsize {
1310 my ($self, $fontsize) = @_; 1490 my ($self, $fontsize) = @_;
1311 1491
1312 $self->{fontsize} = $fontsize; 1492 $self->{fontsize} = $fontsize;
1313 delete $self->{texture}; 1493 delete $self->{texture};
1494
1495 $self->update;
1314 $self->check_size; 1496 $self->check_size;
1315 $self->update;
1316} 1497}
1317 1498
1318sub _draw { 1499sub _draw {
1319 my ($self) = @_; 1500 my ($self) = @_;
1320 1501
1502 $self->SUPER::_draw; # draw background, if applicable
1503
1321 my $tex = $self->{texture} ||= do { 1504 my $tex = $self->{texture} ||= do {
1505 $self->{layout}->set_foreground (@{$self->{fg}});
1322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1506 $self->{layout}->set_font ($self->{font}) if $self->{font};
1323 $self->{layout}->set_width ($self->{w}); 1507 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1324 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511
1325 new_from_layout CFClient::Texture $self->{layout} 1512 my $tex = new_from_layout CFClient::Texture $self->{layout};
1513
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1516 : ($self->{w} - $tex->{w}) * 0.5);
1517
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1520 : ($self->{h} - $tex->{h}) * 0.5);
1521
1522 $tex
1326 }; 1523 };
1327 1524
1328 glEnable GL_BLEND;
1329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1330 glEnable GL_TEXTURE_2D; 1525 glEnable GL_TEXTURE_2D;
1331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1332 1527
1528 if ($tex->{format} == GL_ALPHA) {
1333 glColor @{$self->{fg}}; 1529 glColor @{$self->{fg}};
1334
1335 $self->{ox} = int (
1336 $self->{align} < 0 ? $self->{padding}
1337 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1338 : ($self->{w} - $tex->{w}) * 0.5
1339 );
1340
1341 $self->{oy} = int (
1342 $self->{valign} < 0 ? $self->{padding}
1343 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1344 : ($self->{h} - $tex->{h}) * 0.5
1345 );
1346
1347 $tex->draw_quad ($self->{ox}, $self->{oy}); 1530 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1531 } else {
1532 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1533 }
1348 1534
1349 glDisable GL_TEXTURE_2D; 1535 glDisable GL_TEXTURE_2D;
1350 glDisable GL_BLEND;
1351} 1536}
1352 1537
1353############################################################################# 1538#############################################################################
1354 1539
1355package CFClient::UI::EntryBase; 1540package CFClient::UI::EntryBase;
… …
1368 active_fg => [0, 0, 0], 1553 active_fg => [0, 0, 0],
1369 can_hover => 1, 1554 can_hover => 1,
1370 can_focus => 1, 1555 can_focus => 1,
1371 valign => 0, 1556 valign => 0,
1372 can_events => 1, 1557 can_events => 1,
1558 #text => ...
1373 @_ 1559 @_
1374 ) 1560 )
1375} 1561}
1376 1562
1377sub _set_text { 1563sub _set_text {
… …
1387 $self->{text} = $text; 1573 $self->{text} = $text;
1388 1574
1389 $text =~ s/./*/g if $self->{hidden}; 1575 $text =~ s/./*/g if $self->{hidden};
1390 $self->{layout}->set_text ("$text "); 1576 $self->{layout}->set_text ("$text ");
1391 1577
1392 $self->emit (changed => $self->{text}); 1578 $self->_emit (changed => $self->{text});
1393}
1394
1395sub get_text {
1396 $_[0]{text}
1397}
1398
1399sub size_request {
1400 my ($self) = @_;
1401
1402 my ($w, $h) = $self->SUPER::size_request;
1403
1404 ($w + 1, $h) # add 1 for cursor
1405}
1406
1407sub size_allocate {
1408 my ($self, $w, $h) = @_;
1409
1410 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1411} 1579}
1412 1580
1413sub set_text { 1581sub set_text {
1414 my ($self, $text) = @_; 1582 my ($self, $text) = @_;
1415 1583
1416 $self->{cursor} = length $text; 1584 $self->{cursor} = length $text;
1417 $self->_set_text ($text); 1585 $self->_set_text ($text);
1418 $self->update; 1586 $self->update;
1587 $self->check_size;
1588}
1589
1590sub get_text {
1591 $_[0]{text}
1592}
1593
1594sub size_request {
1595 my ($self) = @_;
1596
1597 my ($w, $h) = $self->SUPER::size_request;
1598
1599 ($w + 1, $h) # add 1 for cursor
1419} 1600}
1420 1601
1421sub key_down { 1602sub key_down {
1422 my ($self, $ev) = @_; 1603 my ($self, $ev) = @_;
1423 1604
… …
1425 my $sym = $ev->{sym}; 1606 my $sym = $ev->{sym};
1426 my $uni = $ev->{unicode}; 1607 my $uni = $ev->{unicode};
1427 1608
1428 my $text = $self->get_text; 1609 my $text = $self->get_text;
1429 1610
1430 if ($sym == 8) { 1611 if ($uni == 8) {
1431 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1612 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1432 } elsif ($sym == 127) { 1613 } elsif ($uni == 127) {
1433 substr $text, $self->{cursor}, 1, ""; 1614 substr $text, $self->{cursor}, 1, "";
1434 } elsif ($sym == CFClient::SDLK_LEFT) { 1615 } elsif ($sym == CFClient::SDLK_LEFT) {
1435 --$self->{cursor} if $self->{cursor}; 1616 --$self->{cursor} if $self->{cursor};
1436 } elsif ($sym == CFClient::SDLK_RIGHT) { 1617 } elsif ($sym == CFClient::SDLK_RIGHT) {
1437 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1618 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1438 } elsif ($sym == CFClient::SDLK_HOME) { 1619 } elsif ($sym == CFClient::SDLK_HOME) {
1439 $self->{cursor} = 0; 1620 $self->{cursor} = 0;
1440 } elsif ($sym == CFClient::SDLK_END) { 1621 } elsif ($sym == CFClient::SDLK_END) {
1441 $self->{cursor} = length $text; 1622 $self->{cursor} = length $text;
1442 } elsif ($sym == 27) { 1623 } elsif ($uni == 27) {
1443 $self->emit ('escape'); 1624 $self->_emit ('escape');
1444 } elsif ($uni) { 1625 } elsif ($uni) {
1445 substr $text, $self->{cursor}++, 0, chr $uni; 1626 substr $text, $self->{cursor}++, 0, chr $uni;
1446 } 1627 }
1447 1628
1448 $self->_set_text ($text); 1629 $self->_set_text ($text);
1449 $self->update; 1630 $self->update;
1631 $self->check_size;
1450} 1632}
1451 1633
1452sub focus_in { 1634sub focus_in {
1453 my ($self) = @_; 1635 my ($self) = @_;
1454 1636
… …
1534 if ($sym == 13) { 1716 if ($sym == 13) {
1535 unshift @{$self->{history}}, 1717 unshift @{$self->{history}},
1536 my $txt = $self->get_text; 1718 my $txt = $self->get_text;
1537 $self->{history_pointer} = -1; 1719 $self->{history_pointer} = -1;
1538 $self->{history_saveback} = ''; 1720 $self->{history_saveback} = '';
1539 $self->emit (activate => $txt); 1721 $self->_emit (activate => $txt);
1540 $self->update; 1722 $self->update;
1541 1723
1542 } elsif ($sym == CFClient::SDLK_UP) { 1724 } elsif ($sym == CFClient::SDLK_UP) {
1543 if ($self->{history_pointer} < 0) { 1725 if ($self->{history_pointer} < 0) {
1544 $self->{history_saveback} = $self->get_text; 1726 $self->{history_saveback} = $self->get_text;
… …
1583 my $class = shift; 1765 my $class = shift;
1584 1766
1585 $class->SUPER::new ( 1767 $class->SUPER::new (
1586 padding => 4, 1768 padding => 4,
1587 fg => [1, 1, 1], 1769 fg => [1, 1, 1],
1588 bg => [1, 1, 1, 0.2],
1589 active_fg => [0, 0, 1], 1770 active_fg => [0, 0, 1],
1590 can_hover => 1, 1771 can_hover => 1,
1591 align => 0, 1772 align => 0,
1592 valign => 0, 1773 valign => 0,
1593 can_events => 1, 1774 can_events => 1,
1594 @_ 1775 @_
1595 ) 1776 )
1596} 1777}
1597 1778
1779sub activate { }
1780
1598sub button_up { 1781sub button_up {
1599 my ($self, $ev, $x, $y) = @_; 1782 my ($self, $ev, $x, $y) = @_;
1600 1783
1784 $self->emit ("activate")
1601 if ($x >= 0 && $x < $self->{w} 1785 if $x >= 0 && $x < $self->{w}
1602 && $y >= 0 && $y < $self->{h}) { 1786 && $y >= 0 && $y < $self->{h};
1603 $self->emit ("activate");
1604 }
1605} 1787}
1606 1788
1607sub _draw { 1789sub _draw {
1608 my ($self) = @_; 1790 my ($self) = @_;
1609 1791
… …
1611 1793
1612 if ($GRAB == $self) { 1794 if ($GRAB == $self) {
1613 $self->{fg} = $self->{active_fg}; 1795 $self->{fg} = $self->{active_fg};
1614 } 1796 }
1615 1797
1616 glEnable GL_BLEND;
1617 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1618 glEnable GL_TEXTURE_2D; 1798 glEnable GL_TEXTURE_2D;
1619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1620 glColor 0, 0, 0, 1; 1800 glColor 0, 0, 0, 1;
1621 1801
1622 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1802 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1623 1803
1624 glDisable GL_TEXTURE_2D; 1804 glDisable GL_TEXTURE_2D;
1625 glDisable GL_BLEND;
1626 1805
1627 $self->SUPER::_draw; 1806 $self->SUPER::_draw;
1628} 1807}
1629 1808
1630############################################################################# 1809#############################################################################
… …
1644 1823
1645 $class->SUPER::new ( 1824 $class->SUPER::new (
1646 padding => 2, 1825 padding => 2,
1647 fg => [1, 1, 1], 1826 fg => [1, 1, 1],
1648 active_fg => [1, 1, 0], 1827 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5],
1649 state => 0, 1830 state => 0,
1650 can_hover => 1, 1831 can_hover => 1,
1651 @_ 1832 @_
1652 ) 1833 )
1653} 1834}
… …
1662 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1663 1844
1664 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1665 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1666 $self->{state} = !$self->{state}; 1847 $self->{state} = !$self->{state};
1667 $self->emit (changed => $self->{state}); 1848 $self->_emit (changed => $self->{state});
1668 } 1849 }
1669} 1850}
1670 1851
1671sub _draw { 1852sub _draw {
1672 my ($self) = @_; 1853 my ($self) = @_;
… …
1677 1858
1678 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1679 1860
1680 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1681 1862
1682 glEnable GL_BLEND; 1863 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864
1683 glEnable GL_TEXTURE_2D; 1865 glEnable GL_TEXTURE_2D;
1684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1685
1686 my $tex = $self->{state} ? $tex[1] : $tex[0];
1687
1688 $tex->draw_quad (0, 0, $s, $s); 1866 $tex->draw_quad_alpha (0, 0, $s, $s);
1689
1690 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND;
1692} 1868}
1693 1869
1694############################################################################# 1870#############################################################################
1695 1871
1696package CFClient::UI::Image; 1872package CFClient::UI::Image;
… …
1739 glTranslate 0, -$self->{w}, 0; 1915 glTranslate 0, -$self->{w}, 0;
1740 1916
1741 ($w, $h) = ($h, $w); 1917 ($w, $h) = ($h, $w);
1742 } 1918 }
1743 1919
1744 glEnable GL_BLEND;
1745 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746 glEnable GL_TEXTURE_2D; 1920 glEnable GL_TEXTURE_2D;
1747 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1748 1922
1749 $tex->draw_quad (0, 0, $w, $h); 1923 $tex->draw_quad_alpha (0, 0, $w, $h);
1750 1924
1751 glDisable GL_BLEND;
1752 glDisable GL_TEXTURE_2D; 1925 glDisable GL_TEXTURE_2D;
1753} 1926}
1754 1927
1755############################################################################# 1928#############################################################################
1756 1929
… …
1945 qw(s1_slider.png s1_slider_bg.png); 2118 qw(s1_slider.png s1_slider_bg.png);
1946 2119
1947sub new { 2120sub new {
1948 my $class = shift; 2121 my $class = shift;
1949 2122
1950 # range [value, low, high, page] 2123 # range [value, low, high, page, unit]
1951 2124
1952 # TODO: 0-width page 2125 # TODO: 0-width page
1953 # TODO: req_w/h are wrong with vertical 2126 # TODO: req_w/h are wrong with vertical
1954 # TODO: calculations are off 2127 # TODO: calculations are off
1955 my $self = $class->SUPER::new ( 2128 my $self = $class->SUPER::new (
1956 fg => [1, 1, 1], 2129 fg => [1, 1, 1],
1957 active_fg => [0, 0, 0], 2130 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5],
1958 range => [0, 0, 100, 10], 2133 range => [0, 0, 100, 10, 0],
1959 req_w => 20, 2134 req_w => $::WIDTH / 80,
1960 req_h => 20, 2135 req_h => $::WIDTH / 80,
1961 vertical => 0, 2136 vertical => 0,
1962 can_hover => 1, 2137 can_hover => 1,
1963 inner_pad => 5, 2138 inner_pad => 0.02,
1964 @_ 2139 @_
1965 ); 2140 );
1966 2141
2142 $self->set_value ($self->{range}[0]);
2143 $self->update;
2144
1967 $self 2145 $self
2146}
2147
2148sub set_range {
2149 my ($self, $range) = @_;
2150
2151 ($range, $self->{range}) = ($self->{range}, $range);
2152
2153 $self->update
2154 if "@$range" ne "@{$self->{range}}";
2155}
2156
2157sub set_value {
2158 my ($self, $value) = @_;
2159
2160 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2161
2162 $hi = $lo + 1 if $hi <= $lo;
2163
2164 $page = $hi - $lo if $page > $hi - $lo;
2165
2166 $value = $lo if $value < $lo;
2167 $value = $hi - $page if $value > $hi - $page;
2168
2169 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2170 if $unit;
2171
2172 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2173
2174 if ($value != $old_value) {
2175 $self->_emit (changed => $value);
2176 $self->update;
2177 }
1968} 2178}
1969 2179
1970sub size_request { 2180sub size_request {
1971 my ($self) = @_; 2181 my ($self) = @_;
1972 2182
… …
1978 2188
1979sub button_down { 2189sub button_down {
1980 my ($self, $ev, $x, $y) = @_; 2190 my ($self, $ev, $x, $y) = @_;
1981 2191
1982 $self->SUPER::button_down ($ev, $x, $y); 2192 $self->SUPER::button_down ($ev, $x, $y);
2193
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195
1983 $self->mouse_motion ($ev, $x, $y); 2196 $self->mouse_motion ($ev, $x, $y);
1984} 2197}
1985 2198
1986sub mouse_motion { 2199sub mouse_motion {
1987 my ($self, $ev, $x, $y) = @_; 2200 my ($self, $ev, $x, $y) = @_;
1988 2201
1989 if ($GRAB == $self) { 2202 if ($GRAB == $self) {
2203 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2204
2205 my (undef, $lo, $hi, $page) = @{$self->{range}};
2206
2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208
2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2210 }
2211}
2212
2213sub update {
2214 my ($self) = @_;
2215
2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2217 $self->set_value ($self->{range}[0]);
2218
1990 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2219 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100;
1991 2221
1992 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2222 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1993 2223
1994 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2224 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1995 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2225 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1996 2226
1997 $x -= $inner_pad_px; # substract the padding 2227 $value = ($value - $lo) / $range;
1998 $x = $x * ($hi - $lo) / $inner_w + $lo; 2228 $value = $value * $self->{scale} + $self->{offset};
1999 $x = $lo if $x < $lo;
2000 $x = $hi - $page if $x > $hi - $page;
2001 $self->{range}[0] = $x;
2002 2229
2003 $self->emit (changed => $x); 2230 $self->{knob_x} = $value - $knob_w * 0.5;
2004 $self->update; 2231 $self->{knob_w} = $knob_w;
2005 } 2232 });
2006}
2007 2233
2008# the inner_* stuff is for generating a padding for the slider handle, 2234 $self->SUPER::update;
2009# so that the handle doesn't leave the texture. This calculation isn't 100%
2010# correct propably, but it does the job for now
2011sub _calc_inner_pad_px {
2012 my ($self, $w) = @_;
2013 ($w / 100) * $self->{inner_pad} # % to pixels
2014} 2235}
2015 2236
2016sub _draw { 2237sub _draw {
2017 my ($self) = @_; 2238 my ($self) = @_;
2018 2239
2019 $self->SUPER::_draw (); 2240 $self->SUPER::_draw ();
2020 2241
2021 my ($w, $h) = @$self{qw(w h)}; 2242 glScale $self->{w}, $self->{h};
2022 2243
2023 if ($self->{vertical}) { 2244 if ($self->{vertical}) {
2024 # draw a vertical slider like a rotated horizontal slider 2245 # draw a vertical slider like a rotated horizontal slider
2025 2246
2247 glTranslate 1, 0, 0;
2026 glRotate 90, 0, 0, 1; 2248 glRotate 90, 0, 0, 1;
2027 glTranslate 0, -$self->{w}, 0;
2028
2029 ($w, $h) = ($h, $w);
2030 } 2249 }
2031 2250
2032 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2251 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2033 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2252 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2034 2253
2035 my ($value, $lo, $hi, $page) = @{$self->{range}};
2036
2037 $hi = $value + 1 if $lo == $hi;
2038
2039 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2040 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2041
2042 $page = int $page * $inner_w / ($hi - $lo);
2043 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2044
2045 $w -= $page;
2046 $page &= ~1;
2047 glTranslate $page * 0.5, 0, 0;
2048 $page ||= 2;
2049
2050 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2051 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2052
2053 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2254 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2256
2058 # draw background 2257 # draw background
2059 $tex[1]->draw_quad (0, 0, $w, $h); 2258 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2060 2259
2061 # draw handle 2260 # draw handle
2062 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2261 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2063 2262
2064 glDisable GL_BLEND;
2065 glDisable GL_TEXTURE_2D; 2263 glDisable GL_TEXTURE_2D;
2066} 2264}
2265
2266#############################################################################
2267
2268package CFClient::UI::ValSlider;
2269
2270our @ISA = CFClient::UI::HBox::;
2271
2272sub new {
2273 my ($class, %arg) = @_;
2274
2275 my $range = delete $arg{range};
2276
2277 my $self = $class->SUPER::new (
2278 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2279 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2280 to_value => sub { shift },
2281 from_value => sub { shift },
2282 %arg,
2283 );
2284
2285 $self->{slider}->connect (changed => sub {
2286 my ($self, $value) = @_;
2287 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2288 $self->{parent}->emit (changed => $value);
2289 });
2290
2291# $self->{entry}->connect (changed => sub {
2292# my ($self, $value) = @_;
2293# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2294# $self->{parent}->emit (changed => $value);
2295# });
2296
2297 $self->add ($self->{slider}, $self->{entry});
2298
2299 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2300
2301 $self
2302}
2303
2304sub set_range { shift->{slider}->set_range (@_) }
2305sub set_value { shift->{slider}->set_value (@_) }
2067 2306
2068############################################################################# 2307#############################################################################
2069 2308
2070package CFClient::UI::TextView; 2309package CFClient::UI::TextView;
2071 2310
… …
2080 fontsize => 1, 2319 fontsize => 1,
2081 can_events => 0, 2320 can_events => 0,
2082 #font => default_font 2321 #font => default_font
2083 @_, 2322 @_,
2084 2323
2085 layout => (new CFClient::Layout), 2324 layout => (new CFClient::Layout 1),
2086 par => [], 2325 par => [],
2087 height => 0, 2326 height => 0,
2088 children => [ 2327 children => [
2089 (new CFClient::UI::Empty expand => 1), 2328 (new CFClient::UI::Empty expand => 1),
2090 (new CFClient::UI::Slider vertical => 1), 2329 (new CFClient::UI::Slider vertical => 1),
… …
2101 2340
2102 $self->{fontsize} = $fontsize; 2341 $self->{fontsize} = $fontsize;
2103 $self->reflow; 2342 $self->reflow;
2104} 2343}
2105 2344
2106sub text_height {
2107 my ($self, $text) = @_;
2108
2109 my $layout = $self->{layout};
2110
2111 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2112 $layout->set_width ($self->{children}[0]{w});
2113 $layout->set_text ($text);
2114
2115 ($layout->size)[1]
2116}
2117
2118sub reflow {
2119 my ($self) = @_;
2120
2121 $self->{need_reflow}++;
2122 $self->update;
2123}
2124
2125sub size_allocate { 2345sub size_allocate {
2126 my ($self, $w, $h) = @_; 2346 my ($self, $w, $h) = @_;
2127 2347
2128 $self->SUPER::size_allocate ($w, $h); 2348 $self->SUPER::size_allocate ($w, $h);
2129 2349
… …
2132 $self->{layout}->set_width ($self->{children}[0]{w}); 2352 $self->{layout}->set_width ($self->{children}[0]{w});
2133 2353
2134 $self->reflow; 2354 $self->reflow;
2135} 2355}
2136 2356
2357sub text_size {
2358 my ($self, $text, $indent) = @_;
2359
2360 my $layout = $self->{layout};
2361
2362 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2363 $layout->set_width ($self->{children}[0]{w} - $indent);
2364 $layout->set_markup ($text);
2365
2366 $layout->size
2367}
2368
2369sub reflow {
2370 my ($self) = @_;
2371
2372 $self->{need_reflow}++;
2373 $self->update;
2374}
2375
2376sub set_offset {
2377 my ($self, $offset) = @_;
2378
2379 # todo: base offset on lines or so, not on pixels
2380 $self->{children}[1]->set_value ($offset);
2381}
2382
2383sub clear {
2384 my ($self) = @_;
2385
2386 $self->{par} = [];
2387 $self->{height} = 0;
2388 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2389}
2390
2137sub add_paragraph { 2391sub add_paragraph {
2138 my ($self, $color, $text) = @_; 2392 my ($self, $color, $text, $indent) = @_;
2139 2393
2140 #TODO: intelligently "reformat" paragraph 2394 for my $line (split /\n/, $text) {
2141 2395 my ($w, $h) = $self->text_size ($line);
2142 my $height = $self->text_height ($text);
2143
2144 $self->{height} += $height; 2396 $self->{height} += $h;
2397 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2398 }
2145 2399
2146 push @{$self->{par}}, [$height, $color, $text];
2147
2148 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2400 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2149 $self->{children}[1]->update;
2150} 2401}
2151 2402
2152sub update { 2403sub update {
2153 my ($self) = @_; 2404 my ($self) = @_;
2154 2405
… …
2156 2407
2157 return unless $self->{h} > 0; 2408 return unless $self->{h} > 0;
2158 2409
2159 delete $self->{texture}; 2410 delete $self->{texture};
2160 2411
2161 $ROOT->on_refresh ($self, sub { 2412 $ROOT->on_post_alloc ($self, sub {
2413 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2414
2162 if (delete $self->{need_reflow}) { 2415 if (delete $self->{need_reflow}) {
2163 my $height = 0; 2416 my $height = 0;
2164 2417
2165 $height += $_->[0] = $self->text_height ($_->[2]) 2418 my $layout = $self->{layout};
2419
2420 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2421
2166 for @{$self->{par}}; 2422 for (@{$self->{par}}) {
2423 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2424 $layout->set_width ($W - $_->[3]);
2425 $layout->set_markup ($_->[4]);
2426 my ($w, $h) = $layout->size;
2427 $_->[0] = $w + $_->[3];
2428 $_->[1] = $h;
2429 }
2430
2431 $height += $_->[1];
2432 }
2167 2433
2168 $self->{height} = $height; 2434 $self->{height} = $height;
2169 2435
2170 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2436 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2171 2437
2172 delete $self->{texture}; 2438 delete $self->{texture};
2173 } 2439 }
2174 2440
2175 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2176 glClearColor 0, 0, 0, 0; 2442 glClearColor 0.5, 0.5, 0.5, 0;
2177 glClear GL_COLOR_BUFFER_BIT; 2443 glClear GL_COLOR_BUFFER_BIT;
2178 2444
2445 my $top = int $self->{children}[1]{range}[0];
2446
2447 my $y0 = $top;
2448 my $y1 = $top + $H;
2449
2450 my $y = 0;
2451
2452 my $layout = $self->{layout};
2453
2454 $layout->set_font ($self->{font}) if $self->{font};
2455
2179 glEnable GL_BLEND; 2456 glEnable GL_BLEND;
2457 #TODO# not correct in windows where rgba is forced off
2180 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2458 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2181 glEnable GL_TEXTURE_2D;
2182 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2183
2184 my $top = int $self->{children}[1]{range}[0];
2185
2186 my $y0 = $top;
2187 my $y1 = $top + $self->{h};
2188
2189 my $y = 0;
2190
2191 my $layout = $self->{layout};
2192
2193 $layout->set_font ($self->{font}) if $self->{font};
2194 2459
2195 for my $par (@{$self->{par}}) { 2460 for my $par (@{$self->{par}}) {
2196 my $h = $par->[0]; 2461 my $h = $par->[1];
2197 2462
2198 if ($y0 < $y + $h && $y < $y1) { 2463 if ($y0 < $y + $h && $y < $y1) {
2464 $layout->set_foreground (@{ $par->[2] });
2465 $layout->set_width ($W - $par->[3]);
2199 $layout->set_text ($par->[2]); 2466 $layout->set_markup ($par->[4]);
2200 2467
2201 glColor @{ $par->[1] }; 2468 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2202 my ($W, $H) = $layout->size; 2469
2203 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2470 glRasterPos $par->[3], $y - $y0;
2471 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2204 } 2472 }
2205 2473
2206 $y += $h; 2474 $y += $h;
2207 } 2475 }
2208 2476
2209 glDisable GL_TEXTURE_2D;
2210 glDisable GL_BLEND; 2477 glDisable GL_BLEND;
2211 }; 2478 };
2212 }); 2479 });
2213} 2480}
2214 2481
2215sub _draw { 2482sub _draw {
2216 my ($self) = @_; 2483 my ($self) = @_;
2217 2484
2218 glEnable GL_BLEND;
2219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2220 glEnable GL_TEXTURE_2D; 2485 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222 glColor 1, 1, 1, 1; 2487 glColor 1, 1, 1, 1;
2223 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2488 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2224 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2225 glDisable GL_BLEND;
2226 2490
2227 $self->{children}[1]->draw; 2491 $self->{children}[1]->draw;
2228 2492
2229} 2493}
2230 2494
… …
2298 2562
2299 # TODO: use animation 2563 # TODO: use animation
2300 if ($self->{state} = !$self->{state}) { 2564 if ($self->{state} = !$self->{state}) {
2301 $CFClient::UI::ROOT->add ($self->{other}); 2565 $CFClient::UI::ROOT->add ($self->{other});
2302 $self->{other}->move ($self->coord2global (0, $self->{h})); 2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2303 $self->emit ("open"); 2567 $self->_emit ("open");
2304 } else { 2568 } else {
2305 $CFClient::UI::ROOT->remove ($self->{other}); 2569 $CFClient::UI::ROOT->remove ($self->{other});
2306 $self->emit ("close"); 2570 $self->_emit ("close");
2307 } 2571 }
2308 2572
2309 $self->emit (changed => $self->{state}); 2573 $self->_emit (changed => $self->{state});
2310} 2574}
2311 2575
2312############################################################################# 2576#############################################################################
2313 2577
2314package CFClient::UI::Tooltip; 2578package CFClient::UI::Tooltip;
… …
2324 @_, 2588 @_,
2325 can_events => 0, 2589 can_events => 0,
2326 ) 2590 )
2327} 2591}
2328 2592
2329sub set_markup { 2593sub set_tooltip_from {
2330 my ($self, $text) = @_; 2594 my ($self, $widget) = @_;
2331 2595
2332 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2596 $self->add (new CFClient::UI::Label
2333 $self->{label}->set_markup ($text); 2597 markup => $widget->{tooltip},
2334 $self->add ($self->{label}); 2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8,
2600 fg => [0, 0, 0, 1],
2601 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP),
2603 );
2335} 2604}
2336 2605
2337sub size_request { 2606sub size_request {
2338 my ($self) = @_; 2607 my ($self) = @_;
2339
2340 $self->child->set_max_size ($::WIDTH * 0.3);
2341 2608
2342 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2609 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2343 2610
2344 ($w + 4, $h + 4) 2611 ($w + 4, $h + 4)
2345} 2612}
… …
2351} 2618}
2352 2619
2353sub _draw { 2620sub _draw {
2354 my ($self) = @_; 2621 my ($self) = @_;
2355 2622
2356 glPushMatrix;
2357 glTranslate 0.375, 0.375; 2623 glTranslate 0.375, 0.375;
2358 2624
2359 my ($w, $h) = @$self{qw(w h)}; 2625 my ($w, $h) = @$self{qw(w h)};
2360 2626
2361 glColor 1, 0.8, 0.4; 2627 glColor 1, 0.8, 0.4;
… …
2372 glVertex 0 , $h; 2638 glVertex 0 , $h;
2373 glVertex $w, $h; 2639 glVertex $w, $h;
2374 glVertex $w, 0; 2640 glVertex $w, 0;
2375 glEnd; 2641 glEnd;
2376 2642
2377 glPopMatrix; 2643 glTranslate 2 - 0.375, 2 - 0.375;
2378
2379 glTranslate 2, 2;
2380 $self->SUPER::_draw; 2644 $self->SUPER::_draw;
2381} 2645}
2382 2646
2383############################################################################# 2647#############################################################################
2384 2648
… …
2389use CFClient::OpenGL; 2653use CFClient::OpenGL;
2390 2654
2391sub new { 2655sub new {
2392 my $class = shift; 2656 my $class = shift;
2393 2657
2394 $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2395 aspect => 1, 2659 aspect => 1,
2660 can_events => 0,
2396 @_, 2661 @_,
2397 ) 2662 );
2663
2664 if ($self->{anim} && $self->{animspeed}) {
2665 Scalar::Util::weaken (my $widget = $self);
2666
2667 $self->{timer} = Event->timer (
2668 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2669 hard => 1,
2670 interval => $self->{animspeed},
2671 cb => sub {
2672 ++$widget->{frame};
2673 $widget->update;
2674 },
2675 );
2676 }
2677
2678 $self
2398} 2679}
2399 2680
2400sub size_request { 2681sub size_request {
2401 (32, 8) 2682 (32, 8)
2402} 2683}
2403 2684
2685sub update {
2686 my ($self) = @_;
2687
2688 return unless $self->{visible};
2689
2690 $self->SUPER::update;
2691}
2692
2404sub draw { 2693sub _draw {
2405 my ($self) = @_; 2694 my ($self) = @_;
2406 2695
2696 return unless $::CONN;
2697
2698 my $face;
2699
2700 if ($self->{frame}) {
2701 my $anim = $::CONN->{anim}[$self->{anim}];
2702
2703 $face = $anim->[ $self->{frame} % @$anim ]
2704 if $anim && @$anim;
2705 }
2706
2407 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2707 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2408 2708
2409 if ($tex) { 2709 if ($tex) {
2410 glEnable GL_BLEND;
2411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2412 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
2413 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2414 glColor 1, 1, 1, 1; 2712 glColor 1, 1, 1, 1;
2415 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2713 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2416 glDisable GL_TEXTURE_2D; 2714 glDisable GL_TEXTURE_2D;
2417 glDisable GL_BLEND;
2418 } 2715 }
2716}
2717
2718sub DESTROY {
2719 my ($self) = @_;
2720
2721 $self->{timer}->cancel
2722 if $self->{timer};
2723
2724 $self->SUPER::DESTROY;
2419} 2725}
2420 2726
2421############################################################################# 2727#############################################################################
2422 2728
2729package CFClient::UI::Inventory;
2730
2731our @ISA = CFClient::UI::ScrolledWindow::;
2732
2733sub new {
2734 my $class = shift;
2735
2736 my $self = $class->SUPER::new (
2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738 @_,
2739 );
2740
2741 $self
2742}
2743
2744sub set_items {
2745 my ($self, $items) = @_;
2746
2747 $self->{scrolled}->clear;
2748 return unless $items;
2749
2750 my @items = sort {
2751 ($a->{type} <=> $b->{type})
2752 or ($a->{name} cmp $b->{name})
2753 } @$items;
2754
2755 $self->{real_items} = \@items;
2756
2757 my $row = 0;
2758 for my $item (@items) {
2759 CFClient::Item::update_widgets $item;
2760
2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765 $row++;
2766 }
2767}
2768
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2772}
2773
2774#############################################################################
2775
2776package CFClient::UI::Menu;
2777
2778our @ISA = CFClient::UI::FancyFrame::;
2779
2780use CFClient::OpenGL;
2781
2782sub new {
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 items => [],
2787 z => 100,
2788 @_,
2789 );
2790
2791 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2792
2793 for my $item (@{ $self->{items} }) {
2794 my ($widget, $cb) = @$item;
2795
2796 # handle various types of items, only text for now
2797 if (!ref $widget) {
2798 $widget = new CFClient::UI::Label
2799 can_hover => 1,
2800 can_events => 1,
2801 text => $widget;
2802 }
2803
2804 $self->{item}{$widget} = $item;
2805
2806 $self->{vbox}->add ($widget);
2807 }
2808
2809 $self
2810}
2811
2812# popup given the event (must be a mouse button down event currently)
2813sub popup {
2814 my ($self, $ev) = @_;
2815
2816 $self->_emit ("popdown");
2817
2818 # maybe save $GRAB? must be careful about events...
2819 $GRAB = $self;
2820 $self->{button} = $ev->{button};
2821
2822 $self->show;
2823 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824}
2825
2826sub mouse_motion {
2827 my ($self, $ev, $x, $y) = @_;
2828
2829 # TODO: should use vbox->find_widget or so
2830 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2831 $self->{hover} = $self->{item}{$HOVER};
2832}
2833
2834sub button_up {
2835 my ($self, $ev, $x, $y) = @_;
2836
2837 if ($ev->{button} == $self->{button}) {
2838 undef $GRAB;
2839 $self->hide;
2840
2841 $self->_emit ("popdown");
2842 $self->{hover}[1]->() if $self->{hover};
2843 }
2844}
2845
2846#############################################################################
2847
2848package CFClient::UI::Statusbox;
2849
2850our @ISA = CFClient::UI::VBox::;
2851
2852sub new {
2853 my $class = shift;
2854
2855 $class->SUPER::new (
2856 fontsize => 0.8,
2857 @_,
2858 )
2859}
2860
2861sub reorder {
2862 my ($self) = @_;
2863 my $NOW = time;
2864
2865 while (my ($k, $v) = each %{ $self->{item} }) {
2866 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2867 }
2868
2869 my @widgets;
2870
2871 my @items = sort {
2872 $a->{pri} <=> $b->{pri}
2873 or $b->{id} <=> $a->{id}
2874 } values %{ $self->{item} };
2875
2876 my $count = 10 + 1;
2877 for my $item (@items) {
2878 last unless --$count;
2879
2880 push @widgets, $item->{label} ||= do {
2881 # TODO: doesn't handle markup well (read as: at all)
2882 my $short = $item->{count} > 1
2883 ? "<b>$item->{count} ×</b> $item->{text}"
2884 : $item->{text};
2885
2886 for ($short) {
2887 s/^\s+//;
2888 s/\s+/ /g;
2889 }
2890
2891 new CFClient::UI::Label
2892 markup => $short,
2893 tooltip => $item->{tooltip},
2894 tooltip_font => $::FONT_PROP,
2895 tooltip_width => 0.67,
2896 fontsize => $item->{fontsize} || $self->{fontsize},
2897 max_w => $::WIDTH * 0.44,
2898 fg => $item->{fg},
2899 can_events => 1,
2900 can_hover => 1
2901 };
2902 }
2903
2904 $self->clear;
2905 $self->SUPER::add (reverse @widgets);
2906}
2907
2908sub add {
2909 my ($self, $text, %arg) = @_;
2910
2911 $text =~ s/^\s+//;
2912 $text =~ s/\s+$//;
2913
2914 return unless $text;
2915
2916 my $timeout = time + ((delete $arg{timeout}) || 60);
2917
2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2919
2920 if (my $item = $self->{item}{$group}) {
2921 if ($item->{text} eq $text) {
2922 $item->{count}++;
2923 } else {
2924 $item->{count} = 1;
2925 $item->{text} = $item->{tooltip} = $text;
2926 }
2927 $item->{id} = ++$self->{id};
2928 $item->{timeout} = $timeout;
2929 delete $item->{label};
2930 } else {
2931 $self->{item}{$group} = {
2932 id => ++$self->{id},
2933 text => $text,
2934 timeout => $timeout,
2935 tooltip => $text,
2936 fg => [0.8, 0.8, 0.8, 0.8],
2937 pri => 0,
2938 count => 1,
2939 %arg,
2940 };
2941 }
2942
2943 $self->reorder;
2944}
2945
2946sub reconfigure {
2947 my ($self) = @_;
2948
2949 delete $_->{label}
2950 for values %{ $self->{item} || {} };
2951
2952 $self->reorder;
2953 $self->SUPER::reconfigure;
2954}
2955
2956#############################################################################
2957
2423package CFClient::UI::Root; 2958package CFClient::UI::Root;
2424 2959
2425our @ISA = CFClient::UI::Container::; 2960our @ISA = CFClient::UI::Container::;
2426 2961
2427use CFClient::OpenGL; 2962use CFClient::OpenGL;
2428 2963
2429sub check_size { 2964sub new {
2430 my ($self) = @_; 2965 my $class = shift;
2431 2966
2432 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2967 $class->SUPER::new (
2433} 2968 @_,
2434 2969 )
2435sub size_request {
2436 ($::WIDTH, $::HEIGHT)
2437} 2970}
2438 2971
2439sub configure { 2972sub configure {
2440 my ($self, $x, $y, $w, $h) = @_; 2973 my ($self, $x, $y, $w, $h) = @_;
2441 2974
2442 $self->SUPER::configure ($x, $y, $w, $h); 2975 $self->{w} = $w;
2976 $self->{h} = $h;
2977}
2443 2978
2979sub check_size {
2980 my ($self) = @_;
2981
2982 $self->size_allocate ($self->{w}, $self->{h})
2983 if $self->{w};
2984}
2985
2986sub size_request {
2987 my ($self) = @_;
2988
2989 ($self->{w}, $self->{h})
2990}
2991
2992sub size_allocate {
2993 my ($self, $w, $h) = @_;
2994
2444 for my $child (@{$self->{children}}) { 2995 for my $child ($self->children) {
2445 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2446 2997
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2999 if exists $child->{req_x};
3000
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3002 if exists $child->{req_y};
3003
2447 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3004 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2448 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006
2449 $child->configure ($X, $Y, $W,$H); 3007 $child->configure ($X, $Y, $W, $H);
2450 } 3008 }
2451} 3009}
2452 3010
2453sub _topleft { 3011sub coord2local {
2454 my ($self, $x, $y) = @_; 3012 my ($self, $x, $y) = @_;
2455 3013
2456 ($x, $y) 3014 ($x, $y)
2457} 3015}
2458 3016
3017sub coord2global {
3018 my ($self, $x, $y) = @_;
3019
3020 ($x, $y)
3021}
3022
2459sub update { 3023sub update {
2460 my ($self) = @_; 3024 my ($self) = @_;
2461 3025
2462 $self->check_size; 3026 $self->check_size;
2463 ::refresh (); 3027 $::WANT_REFRESH++;
2464} 3028}
2465 3029
2466sub add { 3030sub add {
2467 my ($self, $child) = @_; 3031 my ($self, @children) = @_;
2468 3032
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1;
3041
2469 # integerize window positions 3042 # integerise window positions
2470 $child->{x} = int $child->{x}; 3043 $child->{x} = int $child->{x};
2471 $child->{y} = int $child->{y}; 3044 $child->{y} = int $child->{y};
3045 }
2472 3046
2473 $self->SUPER::add ($child); 3047 $self->SUPER::add (@children);
3048}
3049
3050sub remove {
3051 my ($self, @children) = @_;
3052
3053 $self->SUPER::remove (@children);
3054
3055 while (@children) {
3056 my $w = pop @children;
3057 push @children, $w->children;
3058 $w->set_invisible;
3059 }
2474} 3060}
2475 3061
2476sub on_refresh { 3062sub on_refresh {
2477 my ($self, $id, $cb) = @_; 3063 my ($self, $id, $cb) = @_;
2478 3064
2479 $self->{refresh_hook}{$id} = $cb; 3065 $self->{refresh_hook}{$id} = $cb;
2480} 3066}
2481 3067
3068sub on_post_alloc {
3069 my ($self, $id, $cb) = @_;
3070
3071 $self->{post_alloc_hook}{$id} = $cb;
3072}
3073
2482sub draw { 3074sub draw {
2483 my ($self) = @_; 3075 my ($self) = @_;
2484 3076
2485 while (my $rcb = delete $self->{refresh_hook}) { 3077 while ($self->{refresh_hook}) {
2486 $_->() for values %$rcb; 3078 $_->()
3079 for values %{delete $self->{refresh_hook}};
3080 }
3081
3082 if ($self->{check_size}) {
3083 my @queue = ([], []);
3084
3085 for (;;) {
3086 if ($self->{check_size}) {
3087 # heuristic: check containers last
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3089 for values %{delete $self->{check_size}}
3090 }
3091
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3093
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3095 ? @$widget{qw(user_w user_h)}
3096 : $widget->size_request;
3097
3098 if (delete $widget->{force_alloc}
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101
3102 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h;
3104
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3106
3107 $widget->{parent}->check_size
3108 if $widget->{parent};
3109 }
3110 }
3111 }
3112
3113 while ($self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) {
3115 my ($widget, $w, $h) = @$_;
3116
3117 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0;
3119
3120 $widget->{w} = $w;
3121 $widget->{h} = $h;
3122 $widget->emit (size_allocate => $w, $h);
3123 }
3124 }
3125
3126 while ($self->{post_alloc_hook}) {
3127 $_->()
3128 for values %{delete $self->{post_alloc_hook}};
2487 } 3129 }
2488 3130
2489 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3131 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2490 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2491 glClear GL_COLOR_BUFFER_BIT; 3133 glClear GL_COLOR_BUFFER_BIT;
2492 3134
2493 glMatrixMode GL_PROJECTION; 3135 glMatrixMode GL_PROJECTION;
2494 glLoadIdentity; 3136 glLoadIdentity;
2495 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2496 glMatrixMode GL_MODELVIEW; 3138 glMatrixMode GL_MODELVIEW;
2497 glLoadIdentity; 3139 glLoadIdentity;
2498 3140
2499 $self->_draw; 3141 $self->_draw;
2500} 3142}
… …
2502############################################################################# 3144#############################################################################
2503 3145
2504package CFClient::UI; 3146package CFClient::UI;
2505 3147
2506$ROOT = new CFClient::UI::Root; 3148$ROOT = new CFClient::UI::Root;
2507$TOOLTIP = new CFClient::UI::Tooltip; 3149$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2508 3150
25091 31511
2510 3152

Diff Legend

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