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.177 by root, Tue Apr 25 13:08:17 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 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
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
12our $ROOT; 14our $ROOT;
13our $TOOLTIP; 15our $TOOLTIP;
14our $BUTTON_STATE; 16our $BUTTON_STATE;
17
18our %WIDGET; # all widgets, weak-referenced
15 19
16sub check_tooltip { 20sub check_tooltip {
17 if (!$GRAB) { 21 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 23 if (length $widget->{tooltip}) {
… …
23 27
24 my $tip = $widget->{tooltip}; 28 my $tip = $widget->{tooltip};
25 29
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 30 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 31
28 $TOOLTIP->set_markup ($widget->{tooltip}); 32 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 33 $TOOLTIP->show;
31 34
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 36
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 38 if $x + $TOOLTIP->{w} > $::WIDTH;
37 39
38 $TOOLTIP->move ($x, $y); 40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
39 } 43 }
40 44
41 return; 45 return;
42 } 46 }
43 } 47 }
… …
47 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
48} 52}
49 53
50# class methods for events 54# class methods for events
51sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 57 if $FOCUS;
54} 58}
55 59
56sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 62 if $FOCUS;
59} 63}
60 64
61sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
62 my ($ev) = @_; 66 my ($ev) = @_;
… …
71 check_tooltip; 75 check_tooltip;
72 } 76 }
73 77
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 79
76 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 82}
81 83
82sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
83 my ($ev) = @_; 85 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
85 87
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 89
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 91
90 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 94
95 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 97 $grab->update if $grab;
98 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 115
116 check_tooltip; 116 check_tooltip;
117 } 117 }
118 118
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 120 if $HOVER;
123} 121}
124 122
125# convert position array to integers 123# convert position array to integers
126sub harmonize { 124sub harmonize {
127 my ($vals) = @_; 125 my ($vals) = @_;
… …
131 for (@$vals) { 129 for (@$vals) {
132 my $i = int $_ + $rem; 130 my $i = int $_ + $rem;
133 $rem += $_ - $i; 131 $rem += $_ - $i;
134 $_ = $i; 132 $_ = $i;
135 } 133 }
134}
135
136sub full_refresh {
137 # make a copy, otherwise for complains about freed values.
138 my @widgets = values %WIDGET;
139
140 $_->update
141 for @widgets;
142}
143
144sub reconfigure_widgets {
145 # make a copy, otherwise C<for> complains about freed values.
146 my @widgets = values %WIDGET;
147
148 $_->reconfigure
149 for @widgets;
150}
151
152# call when resolution changes etc.
153sub rescale_widgets {
154 my ($sx, $sy) = @_;
155
156 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 }
167 }
168
169 reconfigure_widgets;
136} 170}
137 171
138############################################################################# 172#############################################################################
139 173
140package CFClient::UI::Base; 174package CFClient::UI::Base;
… …
158 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
160 } 194 }
161 } 195 }
162 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
163 $self 199 $self
164} 200}
165 201
166sub destroy { 202sub destroy {
167 my ($self) = @_; 203 my ($self) = @_;
… …
170 %$self = (); 206 %$self = ();
171} 207}
172 208
173sub show { 209sub show {
174 my ($self) = @_; 210 my ($self) = @_;
175
176 return if $self->{parent}; 211 return if $self->{parent};
177 212
178 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
179} 214}
180 215
181sub hide { 216sub show_centered {
182 my ($self) = @_; 217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
229sub set_invisible {
230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{visible};
183 235
184 undef $GRAB if $GRAB == $self; 236 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 237 undef $HOVER if $HOVER == $self;
238
239 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self;
241
242 $self->focus_out;
243}
244
245sub hide {
246 my ($self) = @_;
247
248 $self->set_invisible;
186 249
187 $self->{parent}->remove ($self) 250 $self->{parent}->remove ($self)
188 if $self->{parent}; 251 if $self->{parent};
189} 252}
190 253
… …
232 $self->{y} = $y; 295 $self->{y} = $y;
233 $self->update; 296 $self->update;
234 } 297 }
235 298
236 if ($self->{w} != $w || $self->{h} != $h) { 299 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 301 }
243} 302}
244 303
245sub size_allocate { 304sub size_allocate {
246 # nothing to be done 305 # nothing to be done
247} 306}
248 307
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313}
314
249sub children { 315sub 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} 316}
261 317
262sub set_max_size { 318sub set_max_size {
263 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
264 320
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 321 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 322 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 323}
268 324
269# return top left coordinates 325sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 326 my ($self, $tooltip) = @_;
272 327
273 $self->{parent} 328 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 329 $tooltip =~ s/\s+$//;
275 330
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 331 return if $self->{tooltip} eq $tooltip;
332
333 $self->{tooltip} = $tooltip;
334
335 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
336 delete $CFClient::UI::TOOLTIP->{owner};
337 CFClient::UI::check_tooltip;
338 }
277} 339}
278 340
279# translate global coordinates to local coordinate system 341# translate global coordinates to local coordinate system
280sub coord2local { 342sub coord2local {
281 my ($self, $x, $y) = @_; 343 my ($self, $x, $y) = @_;
282 344
283 my ($X, $Y) = $self->_topleft; 345 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 346}
286 347
287# translate local coordinates to global coordinate system 348# translate local coordinates to global coordinate system
288sub coord2global { 349sub coord2global {
289 my ($self, $x, $y) = @_; 350 my ($self, $x, $y) = @_;
290 351
291 my ($X, $Y) = $self->_topleft; 352 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 353}
294 354
295sub focus_in { 355sub focus_in {
296 my ($self) = @_; 356 my ($self) = @_;
297 357
298 return if $FOCUS == $self; 358 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 359 return unless $self->{can_focus};
300 360
301 my $focus = $FOCUS; $FOCUS = $self; 361 my $focus = $FOCUS; $FOCUS = $self;
302 362
303 $self->emit (focus_in => $focus); 363 $self->_emit (focus_in => $focus);
304 364
305 $focus->update if $focus; 365 $focus->update if $focus;
306 $FOCUS->update; 366 $FOCUS->update;
307} 367}
308 368
… …
311 371
312 return unless $FOCUS == $self; 372 return unless $FOCUS == $self;
313 373
314 my $focus = $FOCUS; undef $FOCUS; 374 my $focus = $FOCUS; undef $FOCUS;
315 375
316 $self->emit (focus_out => $focus); 376 $self->_emit (focus_out => $focus);
317 377
318 $focus->update if $focus; #? 378 $focus->update if $focus; #?
379
380 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
381 unless $FOCUS;
319} 382}
320 383
321sub mouse_motion { } 384sub mouse_motion { }
322sub button_up { } 385sub button_up { }
323sub key_down { } 386sub key_down { }
324sub key_up { } 387sub key_up { }
325 388
326sub button_down { 389sub button_down {
327 my ($self, $ev, $x, $y) = @_; 390 my ($self, $ev, $x, $y) = @_;
328 391
329 $self->focus_in; 392 $self->focus_in;
… …
363 if ($ENV{PCLIENT_DEBUG}) { 426 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix; 427 glPushMatrix;
365 glColor 1, 1, 0, 1; 428 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP; 430 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 431 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 432 glVertex $self->{w} - 1, 0;
370 glVertex $self->{w}, $self->{h}; 433 glVertex $self->{w} - 1, $self->{h} - 1;
371 glVertex 0 , $self->{h}; 434 glVertex 0 , $self->{h} - 1;
372 glEnd; 435 glEnd;
373 glPopMatrix; 436 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 437 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 } 438 }
376} 439}
377 440
378sub _draw { 441sub _draw {
379 my ($self) = @_; 442 my ($self) = @_;
… …
395 458
396sub set_parent { 459sub set_parent {
397 my ($self, $parent) = @_; 460 my ($self, $parent) = @_;
398 461
399 Scalar::Util::weaken ($self->{parent} = $parent); 462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
400} 472}
401 473
402sub check_size { 474sub check_size {
403 my ($self) = @_; 475 my ($self, $forced) = @_;
404 476
405 $self->{parent} 477 $self->{force_alloc} = 1 if $forced;
406 or return 1; 478 $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} 479}
427 480
428sub update { 481sub update {
429 my ($self) = @_; 482 my ($self) = @_;
430 483
… …
436 my ($self, $signal, $cb) = @_; 489 my ($self, $signal, $cb) = @_;
437 490
438 push @{ $self->{signal_cb}{$signal} }, $cb; 491 push @{ $self->{signal_cb}{$signal} }, $cb;
439} 492}
440 493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
441sub emit { 500sub emit {
442 my ($self, $signal, @args) = @_; 501 my ($self, $signal, @args) = @_;
443 502
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
445} 505}
446 506
447sub DESTROY { 507sub DESTROY {
448 my ($self) = @_; 508 my ($self) = @_;
449 509
510 delete $WIDGET{$self+0};
450 #$self->deactivate; 511 #$self->deactivate;
451} 512}
452 513
453############################################################################# 514#############################################################################
454 515
… …
463 my $class = shift; 524 my $class = shift;
464 525
465 # range [value, low, high, page] 526 # range [value, low, high, page]
466 527
467 $class->SUPER::new ( 528 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 529 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 530 #active_bg => [1, 1, 1, 0.5],
470 @_ 531 @_
471 ) 532 )
472} 533}
473 534
474sub _draw { 535sub _draw {
475 my ($self) = @_; 536 my ($self) = @_;
476 537
538 my $color = $FOCUS == $self && $self->{active_bg}
539 ? $self->{active_bg}
540 : $self->{bg};
541
542 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 543 my ($w, $h) = @$self{qw(w h)};
478 544
479 glEnable GL_BLEND; 545 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 547 glColor @$color;
482 548
483 glBegin GL_QUADS; 549 glBegin GL_QUADS;
484 glVertex 0 , 0; 550 glVertex 0 , 0;
485 glVertex 0 , $h; 551 glVertex 0 , $h;
486 glVertex $w, $h; 552 glVertex $w, $h;
487 glVertex $w, 0; 553 glVertex $w, 0;
488 glEnd; 554 glEnd;
489 555
490 glDisable GL_BLEND; 556 glDisable GL_BLEND;
557 }
491} 558}
492 559
493############################################################################# 560#############################################################################
494 561
495package CFClient::UI::Empty; 562package CFClient::UI::Empty;
… …
527 594
528 $self 595 $self
529} 596}
530 597
531sub add { 598sub add {
532 my ($self, $child) = @_; 599 my ($self, @widgets) = @_;
533 600
534 $child->set_parent ($self); 601 $_->set_parent ($self)
602 for @widgets;
535 603
536 use sort 'stable'; 604 use sort 'stable';
537 605
538 $self->{children} = [ 606 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 607 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 608 @{$self->{children}}, @widgets
541 ]; 609 ];
542 610
543 $child->check_size; 611 $self->check_size (1);
612 $self->update;
544} 613}
545 614
546sub children { 615sub children {
547 @{ $_[0]{children} } 616 @{ $_[0]{children} }
548} 617}
… …
553 delete $child->{parent}; 622 delete $child->{parent};
554 $child->hide; 623 $child->hide;
555 624
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 626
558 $self->check_size; 627 $self->check_size (1);
559 $self->update; 628 $self->update;
560} 629}
561 630
562sub clear { 631sub clear {
563 my ($self) = @_; 632 my ($self) = @_;
… …
567 636
568 for (@$children) { 637 for (@$children) {
569 delete $_->{parent}; 638 delete $_->{parent};
570 $_->hide; 639 $_->hide;
571 } 640 }
641
642 $self->check_size;
643 $self->update;
572} 644}
573 645
574sub find_widget { 646sub find_widget {
575 my ($self, $x, $y) = @_; 647 my ($self, $x, $y) = @_;
576 648
… …
651} 723}
652 724
653sub update { 725sub update {
654 my ($self) = @_; 726 my ($self) = @_;
655 727
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 728 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 729 $self->SUPER::update;
658} 730}
659 731
660sub size_allocate { 732sub size_allocate {
661 my ($self, $w, $h) = @_; 733 my ($self, $w, $h) = @_;
662 734
663 $self->SUPER::size_allocate ($w, $h); 735 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 736 $self->update;
737}
738
739sub _render {
740 $_[0]{children}[0]->draw;
665} 741}
666 742
667sub render_child { 743sub render_child {
668 my ($self) = @_; 744 my ($self) = @_;
669 745
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 746 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 747 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 748 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 749
674# glColorMask 1, 1, 1, 0; 750 $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 }; 751 };
682} 752}
683 753
684sub _draw { 754sub _draw {
685 my ($self) = @_; 755 my ($self) = @_;
… …
687 my ($w, $h) = ($self->w, $self->h); 757 my ($w, $h) = ($self->w, $self->h);
688 758
689 my $tex = $self->{texture} 759 my $tex = $self->{texture}
690 or return; 760 or return;
691 761
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 762 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 764 glColor 1, 1, 1, 1;
697 765
698 $tex->draw_quad (0, 0, $w, $h); 766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 767
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 768 glDisable GL_TEXTURE_2D;
702} 769}
703 770
704############################################################################# 771#############################################################################
705 772
706package CFClient::UI::ViewPort; 773package CFClient::UI::ViewPort;
707 774
708our @ISA = CFClient::UI::Window::; 775our @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 776
736sub new { 777sub new {
737 my $class = shift; 778 my $class = shift;
738 779
780 $class->SUPER::new (
781 scroll_x => 0,
782 scroll_y => 1,
783 @_,
784 )
785}
786
787sub size_request {
788 my ($self) = @_;
789
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
791
792 @$self{qw(child_w child_h)}
793}
794
795sub size_allocate {
796 my ($self, $w, $h) = @_;
797
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
800
801 $self->child->configure (0, 0, $w, $h);
802 $self->update;
803}
804
805sub set_offset {
806 my ($self, $x, $y) = @_;
807
808 $self->{view_x} = int $x;
809 $self->{view_y} = int $y;
810
811 $self->update;
812}
813
814# hmm, this does not work for topleft of $self... but we should not ask for that
815sub coord2local {
816 my ($self, $x, $y) = @_;
817
818 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
819}
820
821sub coord2global {
822 my ($self, $x, $y) = @_;
823
824 $x = List::Util::min $self->{w}, $x - $self->{view_x};
825 $y = List::Util::min $self->{h}, $y - $self->{view_y};
826
827 $self->SUPER::coord2global ($x, $y)
828}
829
830sub find_widget {
831 my ($self, $x, $y) = @_;
832
833 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
834 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
835 ) {
836 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
837 } else {
838 $self->CFClient::UI::Base::find_widget ($x, $y)
839 }
840}
841
842sub _render {
843 my ($self) = @_;
844
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846
847 $self->SUPER::_render;
848}
849
850#############################################################################
851
852package CFClient::UI::ScrolledWindow;
853
854our @ISA = CFClient::UI::HBox::;
855
856sub new {
857 my $class = shift;
858
859 my $self;
860
861 my $slider = new CFClient::UI::Slider
862 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]);
866 },
867 ;
868
739 my $self = $class->SUPER::new ( 869 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 870 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 871 slider => $slider,
742 border => 0.8,
743 @_ 872 @_,
744 ); 873 );
745 874
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider});
878
746 $self 879 $self
747} 880}
748 881
882sub update {
883 my ($self) = @_;
884
885 $self->SUPER::update;
886
887 # todo: overwrite size_allocate of child
888 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
890}
891
892sub size_allocate {
893 my ($self, $w, $h) = @_;
894
895 $self->SUPER::size_allocate ($w, $h);
896
897 my $child = $self->{vp}->child;
898 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
899}
900
901#TODO# update range on size_allocate depending on child
902# update viewport offset on scroll
903
904#############################################################################
905
906package CFClient::UI::Frame;
907
908our @ISA = CFClient::UI::Bin::;
909
910use CFClient::OpenGL;
911
912sub new {
913 my $class = shift;
914
915 $class->SUPER::new (
916 bg => undef,
917 @_,
918 )
919}
920
749sub _draw { 921sub _draw {
750 my ($self) = @_; 922 my ($self) = @_;
751 923
752 my ($w, $h) = ($self->{w}, $self->{h}); 924 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)};
753 926
754 glEnable GL_BLEND; 927 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 929 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 930
759# glBegin GL_QUADS; 931 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 932 glVertex 0 , 0;
762# glVertex 0 , $h; 933 glVertex 0 , $h;
763# glVertex $w, $h; 934 glVertex $w, $h;
764# glVertex $w, 0; 935 glVertex $w, 0;
765# glEnd; 936 glEnd;
766 937
767
768 $self->child->draw;
769 glDisable GL_BLEND; 938 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 939 }
940
941 $self->SUPER::_draw;
771} 942}
772 943
773############################################################################# 944#############################################################################
774 945
775package CFClient::UI::FancyFrame; 946package CFClient::UI::FancyFrame;
… …
786 my $class = shift; 957 my $class = shift;
787 958
788 # TODO: user_x, user_y, overwrite moveto? 959 # TODO: user_x, user_y, overwrite moveto?
789 960
790 my $self = $class->SUPER::new ( 961 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 962 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 963 border_bg => [1, 1, 1, 1],
793 border => 0.6, 964 border => 0.6,
965 is_toplevel => 1,
794 can_events => 1, 966 can_events => 1,
795 @_ 967 @_
796 ); 968 );
797 969
798 $self->{title} &&= new CFClient::UI::Label 970 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 971 align => 0,
… …
823 my ($self, $w, $h) = @_; 995 my ($self, $w, $h) = @_;
824 996
825 $h -= List::Util::max 0, $self->border * 2; 997 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 998 $w -= List::Util::max 0, $self->border * 2;
827 999
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829 if $self->{title}; 1001 if $self->{title};
830 1002
831 $self->child->configure ($self->border, $self->border, $w, $h); 1003 $self->child->configure ($self->border, $self->border, $w, $h);
832} 1004}
833 1005
… …
891 my ($self) = @_; 1063 my ($self) = @_;
892 1064
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1065 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 1067
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1068 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1070
901 my $border = $self->border; 1071 my $border = $self->border;
902 1072
903 glColor @{ $self->{border_bg} }; 1073 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1078
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1080 my $bg = $tex[0];
911 1081
912 # TODO: repeat texture not scale 1082 # TODO: repeat texture not scale
… …
916 glColor @{ $self->{bg} }; 1086 glColor @{ $self->{bg} };
917 1087
918 $bg->{s} = $rep_x; 1088 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 1089 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 1090 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 }
922 1093
923 glDisable GL_TEXTURE_2D; 1094 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1095
927 $self->{title}->draw if $self->{title}; 1096 $self->{title}->draw if $self->{title};
928 1097
929 $self->child->draw; 1098 $self->child->draw;
930} 1099}
… …
942sub new { 1111sub new {
943 my $class = shift; 1112 my $class = shift;
944 1113
945 $class->SUPER::new ( 1114 $class->SUPER::new (
946 col_expand => [], 1115 col_expand => [],
947 @_ 1116 @_,
948 ) 1117 )
1118}
1119
1120sub children {
1121 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1122}
950 1123
951sub add { 1124sub add {
952 my ($self, $x, $y, $child) = @_; 1125 my ($self, $x, $y, $child) = @_;
953 1126
954 $child->set_parent ($self); 1127 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1128 $self->{children}[$y][$x] = $child;
956 1129
957 $child->check_size; 1130 $self->check_size (1);
958} 1131}
959 1132
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
964# TODO: move to container class maybe? send childs a signal on removal? 1133# TODO: move to container class maybe? send children a signal on removal?
965sub clear { 1134sub clear {
966 my ($self) = @_; 1135 my ($self) = @_;
967 1136
968 my @children = $self->children; 1137 my @children = $self->children;
969 delete $self->{children}; 1138 delete $self->{children};
… …
971 for (@children) { 1140 for (@children) {
972 delete $_->{parent}; 1141 delete $_->{parent};
973 $_->hide; 1142 $_->hide;
974 } 1143 }
975 1144
1145 $self->check_size (1);
976 $self->update; 1146 $self->update;
977} 1147}
978 1148
979sub get_wh { 1149sub get_wh {
980 my ($self) = @_; 1150 my ($self) = @_;
… …
1012sub size_allocate { 1182sub size_allocate {
1013 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1014 1184
1015 my ($ws, $hs) = $self->get_wh; 1185 my ($ws, $hs) = $self->get_wh;
1016 1186
1017 my $req_w = sum @$ws; 1187 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1188 my $req_h = (sum @$hs) || 1;
1019 1189
1020 # TODO: nicer code && do row_expand 1190 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1191 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1192 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1193 my $col_expand = (sum @col_expand) || 1;
… …
1157} 1327}
1158 1328
1159sub size_allocate { 1329sub size_allocate {
1160 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
1161 1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1162 my $children = $self->{children}; 1334 my $children = $self->{children};
1163 1335
1164 my @h = map $_->{req_h}, @$children; 1336 my @h = map $_->{req_h}, @$children;
1165 1337
1166 my $req_h = List::Util::sum @h; 1338 my $req_h = List::Util::sum @h;
… …
1195 1367
1196############################################################################# 1368#############################################################################
1197 1369
1198package CFClient::UI::Label; 1370package CFClient::UI::Label;
1199 1371
1200our @ISA = CFClient::UI::Base::; 1372our @ISA = CFClient::UI::DrawBG::;
1201 1373
1202use CFClient::OpenGL; 1374use CFClient::OpenGL;
1203 1375
1204sub new { 1376sub new {
1205 my ($class, %arg) = @_; 1377 my ($class, %arg) = @_;
1206 1378
1207 my $self = $class->SUPER::new ( 1379 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1380 fg => [1, 1, 1],
1381 #bg => none
1382 #active_bg => none
1209 #font => default_font 1383 #font => default_font
1384 #text => initial text
1385 #markup => initial narkup
1386 #max_w => maximum pixel width
1387 ellipsise => 3, # end
1388 layout => (new CFClient::Layout),
1210 fontsize => 1, 1389 fontsize => 1,
1211 text => "",
1212 align => -1, 1390 align => -1,
1213 valign => -1, 1391 valign => -1,
1214 padding => 2, 1392 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1393 can_events => 0,
1217 %arg 1394 %arg
1218 ); 1395 );
1219 1396
1220 if (exists $self->{template}) { 1397 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1398 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1399 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1400 $self->{template} = $layout;
1224 } 1401 }
1225 1402
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1403 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1404 $self->set_markup (delete $self->{markup});
1405 } else {
1406 $self->set_text (delete $self->{text});
1407 }
1228 1408
1229 $self 1409 $self
1230} 1410}
1231 1411
1232sub escape { 1412sub escape($) {
1233 local $_ = $_[1]; 1413 local $_ = $_[0];
1234 1414
1235 s/&/&amp;/g; 1415 s/&/&amp;/g;
1236 s/>/&gt;/g; 1416 s/>/&gt;/g;
1237 s/</&lt;/g; 1417 s/</&lt;/g;
1238 1418
1239 $_[1] 1419 $_
1240} 1420}
1241 1421
1242sub update { 1422sub update {
1243 my ($self) = @_; 1423 my ($self) = @_;
1244 1424
1245 delete $self->{texture}; 1425 delete $self->{texture};
1246 $self->SUPER::update; 1426 $self->SUPER::update;
1247} 1427}
1248 1428
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1429sub set_text {
1256 my ($self, $text) = @_; 1430 my ($self, $text) = @_;
1257 1431
1258 return if $self->{text} eq "T$text"; 1432 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1433 $self->{text} = "T$text";
1260 1434
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1436 $self->{layout}->set_text ($text);
1262 1437
1263 delete $self->{texture};
1264 $self->update; 1438 $self->update;
1265 $self->check_size; 1439 $self->check_size;
1266} 1440}
1267 1441
1268sub set_markup { 1442sub set_markup {
1269 my ($self, $markup) = @_; 1443 my ($self, $markup) = @_;
1270 1444
1271 return if $self->{text} eq "M$markup"; 1445 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1446 $self->{text} = "M$markup";
1273 1447
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1451 $self->{layout}->set_markup ($markup);
1275 1452
1276 delete $self->{texture};
1277 $self->update; 1453 $self->update;
1278 $self->check_size; 1454 $self->check_size;
1279} 1455}
1280 1456
1281sub size_request { 1457sub size_request {
1282 my ($self) = @_; 1458 my ($self) = @_;
1283 1459
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1460 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1); 1461 $self->{layout}->set_width ($self->{max_w} || -1);
1462 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1465
1288 my ($w, $h) = $self->{layout}->size; 1466 my ($w, $h) = $self->{layout}->size;
1289 1467
1290 if (exists $self->{template}) { 1468 if (exists $self->{template}) {
… …
1312sub set_fontsize { 1490sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1491 my ($self, $fontsize) = @_;
1314 1492
1315 $self->{fontsize} = $fontsize; 1493 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1494 delete $self->{texture};
1495
1496 $self->update;
1317 $self->check_size; 1497 $self->check_size;
1318 $self->update;
1319} 1498}
1320 1499
1321sub _draw { 1500sub _draw {
1322 my ($self) = @_; 1501 my ($self) = @_;
1323 1502
1503 $self->SUPER::_draw; # draw background, if applicable
1504
1324 my $tex = $self->{texture} ||= do { 1505 my $tex = $self->{texture} ||= do {
1506 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1507 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1508 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512
1328 new_from_layout CFClient::Texture $self->{layout} 1513 my $tex = new_from_layout CFClient::Texture $self->{layout};
1514
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1517 : ($self->{w} - $tex->{w}) * 0.5);
1518
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1521 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1329 }; 1524 };
1330 1525
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1526 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1528
1529 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1530 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1532 } else {
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1534 }
1351 1535
1352 glDisable GL_TEXTURE_2D; 1536 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1537}
1355 1538
1356############################################################################# 1539#############################################################################
1357 1540
1358package CFClient::UI::EntryBase; 1541package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1554 active_fg => [0, 0, 0],
1372 can_hover => 1, 1555 can_hover => 1,
1373 can_focus => 1, 1556 can_focus => 1,
1374 valign => 0, 1557 valign => 0,
1375 can_events => 1, 1558 can_events => 1,
1559 #text => ...
1376 @_ 1560 @_
1377 ) 1561 )
1378} 1562}
1379 1563
1380sub _set_text { 1564sub _set_text {
… …
1390 $self->{text} = $text; 1574 $self->{text} = $text;
1391 1575
1392 $text =~ s/./*/g if $self->{hidden}; 1576 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1577 $self->{layout}->set_text ("$text ");
1394 1578
1395 $self->emit (changed => $self->{text}); 1579 $self->_emit (changed => $self->{text});
1396}
1397
1398sub get_text {
1399 $_[0]{text}
1400}
1401
1402sub size_request {
1403 my ($self) = @_;
1404
1405 my ($w, $h) = $self->SUPER::size_request;
1406
1407 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414} 1580}
1415 1581
1416sub set_text { 1582sub set_text {
1417 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1418 1584
1419 $self->{cursor} = length $text; 1585 $self->{cursor} = length $text;
1420 $self->_set_text ($text); 1586 $self->_set_text ($text);
1421 $self->update; 1587 $self->update;
1588 $self->check_size;
1589}
1590
1591sub get_text {
1592 $_[0]{text}
1593}
1594
1595sub size_request {
1596 my ($self) = @_;
1597
1598 my ($w, $h) = $self->SUPER::size_request;
1599
1600 ($w + 1, $h) # add 1 for cursor
1422} 1601}
1423 1602
1424sub key_down { 1603sub key_down {
1425 my ($self, $ev) = @_; 1604 my ($self, $ev) = @_;
1426 1605
… …
1428 my $sym = $ev->{sym}; 1607 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1608 my $uni = $ev->{unicode};
1430 1609
1431 my $text = $self->get_text; 1610 my $text = $self->get_text;
1432 1611
1433 if ($sym == 8) { 1612 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1613 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1614 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1615 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1616 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1617 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1618 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1619 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1620 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1621 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1622 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1623 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1624 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1625 $self->_emit ('escape');
1447 } elsif ($uni) { 1626 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1627 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1628 }
1450 1629
1451 $self->_set_text ($text); 1630 $self->_set_text ($text);
1452 $self->update; 1631 $self->update;
1632 $self->check_size;
1453} 1633}
1454 1634
1455sub focus_in { 1635sub focus_in {
1456 my ($self) = @_; 1636 my ($self) = @_;
1457 1637
… …
1537 if ($sym == 13) { 1717 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1718 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1719 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1720 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1721 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1722 $self->_emit (activate => $txt);
1543 $self->update; 1723 $self->update;
1544 1724
1545 } elsif ($sym == CFClient::SDLK_UP) { 1725 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1726 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1727 $self->{history_saveback} = $self->get_text;
… …
1586 my $class = shift; 1766 my $class = shift;
1587 1767
1588 $class->SUPER::new ( 1768 $class->SUPER::new (
1589 padding => 4, 1769 padding => 4,
1590 fg => [1, 1, 1], 1770 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1771 active_fg => [0, 0, 1],
1593 can_hover => 1, 1772 can_hover => 1,
1594 align => 0, 1773 align => 0,
1595 valign => 0, 1774 valign => 0,
1596 can_events => 1, 1775 can_events => 1,
1597 @_ 1776 @_
1598 ) 1777 )
1599} 1778}
1600 1779
1780sub activate { }
1781
1601sub button_up { 1782sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1783 my ($self, $ev, $x, $y) = @_;
1603 1784
1785 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1786 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1787 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate");
1607 }
1608} 1788}
1609 1789
1610sub _draw { 1790sub _draw {
1611 my ($self) = @_; 1791 my ($self) = @_;
1612 1792
… …
1614 1794
1615 if ($GRAB == $self) { 1795 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1796 $self->{fg} = $self->{active_fg};
1617 } 1797 }
1618 1798
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1799 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1801 glColor 0, 0, 0, 1;
1624 1802
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1803 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1804
1627 glDisable GL_TEXTURE_2D; 1805 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1806
1630 $self->SUPER::_draw; 1807 $self->SUPER::_draw;
1631} 1808}
1632 1809
1633############################################################################# 1810#############################################################################
… …
1647 1824
1648 $class->SUPER::new ( 1825 $class->SUPER::new (
1649 padding => 2, 1826 padding => 2,
1650 fg => [1, 1, 1], 1827 fg => [1, 1, 1],
1651 active_fg => [1, 1, 0], 1828 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5],
1652 state => 0, 1831 state => 0,
1653 can_hover => 1, 1832 can_hover => 1,
1654 @_ 1833 @_
1655 ) 1834 )
1656} 1835}
… …
1665 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1666 1845
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1669 $self->{state} = !$self->{state}; 1848 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1849 $self->_emit (changed => $self->{state});
1671 } 1850 }
1672} 1851}
1673 1852
1674sub _draw { 1853sub _draw {
1675 my ($self) = @_; 1854 my ($self) = @_;
… …
1680 1859
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1682 1861
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1863
1685 glEnable GL_BLEND; 1864 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865
1686 glEnable GL_TEXTURE_2D; 1866 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1867 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1868 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1869}
1696 1870
1697############################################################################# 1871#############################################################################
1698 1872
1699package CFClient::UI::Image; 1873package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1916 glTranslate 0, -$self->{w}, 0;
1743 1917
1744 ($w, $h) = ($h, $w); 1918 ($w, $h) = ($h, $w);
1745 } 1919 }
1746 1920
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1921 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1923
1752 $tex->draw_quad (0, 0, $w, $h); 1924 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1925
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1926 glDisable GL_TEXTURE_2D;
1756} 1927}
1757 1928
1758############################################################################# 1929#############################################################################
1759 1930
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2119 qw(s1_slider.png s1_slider_bg.png);
1949 2120
1950sub new { 2121sub new {
1951 my $class = shift; 2122 my $class = shift;
1952 2123
1953 # range [value, low, high, page] 2124 # range [value, low, high, page, unit]
1954 2125
1955 # TODO: 0-width page 2126 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2127 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2128 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2129 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2130 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2131 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5],
1961 range => [0, 0, 100, 10], 2134 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2135 req_w => $::WIDTH / 80,
1963 req_h => 20, 2136 req_h => $::WIDTH / 80,
1964 vertical => 0, 2137 vertical => 0,
1965 can_hover => 1, 2138 can_hover => 1,
1966 inner_pad => 5, 2139 inner_pad => 0.02,
1967 @_ 2140 @_
1968 ); 2141 );
1969 2142
2143 $self->set_value ($self->{range}[0]);
2144 $self->update;
2145
1970 $self 2146 $self
2147}
2148
2149sub set_range {
2150 my ($self, $range) = @_;
2151
2152 ($range, $self->{range}) = ($self->{range}, $range);
2153
2154 $self->update
2155 if "@$range" ne "@{$self->{range}}";
2156}
2157
2158sub set_value {
2159 my ($self, $value) = @_;
2160
2161 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2162
2163 $hi = $lo + 1 if $hi <= $lo;
2164
2165 $page = $hi - $lo if $page > $hi - $lo;
2166
2167 $value = $lo if $value < $lo;
2168 $value = $hi - $page if $value > $hi - $page;
2169
2170 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2171 if $unit;
2172
2173 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2174
2175 if ($value != $old_value) {
2176 $self->_emit (changed => $value);
2177 $self->update;
2178 }
1971} 2179}
1972 2180
1973sub size_request { 2181sub size_request {
1974 my ($self) = @_; 2182 my ($self) = @_;
1975 2183
… …
1981 2189
1982sub button_down { 2190sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2191 my ($self, $ev, $x, $y) = @_;
1984 2192
1985 $self->SUPER::button_down ($ev, $x, $y); 2193 $self->SUPER::button_down ($ev, $x, $y);
2194
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196
1986 $self->mouse_motion ($ev, $x, $y); 2197 $self->mouse_motion ($ev, $x, $y);
1987} 2198}
1988 2199
1989sub mouse_motion { 2200sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
1991 2202
1992 if ($GRAB == $self) { 2203 if ($GRAB == $self) {
2204 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2205
2206 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209
2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2211 }
2212}
2213
2214sub update {
2215 my ($self) = @_;
2216
2217 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2218 $self->set_value ($self->{range}[0]);
2219
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2220 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100;
1994 2222
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2223 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2224
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2225 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2226 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2227
2000 $x -= $inner_pad_px; # substract the padding 2228 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2229 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2230
2006 $self->emit (changed => $x); 2231 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2232 $self->{knob_w} = $knob_w;
2008 } 2233 });
2009}
2010 2234
2011# the inner_* stuff is for generating a padding for the slider handle, 2235 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2236}
2018 2237
2019sub _draw { 2238sub _draw {
2020 my ($self) = @_; 2239 my ($self) = @_;
2021 2240
2022 $self->SUPER::_draw (); 2241 $self->SUPER::_draw ();
2023 2242
2024 my ($w, $h) = @$self{qw(w h)}; 2243 glScale $self->{w}, $self->{h};
2025 2244
2026 if ($self->{vertical}) { 2245 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2246 # draw a vertical slider like a rotated horizontal slider
2028 2247
2248 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2249 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2250 }
2034 2251
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2252 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2253 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2254
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2257
2061 # draw background 2258 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2259 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2260
2064 # draw handle 2261 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2262 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 2263
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2264 glDisable GL_TEXTURE_2D;
2069} 2265}
2266
2267#############################################################################
2268
2269package CFClient::UI::ValSlider;
2270
2271our @ISA = CFClient::UI::HBox::;
2272
2273sub new {
2274 my ($class, %arg) = @_;
2275
2276 my $range = delete $arg{range};
2277
2278 my $self = $class->SUPER::new (
2279 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2280 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2281 to_value => sub { shift },
2282 from_value => sub { shift },
2283 %arg,
2284 );
2285
2286 $self->{slider}->connect (changed => sub {
2287 my ($self, $value) = @_;
2288 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2289 $self->{parent}->emit (changed => $value);
2290 });
2291
2292# $self->{entry}->connect (changed => sub {
2293# my ($self, $value) = @_;
2294# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2295# $self->{parent}->emit (changed => $value);
2296# });
2297
2298 $self->add ($self->{slider}, $self->{entry});
2299
2300 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2301
2302 $self
2303}
2304
2305sub set_range { shift->{slider}->set_range (@_) }
2306sub set_value { shift->{slider}->set_value (@_) }
2070 2307
2071############################################################################# 2308#############################################################################
2072 2309
2073package CFClient::UI::TextView; 2310package CFClient::UI::TextView;
2074 2311
… …
2083 fontsize => 1, 2320 fontsize => 1,
2084 can_events => 0, 2321 can_events => 0,
2085 #font => default_font 2322 #font => default_font
2086 @_, 2323 @_,
2087 2324
2088 layout => (new CFClient::Layout), 2325 layout => (new CFClient::Layout 1),
2089 par => [], 2326 par => [],
2090 height => 0, 2327 height => 0,
2091 children => [ 2328 children => [
2092 (new CFClient::UI::Empty expand => 1), 2329 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2330 (new CFClient::UI::Slider vertical => 1),
… …
2104 2341
2105 $self->{fontsize} = $fontsize; 2342 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2343 $self->reflow;
2107} 2344}
2108 2345
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2346sub size_allocate {
2129 my ($self, $w, $h) = @_; 2347 my ($self, $w, $h) = @_;
2130 2348
2131 $self->SUPER::size_allocate ($w, $h); 2349 $self->SUPER::size_allocate ($w, $h);
2132 2350
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2353 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2354
2137 $self->reflow; 2355 $self->reflow;
2138} 2356}
2139 2357
2358sub text_size {
2359 my ($self, $text, $indent) = @_;
2360
2361 my $layout = $self->{layout};
2362
2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2364 $layout->set_width ($self->{children}[0]{w} - $indent);
2365 $layout->set_markup ($text);
2366
2367 $layout->size
2368}
2369
2370sub reflow {
2371 my ($self) = @_;
2372
2373 $self->{need_reflow}++;
2374 $self->update;
2375}
2376
2377sub set_offset {
2378 my ($self, $offset) = @_;
2379
2380 # todo: base offset on lines or so, not on pixels
2381 $self->{children}[1]->set_value ($offset);
2382}
2383
2384sub clear {
2385 my ($self) = @_;
2386
2387 $self->{par} = [];
2388 $self->{height} = 0;
2389 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2390}
2391
2140sub add_paragraph { 2392sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2393 my ($self, $color, $text, $indent) = @_;
2142 2394
2143 #TODO: intelligently "reformat" paragraph 2395 for my $line (split /\n/, $text) {
2144 2396 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2397 $self->{height} += $h;
2398 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2399 }
2148 2400
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2401 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2152 $self->{children}[1]->update;
2153} 2402}
2154 2403
2155sub update { 2404sub update {
2156 my ($self) = @_; 2405 my ($self) = @_;
2157 2406
… …
2159 2408
2160 return unless $self->{h} > 0; 2409 return unless $self->{h} > 0;
2161 2410
2162 delete $self->{texture}; 2411 delete $self->{texture};
2163 2412
2164 $ROOT->on_refresh ($self, sub { 2413 $ROOT->on_post_alloc ($self, sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415
2165 if (delete $self->{need_reflow}) { 2416 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2417 my $height = 0;
2167 2418
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2419 my $layout = $self->{layout};
2420
2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2422
2169 for @{$self->{par}}; 2423 for (@{$self->{par}}) {
2424 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2425 $layout->set_width ($W - $_->[3]);
2426 $layout->set_markup ($_->[4]);
2427 my ($w, $h) = $layout->size;
2428 $_->[0] = $w + $_->[3];
2429 $_->[1] = $h;
2430 }
2431
2432 $height += $_->[1];
2433 }
2170 2434
2171 $self->{height} = $height; 2435 $self->{height} = $height;
2172 2436
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2437 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2438
2175 delete $self->{texture}; 2439 delete $self->{texture};
2176 } 2440 }
2177 2441
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2443 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2444 glClear GL_COLOR_BUFFER_BIT;
2181 2445
2446 my $top = int $self->{children}[1]{range}[0];
2447
2448 my $y0 = $top;
2449 my $y1 = $top + $H;
2450
2451 my $y = 0;
2452
2453 my $layout = $self->{layout};
2454
2455 $layout->set_font ($self->{font}) if $self->{font};
2456
2182 glEnable GL_BLEND; 2457 glEnable GL_BLEND;
2458 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2459 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2460
2198 for my $par (@{$self->{par}}) { 2461 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2462 my $h = $par->[1];
2200 2463
2201 if ($y0 < $y + $h && $y < $y1) { 2464 if ($y0 < $y + $h && $y < $y1) {
2465 $layout->set_foreground (@{ $par->[2] });
2466 $layout->set_width ($W - $par->[3]);
2202 $layout->set_text ($par->[2]); 2467 $layout->set_markup ($par->[4]);
2203 2468
2204 glColor @{ $par->[1] }; 2469 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2470
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2471 glRasterPos $par->[3], $y - $y0;
2472 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2207 } 2473 }
2208 2474
2209 $y += $h; 2475 $y += $h;
2210 } 2476 }
2211 2477
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2478 glDisable GL_BLEND;
2214 }; 2479 };
2215 }); 2480 });
2216} 2481}
2217 2482
2218sub _draw { 2483sub _draw {
2219 my ($self) = @_; 2484 my ($self) = @_;
2220 2485
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2486 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2488 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2489 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2490 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2491
2230 $self->{children}[1]->draw; 2492 $self->{children}[1]->draw;
2231 2493
2232} 2494}
2233 2495
… …
2301 2563
2302 # TODO: use animation 2564 # TODO: use animation
2303 if ($self->{state} = !$self->{state}) { 2565 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other}); 2566 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h})); 2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open"); 2568 $self->_emit ("open");
2307 } else { 2569 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other}); 2570 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close"); 2571 $self->_emit ("close");
2310 } 2572 }
2311 2573
2312 $self->emit (changed => $self->{state}); 2574 $self->_emit (changed => $self->{state});
2313} 2575}
2314 2576
2315############################################################################# 2577#############################################################################
2316 2578
2317package CFClient::UI::Tooltip; 2579package CFClient::UI::Tooltip;
… …
2327 @_, 2589 @_,
2328 can_events => 0, 2590 can_events => 0,
2329 ) 2591 )
2330} 2592}
2331 2593
2332sub set_markup { 2594sub set_tooltip_from {
2333 my ($self, $text) = @_; 2595 my ($self, $widget) = @_;
2334 2596
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2597 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2598 markup => $widget->{tooltip},
2337 $self->add ($self->{label}); 2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8,
2601 fg => [0, 0, 0, 1],
2602 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP),
2604 );
2338} 2605}
2339 2606
2340sub size_request { 2607sub size_request {
2341 my ($self) = @_; 2608 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2609
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2610 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2611
2347 ($w + 4, $h + 4) 2612 ($w + 4, $h + 4)
2348} 2613}
… …
2354} 2619}
2355 2620
2356sub _draw { 2621sub _draw {
2357 my ($self) = @_; 2622 my ($self) = @_;
2358 2623
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2624 glTranslate 0.375, 0.375;
2361 2625
2362 my ($w, $h) = @$self{qw(w h)}; 2626 my ($w, $h) = @$self{qw(w h)};
2363 2627
2364 glColor 1, 0.8, 0.4; 2628 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2639 glVertex 0 , $h;
2376 glVertex $w, $h; 2640 glVertex $w, $h;
2377 glVertex $w, 0; 2641 glVertex $w, 0;
2378 glEnd; 2642 glEnd;
2379 2643
2380 glPopMatrix; 2644 glTranslate 2 - 0.375, 2 - 0.375;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2645 $self->SUPER::_draw;
2384} 2646}
2385 2647
2386############################################################################# 2648#############################################################################
2387 2649
… …
2392use CFClient::OpenGL; 2654use CFClient::OpenGL;
2393 2655
2394sub new { 2656sub new {
2395 my $class = shift; 2657 my $class = shift;
2396 2658
2397 $class->SUPER::new ( 2659 my $self = $class->SUPER::new (
2398 aspect => 1, 2660 aspect => 1,
2661 can_events => 0,
2399 @_, 2662 @_,
2400 ) 2663 );
2664
2665 if ($self->{anim} && $self->{animspeed}) {
2666 Scalar::Util::weaken (my $widget = $self);
2667
2668 $self->{timer} = Event->timer (
2669 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2670 hard => 1,
2671 interval => $self->{animspeed},
2672 cb => sub {
2673 ++$widget->{frame};
2674 $widget->update;
2675 },
2676 );
2677 }
2678
2679 $self
2401} 2680}
2402 2681
2403sub size_request { 2682sub size_request {
2404 (32, 8) 2683 (32, 8)
2405} 2684}
2406 2685
2686sub update {
2687 my ($self) = @_;
2688
2689 return unless $self->{visible};
2690
2691 $self->SUPER::update;
2692}
2693
2407sub draw { 2694sub _draw {
2408 my ($self) = @_; 2695 my ($self) = @_;
2409 2696
2697 return unless $::CONN;
2698
2699 my $face;
2700
2701 if ($self->{frame}) {
2702 my $anim = $::CONN->{anim}[$self->{anim}];
2703
2704 $face = $anim->[ $self->{frame} % @$anim ]
2705 if $anim && @$anim;
2706 }
2707
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2709
2412 if ($tex) { 2710 if ($tex) {
2413 glEnable GL_BLEND;
2414 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2415 glEnable GL_TEXTURE_2D; 2711 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 2713 glColor 1, 1, 1, 1;
2418 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 2715 glDisable GL_TEXTURE_2D;
2420 glDisable GL_BLEND;
2421 } 2716 }
2717}
2718
2719sub DESTROY {
2720 my ($self) = @_;
2721
2722 $self->{timer}->cancel
2723 if $self->{timer};
2724
2725 $self->SUPER::DESTROY;
2422} 2726}
2423 2727
2424############################################################################# 2728#############################################################################
2425 2729
2730package CFClient::UI::Inventory;
2731
2732our @ISA = CFClient::UI::ScrolledWindow::;
2733
2734sub new {
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774
2775#############################################################################
2776
2777package CFClient::UI::Menu;
2778
2779our @ISA = CFClient::UI::FancyFrame::;
2780
2781use CFClient::OpenGL;
2782
2783sub new {
2784 my $class = shift;
2785
2786 my $self = $class->SUPER::new (
2787 items => [],
2788 z => 100,
2789 @_,
2790 );
2791
2792 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2793
2794 for my $item (@{ $self->{items} }) {
2795 my ($widget, $cb) = @$item;
2796
2797 # handle various types of items, only text for now
2798 if (!ref $widget) {
2799 $widget = new CFClient::UI::Label
2800 can_hover => 1,
2801 can_events => 1,
2802 text => $widget;
2803 }
2804
2805 $self->{item}{$widget} = $item;
2806
2807 $self->{vbox}->add ($widget);
2808 }
2809
2810 $self
2811}
2812
2813# popup given the event (must be a mouse button down event currently)
2814sub popup {
2815 my ($self, $ev) = @_;
2816
2817 $self->_emit ("popdown");
2818
2819 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self;
2821 $self->{button} = $ev->{button};
2822
2823 $self->show;
2824 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825}
2826
2827sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_;
2829
2830 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER};
2833}
2834
2835sub button_up {
2836 my ($self, $ev, $x, $y) = @_;
2837
2838 if ($ev->{button} == $self->{button}) {
2839 undef $GRAB;
2840 $self->hide;
2841
2842 $self->_emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover};
2844 }
2845}
2846
2847#############################################################################
2848
2849package CFClient::UI::Statusbox;
2850
2851our @ISA = CFClient::UI::VBox::;
2852
2853sub new {
2854 my $class = shift;
2855
2856 $class->SUPER::new (
2857 fontsize => 0.8,
2858 @_,
2859 )
2860}
2861
2862sub reorder {
2863 my ($self) = @_;
2864 my $NOW = time;
2865
2866 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 }
2869
2870 my @widgets;
2871
2872 my @items = sort {
2873 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} };
2876
2877 my $count = 10 + 1;
2878 for my $item (@items) {
2879 last unless --$count;
2880
2881 push @widgets, $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text};
2886
2887 for ($short) {
2888 s/^\s+//;
2889 s/\s+/ /g;
2890 }
2891
2892 new CFClient::UI::Label
2893 markup => $short,
2894 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg},
2900 can_events => 1,
2901 can_hover => 1
2902 };
2903 }
2904
2905 $self->clear;
2906 $self->SUPER::add (reverse @widgets);
2907}
2908
2909sub add {
2910 my ($self, $text, %arg) = @_;
2911
2912 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//;
2914
2915 return unless $text;
2916
2917 my $timeout = time + ((delete $arg{timeout}) || 60);
2918
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920
2921 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) {
2923 $item->{count}++;
2924 } else {
2925 $item->{count} = 1;
2926 $item->{text} = $item->{tooltip} = $text;
2927 }
2928 $item->{id} = ++$self->{id};
2929 $item->{timeout} = $timeout;
2930 delete $item->{label};
2931 } else {
2932 $self->{item}{$group} = {
2933 id => ++$self->{id},
2934 text => $text,
2935 timeout => $timeout,
2936 tooltip => $text,
2937 fg => [0.8, 0.8, 0.8, 0.8],
2938 pri => 0,
2939 count => 1,
2940 %arg,
2941 };
2942 }
2943
2944 $self->reorder;
2945}
2946
2947sub reconfigure {
2948 my ($self) = @_;
2949
2950 delete $_->{label}
2951 for values %{ $self->{item} || {} };
2952
2953 $self->reorder;
2954 $self->SUPER::reconfigure;
2955}
2956
2957#############################################################################
2958
2426package CFClient::UI::Root; 2959package CFClient::UI::Root;
2427 2960
2428our @ISA = CFClient::UI::Container::; 2961our @ISA = CFClient::UI::Container::;
2429 2962
2430use CFClient::OpenGL; 2963use CFClient::OpenGL;
2431 2964
2432sub check_size { 2965sub new {
2433 my ($self) = @_; 2966 my $class = shift;
2434 2967
2435 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2968 $class->SUPER::new (
2436} 2969 @_,
2437 2970 )
2438sub size_request {
2439 ($::WIDTH, $::HEIGHT)
2440} 2971}
2441 2972
2442sub configure { 2973sub configure {
2443 my ($self, $x, $y, $w, $h) = @_; 2974 my ($self, $x, $y, $w, $h) = @_;
2444 2975
2445 $self->SUPER::configure ($x, $y, $w, $h); 2976 $self->{w} = $w;
2977 $self->{h} = $h;
2978}
2446 2979
2980sub check_size {
2981 my ($self) = @_;
2982
2983 $self->size_allocate ($self->{w}, $self->{h})
2984 if $self->{w};
2985}
2986
2987sub size_request {
2988 my ($self) = @_;
2989
2990 ($self->{w}, $self->{h})
2991}
2992
2993sub size_allocate {
2994 my ($self, $w, $h) = @_;
2995
2447 for my $child (@{$self->{children}}) { 2996 for my $child ($self->children) {
2448 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2449 2998
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3000 if exists $child->{req_x};
3001
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3003 if exists $child->{req_y};
3004
2450 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2451 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007
2452 $child->configure ($X, $Y, $W,$H); 3008 $child->configure ($X, $Y, $W, $H);
2453 } 3009 }
2454} 3010}
2455 3011
2456sub _topleft { 3012sub coord2local {
2457 my ($self, $x, $y) = @_; 3013 my ($self, $x, $y) = @_;
2458 3014
2459 ($x, $y) 3015 ($x, $y)
2460} 3016}
2461 3017
3018sub coord2global {
3019 my ($self, $x, $y) = @_;
3020
3021 ($x, $y)
3022}
3023
2462sub update { 3024sub update {
2463 my ($self) = @_; 3025 my ($self) = @_;
2464 3026
2465 $self->check_size; 3027 $self->check_size;
2466 ::refresh (); 3028 $::WANT_REFRESH++;
2467} 3029}
2468 3030
2469sub add { 3031sub add {
2470 my ($self, $child) = @_; 3032 my ($self, @children) = @_;
2471 3033
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1;
3042
2472 # integerize window positions 3043 # integerise window positions
2473 $child->{x} = int $child->{x}; 3044 $child->{x} = int $child->{x};
2474 $child->{y} = int $child->{y}; 3045 $child->{y} = int $child->{y};
3046 }
2475 3047
2476 $self->SUPER::add ($child); 3048 $self->SUPER::add (@children);
3049}
3050
3051sub remove {
3052 my ($self, @children) = @_;
3053
3054 $self->SUPER::remove (@children);
3055
3056 while (@children) {
3057 my $w = pop @children;
3058 push @children, $w->children;
3059 $w->set_invisible;
3060 }
2477} 3061}
2478 3062
2479sub on_refresh { 3063sub on_refresh {
2480 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
2481 3065
2482 $self->{refresh_hook}{$id} = $cb; 3066 $self->{refresh_hook}{$id} = $cb;
2483} 3067}
2484 3068
3069sub on_post_alloc {
3070 my ($self, $id, $cb) = @_;
3071
3072 $self->{post_alloc_hook}{$id} = $cb;
3073}
3074
2485sub draw { 3075sub draw {
2486 my ($self) = @_; 3076 my ($self) = @_;
2487 3077
2488 while (my $rcb = delete $self->{refresh_hook}) { 3078 while ($self->{refresh_hook}) {
2489 $_->() for values %$rcb; 3079 $_->()
3080 for values %{delete $self->{refresh_hook}};
3081 }
3082
3083 if ($self->{check_size}) {
3084 my @queue = ([], []);
3085
3086 for (;;) {
3087 if ($self->{check_size}) {
3088 # heuristic: check containers last
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3090 for values %{delete $self->{check_size}}
3091 }
3092
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3094
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3096 ? @$widget{qw(user_w user_h)}
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102
3103 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h;
3105
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3107
3108 $widget->{parent}->check_size
3109 if $widget->{parent};
3110 }
3111 }
3112 }
3113
3114 while ($self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) {
3116 my ($widget, $w, $h) = @$_;
3117
3118 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0;
3120
3121 $widget->{w} = $w;
3122 $widget->{h} = $h;
3123 $widget->emit (size_allocate => $w, $h);
3124 }
3125 }
3126
3127 while ($self->{post_alloc_hook}) {
3128 $_->()
3129 for values %{delete $self->{post_alloc_hook}};
2490 } 3130 }
2491 3131
2492 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3132 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2493 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2494 glClear GL_COLOR_BUFFER_BIT; 3134 glClear GL_COLOR_BUFFER_BIT;
2495 3135
2496 glMatrixMode GL_PROJECTION; 3136 glMatrixMode GL_PROJECTION;
2497 glLoadIdentity; 3137 glLoadIdentity;
2498 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2499 glMatrixMode GL_MODELVIEW; 3139 glMatrixMode GL_MODELVIEW;
2500 glLoadIdentity; 3140 glLoadIdentity;
2501 3141
2502 $self->_draw; 3142 $self->_draw;
2503} 3143}
… …
2505############################################################################# 3145#############################################################################
2506 3146
2507package CFClient::UI; 3147package CFClient::UI;
2508 3148
2509$ROOT = new CFClient::UI::Root; 3149$ROOT = new CFClient::UI::Root;
2510$TOOLTIP = new CFClient::UI::Tooltip; 3150$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2511 3151
25121 31521
2513 3153

Diff Legend

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