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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
287} 288}
288 289
289sub set_visibility { 290sub set_visibility {
290 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
313} 314}
314 315
315sub move_abs { 316sub move_abs {
316 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
317 318
318 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
321 322
322 $self->update; 323 $self->update;
323} 324}
324 325
… …
332} 333}
333 334
334sub size_request { 335sub size_request {
335 require Carp; 336 require Carp;
336 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
337} 342}
338 343
339sub configure { 344sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
341 346
… …
365 370
366 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
367 } 372 }
368} 373}
369 374
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
375} 381}
376 382
377sub set_max_size { 383sub set_max_size {
378 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
379 385
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
382} 390}
383 391
384sub set_tooltip { 392sub set_tooltip {
385 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
386 394
… …
391 399
392 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
393 401
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 405 }
398} 406}
399 407
400# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
401sub coord2local { 409sub coord2local {
… …
409 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
410 418
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 420}
413 421
414sub focus_in { 422sub invoke_focus_in {
415 my ($self) = @_; 423 my ($self) = @_;
416 424
417 return if $FOCUS == $self; 425 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
419 427
420 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
421 429
422 $self->_emit (focus_in => $focus);
423
424 $focus->update if $focus; 430 $focus->update if $focus;
425 $FOCUS->update; 431 $FOCUS->update;
426}
427 432
433 0
434}
435
428sub focus_out { 436sub invoke_focus_out {
429 my ($self) = @_; 437 my ($self) = @_;
430 438
431 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
432 440
433 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
434 442
435 $self->_emit (focus_out => $focus);
436
437 $focus->update if $focus; #? 443 $focus->update if $focus; #?
438 444
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 446 unless $FOCUS;
441}
442 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
443sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
444sub button_up { } 458sub invoke_button_up { 1 }
445sub key_down { } 459sub invoke_key_down { 1 }
446sub key_up { } 460sub invoke_key_up { 1 }
447 461
448sub button_down { 462sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
450 464
451 $self->focus_in; 465 $self->grab_focus;
452}
453 466
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
459 484
460sub find_widget { 485sub find_widget {
461 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
462 487
463 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
472sub set_parent { 497sub set_parent {
473 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
474 499
475 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500} 502}
501 503
502sub realloc { 504sub realloc {
503 my ($self) = @_; 505 my ($self) = @_;
504 506
… …
525 527
526 $self->realloc; 528 $self->realloc;
527 $self->update; 529 $self->update;
528} 530}
529 531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
530sub draw { 536sub draw {
531 my ($self) = @_; 537 my ($self) = @_;
532 538
533 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 548
535 glPushMatrix; 549 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 551
540 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 554 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 556 glBegin GL_QUADS;
547 glVertex $x , $y; 557 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
551 glEnd; 561 glEnd;
552 glDisable GL_BLEND; 562 glDisable GL_BLEND;
553 } 563 }
554 564
555 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 566 glPushMatrix;
557 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 570 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
564 glEnd; 574 glEnd;
565 glPopMatrix; 575 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
568} 581}
569 582
570sub _draw { 583sub _draw {
571 my ($self) = @_; 584 my ($self) = @_;
572 585
… …
575 588
576sub DESTROY { 589sub DESTROY {
577 my ($self) = @_; 590 my ($self) = @_;
578 591
579 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
580 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 596}
582 597
583############################################################################# 598#############################################################################
584 599
585package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
610 625
611 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
613 628
614 glEnable GL_BLEND; 629 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 631 glColor_premultiply @$color;
617 632
618 glBegin GL_QUADS; 633 glBegin GL_QUADS;
619 glVertex 0 , 0; 634 glVertex 0 , 0;
620 glVertex 0 , $h; 635 glVertex 0 , $h;
621 glVertex $w, $h; 636 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
653 668
654sub new { 669sub new {
655 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
656 671
657 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
658 673
659 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
660 children => [], 675 children => [],
661 can_events => 0, 676 can_events => 0,
662 %arg, 677 %arg,
663 ); 678 );
679
664 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
665 682
666 $self 683 $self
667} 684}
668 685
669sub add { 686sub add {
… …
717 $x -= $self->{x}; 734 $x -= $self->{x};
718 $y -= $self->{y}; 735 $y -= $self->{y};
719 736
720 my $res; 737 my $res;
721 738
722 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
724 and return $res; 741 and return $res;
725 } 742 }
726 743
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748} 765}
749 766
750sub add { 767sub add {
751 my ($self, $child) = @_; 768 my ($self, $child) = @_;
752 769
753 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
756} 772}
757 773
758sub remove { 774sub remove {
759 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
768 784
769sub size_request { 785sub size_request {
770 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
771} 787}
772 788
773sub size_allocate { 789sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
775 791
776 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
777} 795}
778 796
779############################################################################# 797#############################################################################
798
799# back-buffered drawing area
780 800
781package CFClient::UI::Window; 801package CFClient::UI::Window;
782 802
783our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
784 804
… …
795 815
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 817 $self->SUPER::update;
798} 818}
799 819
800sub size_allocate { 820sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
802 822
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
805} 826}
806 827
807sub _render { 828sub _render {
829 my ($self) = @_;
830
808 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
809} 832}
810 833
811sub render_child { 834sub render_child {
812 my ($self) = @_; 835 my ($self) = @_;
813 836
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
817 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
818 $self->_render; 848 $self->_render;
819 }; 849 };
820} 850}
821 851
822sub _draw { 852sub _draw {
823 my ($self) = @_; 853 my ($self) = @_;
824 854
825 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
826 856
827 my $tex = $self->{texture} 857 my $tex = $self->{texture}
828 or return; 858 or return;
829 859
830 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
833 863
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 865
836 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
837} 867}
… …
861 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
862 892
863 ($w, $h) 893 ($w, $h)
864} 894}
865 895
866sub size_allocate { 896sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
868 898
869 my $child = $self->child; 899 my $child = $self->child;
870 900
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 903
874 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
875 $self->update; 905 $self->update;
906
907 1
876} 908}
877 909
878sub set_offset { 910sub set_offset {
879 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
880 912
… …
913} 945}
914 946
915sub _render { 947sub _render {
916 my ($self) = @_; 948 my ($self) = @_;
917 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 954
920 $self->SUPER::_render; 955 $self->SUPER::_render;
921} 956}
922 957
… …
925package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
926 961
927our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
928 963
929sub new { 964sub new {
930 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
931 968
932 my $self; 969 my $self;
933 970
934 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
935 vertical => 1, 972 vertical => 1,
… …
940 ; 977 ;
941 978
942 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 981 slider => $slider,
945 @_, 982 %arg,
946 ); 983 );
947 984
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
951 987
952 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
953} 995}
954 996
955sub update { 997sub update {
956 my ($self) = @_; 998 my ($self) = @_;
957 999
… …
960 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1005}
964 1006
965sub size_allocate { 1007sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969 1009
970 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
972} 1014}
973 1015
974#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll 1017# update viewport offset on scroll
976 1018
… …
996 1038
997 if ($self->{bg}) { 1039 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
999 1041
1000 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1003 1045
1004 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1047 glVertex 0 , 0;
1006 glVertex 0 , $h; 1048 glVertex 0 , $h;
1007 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1029my @border = 1071my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1074
1033sub new { 1075sub new {
1034 my $class = shift; 1076 my ($class, %arg) = @_;
1035 1077
1036 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1081 border => 0.6,
1040 can_events => 1, 1082 can_events => 1,
1041 min_w => 16, 1083 min_w => 16,
1042 min_h => 16, 1084 min_h => 16,
1043 @_ 1085 %arg,
1044 ); 1086 );
1045 1087
1046 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1089 align => 0,
1048 valign => 1, 1090 valign => 1,
1049 text => $self->{title}, 1091 text => $self->{title},
1050 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
1051 1103
1052 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1113}
1054 1114
1055sub border { 1115sub border {
1056 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1057} 1117}
1058 1118
1059sub size_request { 1119sub size_request {
1060 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1061 1127
1062 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1063 1129
1064 ( 1130 (
1065 $w + $self->border * 2, 1131 $w + $self->border * 2,
1066 $h + $self->border * 2, 1132 $h + $self->border * 2,
1067 ) 1133 )
1068} 1134}
1069 1135
1070sub size_allocate { 1136sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1072 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
1073 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1075 1149
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1082sub button_down { 1158sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1084 1160
1085 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1162 my $border = $self->border;
1087 1163
… …
1103 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
1104 1180
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1183
1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1185 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1186 };
1111 1187
1112 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
1118 1194
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1196
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
1123 } 1205 1
1124} 1206}
1125 1207
1126sub button_up { 1208sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1128 1210
1129 delete $self->{motion}; 1211 ! ! delete $self->{motion}
1130} 1212}
1131 1213
1132sub mouse_motion { 1214sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1134 1216
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
1136} 1220}
1137 1221
1138sub _draw { 1222sub _draw {
1139 my ($self) = @_; 1223 my ($self) = @_;
1140 1224
1225 my $child = $self->{children}[0];
1226
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1229
1144 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1232
1147 my $border = $self->border; 1233 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1249 }
1164 1250
1165 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1166 1252
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1253 $child->draw;
1254
1255 if ($self->{title_widget}) {
1256 glTranslate 0, $border - $self->{h};
1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1170} 1264}
1171 1265
1172############################################################################# 1266#############################################################################
1173 1267
1174package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1197 1291
1198 $child->set_parent ($self); 1292 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1200 1294
1201 $self->realloc; 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1202} 1302}
1203 1303
1204# TODO: move to container class maybe? send children a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1305sub clear {
1206 my ($self) = @_; 1306 my ($self) = @_;
… …
1247 (sum @$ws), 1347 (sum @$ws),
1248 (sum @$hs), 1348 (sum @$hs),
1249 ) 1349 )
1250} 1350}
1251 1351
1252sub size_allocate { 1352sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1254 1354
1255 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1256 1356
1257 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1289 } 1389 }
1290 1390
1291 $y += $row_h; 1391 $y += $row_h;
1292 } 1392 }
1293 1393
1394 1
1294} 1395}
1295 1396
1296sub find_widget { 1397sub find_widget {
1297 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1298 1399
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1438 )
1338} 1439}
1339 1440
1340sub size_allocate { 1441sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1342 1443
1343 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1345 1446
1346 my @req; 1447 my @req;
1347 1448
1348 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1350 } else { 1451 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1353 1454
1354 if ($req > $space) { 1455 if ($req > $space) {
1355 # ah well, not enough space 1456 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1357 } else { 1458 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1460
1360 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1361 1462
1362 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1464 for 0 .. $#children;
1364 } 1465 }
1365 } 1466 }
1366 1467
1367 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1368 1469
1369 my $pos = 0; 1470 my $pos = 0;
1370 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1474
1374 $pos += $alloc; 1475 $pos += $alloc;
1375 } 1476 }
1376 1477
1377 1 1478 1
… …
1467 1568
1468 delete $self->{texture}; 1569 delete $self->{texture};
1469 $self->SUPER::update; 1570 $self->SUPER::update;
1470} 1571}
1471 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1472sub set_text { 1580sub set_text {
1473 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1474 1582
1475 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1477 1585
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1480 1588
1589 delete $self->{size_req};
1481 $self->realloc; 1590 $self->realloc;
1482 $self->update; 1591 $self->update;
1483} 1592}
1484 1593
1485sub set_markup { 1594sub set_markup {
… …
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1601
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1495 1604
1605 delete $self->{size_req};
1496 $self->realloc; 1606 $self->realloc;
1497 $self->update; 1607 $self->update;
1498} 1608}
1499 1609
1500sub size_request { 1610sub size_request {
1501 my ($self) = @_; 1611 my ($self) = @_;
1502 1612
1613 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1619
1509 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1510 1621
1511 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1625
1515 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1516 1627
1517 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1519 } 1633 };
1520 1634
1521 ($w, $h) 1635 @{ $self->{size_req} }
1522} 1636}
1523 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1524sub size_allocate { 1642sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1526 1644
1645 delete $self->{ox};
1646
1527 delete $self->{texture} 1647 delete $self->{texture}
1528 ;#d# 1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1529} 1651}
1530 1652
1531sub set_fontsize { 1653sub set_fontsize {
1532 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1533 1655
1534 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1535 delete $self->{texture}; 1657 delete $self->{texture};
1536 1658
1537 $self->realloc; 1659 $self->realloc;
1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1538} 1668}
1539 1669
1540sub _draw { 1670sub _draw {
1541 my ($self) = @_; 1671 my ($self) = @_;
1542 1672
… …
1548 $self->{layout}->set_width ($self->{w}); 1678 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1679 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1682
1553 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1683 new_from_layout CFClient::Texture $self->{layout}
1684 };
1554 1685
1686 unless (exists $self->{ox}) {
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5); 1689 : ($self->{w} - $tex->{w}) * 0.5);
1558 1690
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1564 }; 1694 };
1565 1695
1566 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1568 1700
1569 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1570 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1572 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1574 } 1708 }
1575 1709
1576 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1577} 1711}
1578 1712
… …
1595 can_hover => 1, 1729 can_hover => 1,
1596 can_focus => 1, 1730 can_focus => 1,
1597 valign => 0, 1731 valign => 0,
1598 can_events => 1, 1732 can_events => 1,
1599 #text => ... 1733 #text => ...
1734 #hidden => "*",
1600 @_ 1735 @_
1601 ) 1736 )
1602} 1737}
1603 1738
1604sub _set_text { 1739sub _set_text {
… …
1606 1741
1607 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1608 1743
1609 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1610 1745
1611 delete $self->{texture};
1612
1613 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1614 $self->{text} = $text; 1747 $self->{text} = $text;
1615 1748
1616 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1617 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1618 1752
1619 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1620} 1757}
1621 1758
1622sub set_text { 1759sub set_text {
1623 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1624 1761
1625 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1626 $self->_set_text ($text); 1763 $self->_set_text ($text);
1627
1628 $self->realloc;
1629} 1764}
1630 1765
1631sub get_text { 1766sub get_text {
1632 $_[0]{text} 1767 $_[0]{text}
1633} 1768}
… …
1638 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1639 1774
1640 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1641} 1776}
1642 1777
1643sub key_down { 1778sub invoke_key_down {
1644 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1645 1780
1646 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1647 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1648 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1660 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1661 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1662 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1663 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1664 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1665 $self->_emit ('escape'); 1800 $self->emit ('escape');
1666 } elsif ($uni) { 1801 } elsif ($uni) {
1667 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1668 } 1805 }
1669 1806
1670 $self->_set_text ($text); 1807 $self->_set_text ($text);
1671 1808
1672 $self->realloc; 1809 $self->realloc;
1673}
1674 1810
1811 1
1812}
1813
1675sub focus_in { 1814sub invoke_focus_in {
1676 my ($self) = @_; 1815 my ($self) = @_;
1677 1816
1678 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1679 1818
1680 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1681} 1820}
1682 1821
1683sub button_down { 1822sub invoke_button_down {
1684 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1685 1824
1686 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1687 1826
1688 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1689 1828
1690 # byte-index to char-index 1829 # byte-index to char-index
1691 my $text = $self->{text}; 1830 my $text = $self->{text};
1692 utf8::encode $text; 1831 utf8::encode $text;
1693 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1694 1833
1695 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1696 $self->update; 1835 $self->update;
1836
1837 1
1697} 1838}
1698 1839
1699sub mouse_motion { 1840sub invoke_mouse_motion {
1700 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1701# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1843
1844 1
1702} 1845}
1703 1846
1704sub _draw { 1847sub _draw {
1705 my ($self) = @_; 1848 my ($self) = @_;
1706 1849
1707 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1708 1851
1709 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1710 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1711 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1712 } else { 1855 } else {
1713 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1714 } 1857 }
1715 1858
1716 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1718 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1719 glVertex 0 , 0; 1862 glVertex 0 , 0;
1720 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1721 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1722 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1747 1890
1748our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1749 1892
1750use CFClient::OpenGL; 1893use CFClient::OpenGL;
1751 1894
1752sub key_down { 1895sub invoke_key_down {
1753 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1754 1897
1755 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1756 1899
1757 if ($sym == 13) { 1900 if ($sym == 13) {
1758 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1759 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1760 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1761 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1762 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1763 $self->update; 1907 $self->update;
1764 1908
1765 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1766 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1767 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1783 } else { 1927 } else {
1784 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1785 } 1929 }
1786 1930
1787 } else { 1931 } else {
1788 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1789 } 1935 1
1790
1791} 1936}
1792 1937
1793############################################################################# 1938#############################################################################
1794 1939
1795package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1816 can_events => 1, 1961 can_events => 1,
1817 @_ 1962 @_
1818 ) 1963 )
1819} 1964}
1820 1965
1821sub activate { }
1822
1823sub button_up { 1966sub invoke_button_up {
1824 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1825 1968
1826 $self->emit ("activate") 1969 $self->emit ("activate")
1827 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1828 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1972
1973 1
1829} 1974}
1830 1975
1831sub _draw { 1976sub _draw {
1832 my ($self) = @_; 1977 my ($self) = @_;
1833 1978
1834 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1835
1836 if ($GRAB == $self) {
1837 $self->{fg} = $self->{active_fg};
1838 }
1839 1980
1840 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1842 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1843 1984
1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1845 1986
1846 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1847 1988
1848 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1849} 2026}
1850 2027
1851############################################################################# 2028#############################################################################
1852 2029
1853package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1880 my ($self) = @_; 2057 my ($self) = @_;
1881 2058
1882 (6) x 2 2059 (6) x 2
1883} 2060}
1884 2061
1885sub button_down { 2062sub invoke_button_down {
1886 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1887 2064
1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1890 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1891 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1892 } 2073 1
1893} 2074}
1894 2075
1895sub _draw { 2076sub _draw {
1896 my ($self) = @_; 2077 my ($self) = @_;
1897 2078
… …
1917package CFClient::UI::Image; 2098package CFClient::UI::Image;
1918 2099
1919our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1920 2101
1921use CFClient::OpenGL; 2102use CFClient::OpenGL;
1922use Carp qw/confess/;
1923 2103
1924our %loaded_images; 2104our %texture_cache;
1925 2105
1926sub new { 2106sub new {
1927 my $class = shift; 2107 my $class = shift;
1928 2108
1929 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1930 2113
1931 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
1932 2116
1933 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1934 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1935 2119
1936 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1937 2121
1938 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1939
1940 $self->{aspect} = $tex->{w} / $tex->{h};
1941 2123
1942 $self 2124 $self
1943} 2125}
1944 2126
1945sub size_request { 2127sub size_request {
1946 my ($self) = @_; 2128 my ($self) = @_;
1947 2129
1948 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1949} 2131}
1950 2132
1951sub _draw { 2133sub _draw {
1952 my ($self) = @_; 2134 my ($self) = @_;
1953 2135
… …
2064 2246
2065 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
2067 2249
2068 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2255
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2188 $self->update; 2371 $self->update;
2189 2372
2190 $self 2373 $self
2191} 2374}
2192 2375
2193sub changed { }
2194
2195sub set_range { 2376sub set_range {
2196 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2197 2378
2198 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2199 2380
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}"; 2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2202} 2385}
2203 2386
2204sub set_value { 2387sub set_value {
2205 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2206 2389
… …
2217 if $unit; 2400 if $unit;
2218 2401
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220 2403
2221 if ($value != $old_value) { 2404 if ($value != $old_value) {
2222 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2223 $self->update; 2406 $self->update;
2224 } 2407 }
2225} 2408}
2226 2409
2227sub size_request { 2410sub size_request {
2228 my ($self) = @_; 2411 my ($self) = @_;
2229 2412
2230 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2231} 2414}
2232 2415
2233sub button_down { 2416sub invoke_button_down {
2234 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2235 2418
2236 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2237 2420
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239 2422
2240 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2241} 2424}
2242 2425
2243sub mouse_motion { 2426sub invoke_mouse_motion {
2244 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2245 2428
2246 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248 2431
2249 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250 2433
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252 2435
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else {
2438 return 0;
2439 }
2440
2254 } 2441 1
2255} 2442}
2256 2443
2257sub update { 2444sub update {
2258 my ($self) = @_; 2445 my ($self) = @_;
2259 2446
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2261 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2262 2456
2263 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2265 2459
… …
2271 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2272 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2273 2467
2274 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2275 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2276 }); 2470 }
2277
2278 $self->SUPER::update;
2279}
2280
2281sub _draw {
2282 my ($self) = @_;
2283 2471
2284 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2285 2473
2286 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2287 2475
… …
2348sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2350 2538
2351############################################################################# 2539#############################################################################
2352 2540
2353package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2354 2542
2355our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2356 2544
2357use CFClient::OpenGL; 2545use CFClient::OpenGL;
2358 2546
… …
2360 my $class = shift; 2548 my $class = shift;
2361 2549
2362 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2363 fontsize => 1, 2551 fontsize => 1,
2364 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2365 #font => default_font 2554 #font => default_font
2366 @_, 2555 @_,
2367 2556
2368 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2369 par => [], 2558 par => [],
… …
2384 2573
2385 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2386 $self->reflow; 2575 $self->reflow;
2387} 2576}
2388 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2389sub size_allocate { 2587sub invoke_size_allocate {
2390 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2391 2589
2392 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2393 2592
2394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 2597
2398 $self->reflow; 2598 $self->reflow;
2399}
2400 2599
2401sub text_size { 2600 local $self->{children} = [$empty, $slider];
2402 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2403 2606
2404 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2405 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2409 2620 );
2621
2410 $layout->size 2622 $layout
2411} 2623}
2412 2624
2413sub reflow { 2625sub reflow {
2414 my ($self) = @_; 2626 my ($self) = @_;
2415 2627
… …
2424 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2425} 2637}
2426 2638
2427sub clear { 2639sub clear {
2428 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2429 2644
2430 $self->{par} = []; 2645 $self->{par} = [];
2431 $self->{height} = 0; 2646 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433} 2648}
2434 2649
2435sub add_paragraph { 2650sub add_paragraph {
2436 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2437 2652
2438 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2439 my ($w, $h) = $self->text_size ($line); 2654
2440 $self->{height} += $h; 2655 $para = {
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2442 } 2662 };
2443 2663
2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2445} 2676}
2446 2677
2447sub update { 2678sub update {
2448 my ($self) = @_; 2679 my ($self) = @_;
2449 2680
… …
2451 2682
2452 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2453 2684
2454 delete $self->{texture}; 2685 delete $self->{texture};
2455 2686
2456 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458 2689
2459 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2460 my $height = 0; 2691 my $height = 0;
2461 2692
2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2466 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2468 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3]; 2697
2472 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2473 } 2701 }
2474 2702
2475 $height += $_->[1]; 2703 $height += $para->{h};
2476 } 2704 }
2477 2705
2478 $self->{height} = $height; 2706 $self->{height} = $height;
2479 2707
2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2481 2709
2482 delete $self->{texture}; 2710 delete $self->{texture};
2483 } 2711 }
2484 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2486 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2487 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2488 2720
2489 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2490 2722
2491 my $y0 = $top; 2723 my $y0 = $top;
2492 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2493 2725
2494 my $y = 0; 2726 my $y = 0;
2495
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499 2727
2500 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2503 2731
2504 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2505 my $h = $par->[1]; 2733 my $h = $para->{h};
2506 2734
2507 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] }); 2736
2509 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2510 $layout->set_markup ($par->[4]);
2511 2738
2512 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2513 2740
2514 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2516 } 2756 }
2517 2757
2518 $y += $h; 2758 $y += $h;
2519 } 2759 }
2520 2760
2521 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2522 }; 2762 };
2523 }); 2763 });
2524} 2764}
2525 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2526sub _draw { 2775sub _draw {
2527 my ($self) = @_; 2776 my ($self) = @_;
2528 2777
2529 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2533 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2534 2783
2535 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2536
2537} 2785}
2538 2786
2539############################################################################# 2787#############################################################################
2540 2788
2541package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2628 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2632 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2633 2884
2634 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2635 markup => $tooltip, 2886 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2648 2899
2649 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2650} 2901}
2651 2902
2652sub size_allocate { 2903sub invoke_size_allocate {
2653 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2654 2905
2655 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2656} 2907}
2657 2908
2658sub visibility_change { 2909sub invoke_visibility_change {
2659 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2660 2911
2661 return unless $visible; 2912 return unless $visible;
2662 2913
2663 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2665 or return; 2916 or return;
2666 2917
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668 2919
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2671 2922
2672 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2673 }); 2924 });
2674} 2925}
2675 2926
… …
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765 3016
2766 if ($tex) { 3017 if ($tex) {
2767 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2772 } 3023 }
2773} 3024}
2774 3025
2775sub DESTROY { 3026sub destroy {
2776 my ($self) = @_; 3027 my ($self) = @_;
2777 3028
2778 $self->{timer}->cancel 3029 $self->{timer}->cancel
2779 if $self->{timer}; 3030 if $self->{timer};
2780 3031
2781 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2782} 3033}
3034
3035#############################################################################
3036
3037package CFClient::UI::Buttonbar;
3038
3039our @ISA = CFClient::UI::HBox::;
3040
3041# TODO: should actualyl wrap buttons and other goodies.
2783 3042
2784############################################################################# 3043#############################################################################
2785 3044
2786package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2787 3046
… …
2799 ); 3058 );
2800 3059
2801 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2802 3061
2803 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2804 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2805 3064
2806 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2807 if (!ref $widget) { 3066 if (!ref $widget) {
2808 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2809 can_hover => 1, 3068 can_hover => 1,
2810 can_events => 1, 3069 can_events => 1,
2811 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2812 } 3072 }
2813 3073
2814 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2815 3075
2816 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2821 3081
2822# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
2823sub popup { 3083sub popup {
2824 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2825 3085
2826 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2827 3087
2828 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2829 $GRAB = $self; 3089 $GRAB = $self;
2830 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2831 3091
2832 $self->show; 3092 $self->show;
2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2834} 3094}
2835 3095
2836sub mouse_motion { 3096sub invoke_mouse_motion {
2837 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2838 3098
2839 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2842}
2843 3102
3103 0
3104}
3105
2844sub button_up { 3106sub invoke_button_up {
2845 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2846 3108
2847 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2848 undef $GRAB; 3110 undef $GRAB;
2849 $self->hide; 3111 $self->hide;
2850 3112
2851 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3115 } else {
3116 return 0
3117 }
3118
2853 } 3119 1
2854} 3120}
2855 3121
2856############################################################################# 3122#############################################################################
2857 3123
2858package CFClient::UI::Statusbox; 3124package CFClient::UI::Multiplexer;
2859 3125
2860our @ISA = CFClient::UI::VBox::; 3126our @ISA = CFClient::UI::Container::;
2861 3127
2862sub new { 3128sub new {
2863 my $class = shift; 3129 my $class = shift;
2864 3130
2865 $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
3132 @_,
3133 );
3134
3135 $self->{current} = $self->{children}[0]
3136 if @{ $self->{children} };
3137
3138 $self
3139}
3140
3141sub add {
3142 my ($self, @widgets) = @_;
3143
3144 $self->SUPER::add (@widgets);
3145
3146 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} };
3148}
3149
3150sub set_current_page {
3151 my ($self, $page_or_widget) = @_;
3152
3153 my $widget = ref $page_or_widget
3154 ? $page_or_widget
3155 : $self->{children}[$page_or_widget];
3156
3157 $self->{current} = $widget;
3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3159
3160 $self->emit (page_changed => $self->{current});
3161
3162 $self->realloc;
3163}
3164
3165sub visible_children {
3166 $_[0]{current}
3167}
3168
3169sub size_request {
3170 my ($self) = @_;
3171
3172 $self->{current}->size_request
3173}
3174
3175sub invoke_size_allocate {
3176 my ($self, $w, $h) = @_;
3177
3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3181}
3182
3183sub _draw {
3184 my ($self) = @_;
3185
3186 $self->{current}->draw;
3187}
3188
3189#############################################################################
3190
3191package CFClient::UI::Notebook;
3192
3193our @ISA = CFClient::UI::VBox::;
3194
3195sub new {
3196 my $class = shift;
3197
3198 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self
3202 @_,
3203 );
3204
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207
3208 $self
3209}
3210
3211sub add {
3212 my ($self, $title, $widget, $tooltip) = @_;
3213
3214 Scalar::Util::weaken $self;
3215
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget);
3223}
3224
3225sub set_current_page {
3226 my ($self, $page) = @_;
3227
3228 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current});
3230}
3231
3232#############################################################################
3233
3234package CFClient::UI::Combobox;
3235
3236use utf8;
3237
3238our @ISA = CFClient::UI::Button::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 options => [], # [value, title, longdesc], ...
3245 value => undef,
3246 @_,
3247 );
3248
3249 $self->_set_value ($self->{value});
3250
3251 $self
3252}
3253
3254sub invoke_button_down {
3255 my ($self, $ev) = @_;
3256
3257 my @menu_items;
3258
3259 for (@{ $self->{options} }) {
3260 my ($value, $title, $tooltip) = @$_;
3261
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 }
3264
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266}
3267
3268sub _set_value {
3269 my ($self, $value) = @_;
3270
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3272 or return;
3273
3274 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]);
3277}
3278
3279sub set_value {
3280 my ($self, $value) = @_;
3281
3282 return unless $self->{value} ne $value;
3283
3284 $self->_set_value ($value);
3285 $self->emit (changed => $value);
3286}
3287
3288#############################################################################
3289
3290package CFClient::UI::Statusbox;
3291
3292our @ISA = CFClient::UI::VBox::;
3293
3294sub new {
3295 my $class = shift;
3296
3297 my $self = $class->SUPER::new (
2866 fontsize => 0.8, 3298 fontsize => 0.8,
2867 @_, 3299 @_,
2868 ) 3300 );
3301
3302 Scalar::Util::weaken (my $this = $self);
3303
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305
3306 $self
2869} 3307}
2870 3308
2871sub reorder { 3309sub reorder {
2872 my ($self) = @_; 3310 my ($self) = @_;
2873 my $NOW = time; 3311 my $NOW = Time::HiRes::time;
3312
3313 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} };
2874 3317
2875 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 } 3320 }
2878 3321
… …
2881 my @items = sort { 3324 my @items = sort {
2882 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
2885 3328
3329 $self->{timer}->interval (1);
3330
2886 my $count = 10 + 1; 3331 my $count = 10 + 1;
2887 for my $item (@items) { 3332 for my $item (@items) {
2888 last unless --$count; 3333 last unless --$count;
2889 3334
2890 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text}; 3339 : $item->{text};
2895 3340
… …
2903 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
2909 can_events => 1, 3354 can_events => 1,
2910 can_hover => 1 3355 can_hover => 1
2911 }; 3356 };
3357
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1;
3363 $self->{timer}->interval (1/30);
3364 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 }
3367
3368 push @widgets, $label;
2912 } 3369 }
2913 3370
2914 $self->clear; 3371 $self->clear;
2915 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
2916} 3373}
… …
2921 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
2923 3380
2924 return unless $text; 3381 return unless $text;
2925 3382
2926 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2927 3384
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929 3386
2930 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
2932 $item->{count}++; 3389 $item->{count}++;
2933 } else { 3390 } else {
2934 $item->{count} = 1; 3391 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
2936 } 3393 }
2937 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
2938 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
2939 delete $item->{label}; 3396 delete $item->{label};
2940 } else { 3397 } else {
2941 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
2942 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
2961 3418
2962 $self->reorder; 3419 $self->reorder;
2963 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
2964} 3421}
2965 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
2966############################################################################# 3431#############################################################################
2967 3432
2968package CFClient::UI::Inventory; 3433package CFClient::UI::Inventory;
2969 3434
2970our @ISA = CFClient::UI::ScrolledWindow::; 3435our @ISA = CFClient::UI::ScrolledWindow::;
2971 3436
2972sub new { 3437sub new {
2973 my $class = shift; 3438 my $class = shift;
2974 3439
2975 my $self = $class->SUPER::new ( 3440 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_, 3442 @_,
2978 ); 3443 );
2979 3444
2980 $self 3445 $self
2981} 3446}
2982 3447
2983sub set_items { 3448sub set_items {
2984 my ($self, $items) = @_; 3449 my ($self, $items) = @_;
2985 3450
2986 $self->{scrolled}->clear; 3451 $self->{child}->clear;
2987 return unless $items; 3452 return unless $items;
2988 3453
2989 my @items = sort { 3454 my @items = sort {
2990 ($a->{type} <=> $b->{type}) 3455 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name}) 3456 or ($a->{name} cmp $b->{name})
… …
2995 3460
2996 my $row = 0; 3461 my $row = 0;
2997 for my $item (@items) { 3462 for my $item (@items) {
2998 CFClient::Item::update_widgets $item; 3463 CFClient::Item::update_widgets $item;
2999 3464
3000 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3465 $self->{child}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3466 $self->{child}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3467 $self->{child}->add (2, $row, $item->{weight_widget});
3003 3468
3004 $row++; 3469 $row++;
3005 } 3470 }
3006} 3471}
3007 3472
… …
3069 $self->update_binding_widgets; 3534 $self->update_binding_widgets;
3070 3535
3071 $self 3536 $self
3072} 3537}
3073 3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3074sub commit { 3551sub commit {
3075 my ($self) = @_; 3552 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding; 3553 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) { 3554 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3105 $rec = $::CONN->stop_record if $::CONN; 3582 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY'; 3583 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec); 3584 $self->set_command_list ($rec);
3108} 3585}
3109 3586
3110# if $commit is true, the binding will be set after the user entered a key combo 3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3111sub ask_for_bind { 3593sub ask_for_bind {
3112 my ($self, $commit) = @_; 3594 my ($self, $commit, $end_cb) = @_;
3113 3595
3114 CFClient::Binder::open_binding_dialog (sub { 3596 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_; 3597 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets; 3599 $self->update_binding_widgets;
3118 $self->commit if $commit; 3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3119 }); 3602 });
3120} 3603}
3121 3604
3122# $mod and $sym are the modifiers and key symbol 3605# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands) 3606# $cmds is a array ref of strings (the commands)
… …
3141} 3624}
3142 3625
3143# this is a shortcut method that asks for a binding 3626# this is a shortcut method that asks for a binding
3144# and then just binds it. 3627# and then just binds it.
3145sub do_quick_binding { 3628sub do_quick_binding {
3146 my ($self, $cmds) = @_; 3629 my ($self, $cmds, $end_cb) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub { 3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1); 3631 $self->ask_for_bind (1, $end_cb);
3151} 3632}
3152 3633
3153sub update_binding_widgets { 3634sub update_binding_widgets {
3154 my ($self) = @_; 3635 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding; 3636 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3199 3680
3200############################################################################# 3681#############################################################################
3201 3682
3202package CFClient::UI::SpellList; 3683package CFClient::UI::SpellList;
3203 3684
3204our @ISA = CFClient::UI::FancyFrame::; 3685our @ISA = CFClient::UI::Table::;
3205 3686
3206sub new { 3687sub new {
3207 my $class = shift; 3688 my $class = shift;
3208 3689
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3690 my $self = $class->SUPER::new (
3210 3691 binding => [],
3211 $self->add (new CFClient::UI::ScrolledWindow 3692 commands => [],
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3693 @_,
3213 3694 )
3214 $self;
3215} 3695}
3216 3696
3217# XXX: Do sorting? Argl... 3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3218sub add_spell { 3782sub add_spell {
3219 my ($self, $spell) = @_; 3783 my ($self, $spell) = @_;
3784
3220 $self->{spells}->{$spell->{name}} = $spell; 3785 $self->{spell}->{$spell->{name}} = $spell;
3221 3786 $self->rebuild_spell_list;
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249} 3787}
3250 3788
3251sub remove_spell { 3789sub remove_spell {
3252 my ($self, $spell) = @_; 3790 my ($self, $spell) = @_;
3791
3253 delete $self->{spells}->{$spell->{name}}; 3792 delete $self->{spell}->{$spell->{name}};
3254 $self->rebuild_spell_list; 3793 $self->rebuild_spell_list;
3255} 3794}
3256 3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3257############################################################################# 3803#############################################################################
3258 3804
3259package CFClient::UI::Root; 3805package CFClient::UI::Root;
3260 3806
3261our @ISA = CFClient::UI::Container::; 3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3262 3810
3263use CFClient::OpenGL; 3811use CFClient::OpenGL;
3264 3812
3265sub new { 3813sub new {
3266 my $class = shift; 3814 my $class = shift;
… …
3293 $coord = $max - $size if $coord > $max - $size; 3841 $coord = $max - $size if $coord > $max - $size;
3294 3842
3295 int $coord + 0.5 3843 int $coord + 0.5
3296} 3844}
3297 3845
3298sub size_allocate { 3846sub invoke_size_allocate {
3299 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3300 3848
3301 for my $child ($self->children) { 3849 for my $child ($self->children) {
3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3303 3851
… …
3307 $X = _to_pixel $X, $W, $self->{w}; 3855 $X = _to_pixel $X, $W, $self->{w};
3308 $Y = _to_pixel $Y, $H, $self->{h}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3309 3857
3310 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3311 } 3859 }
3860
3861 1
3312} 3862}
3313 3863
3314sub coord2local { 3864sub coord2local {
3315 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3316 3866
… …
3372 $_->() 3922 $_->()
3373 for values %{delete $self->{refresh_hook}}; 3923 for values %{delete $self->{refresh_hook}};
3374 } 3924 }
3375 3925
3376 if ($self->{realloc}) { 3926 if ($self->{realloc}) {
3927 my %queue;
3377 my @queue; 3928 my @queue;
3929 my $widget;
3378 3930
3931 outer:
3379 while () { 3932 while () {
3380 if ($self->{realloc}) { 3933 if (my $realloc = delete $self->{realloc}) {
3381 #TODO use array-of-depth approach 3934 for $widget (values %$realloc) {
3935 $widget->{visible} or next; # do not resize invisible widgets
3382 3936
3383 use sort 'stable'; 3937 $queue{$widget+0}++ and next; # duplicates are common
3384 3938
3385 @queue = sort { $a->{visible} <=> $b->{visible} } 3939 push @{ $queue[$widget->{visible}] }, $widget;
3386 @queue, values %{delete $self->{realloc}}; 3940 }
3387 } 3941 }
3388 3942
3943 while () {
3944 @queue or last outer;
3945
3389 my $widget = pop @queue || last; 3946 $widget = pop @{ $queue[-1] || [] }
3947 and last;
3948
3949 pop @queue;
3950 }
3390 3951
3391 $widget->{visible} or last; # do not resize invisible widgets 3952 delete $queue{$widget+0};
3392 3953
3393 my ($w, $h) = $widget->size_request; 3954 my ($w, $h) = $widget->size_request;
3394 3955
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3397 3961
3398 $w = $widget->{force_w} if exists $widget->{force_w}; 3962 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h}; 3963 $h = $widget->{force_h} if exists $widget->{force_h};
3400 3964
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3404 $widget->{req_h} = $h; 3968 $widget->{req_h} = $h;
3405 3969
3406 $self->{size_alloc}{$widget+0} = $widget; 3970 $self->{size_alloc}{$widget+0} = $widget;
3407 3971
3408 if (my $parent = $widget->{parent}) { 3972 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent; 3973 $self->{realloc}{$parent+0} = $parent
3410 #unshift @queue, $parent; 3974 unless $queue{$parent+0};
3975
3411 $parent->{force_size_alloc} = 1; 3976 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent; 3977 $self->{size_alloc}{$parent+0} = $parent;
3413 } 3978 }
3414 } 3979 }
3415 3980
… …
3431 3996
3432 $w = int $w + 0.5; 3997 $w = int $w + 0.5;
3433 $h = int $h + 0.5; 3998 $h = int $h + 0.5;
3434 3999
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h};
4003
3436 $widget->{w} = $w; 4004 $widget->{w} = $w;
3437 $widget->{h} = $h; 4005 $widget->{h} = $h;
3438 4006
3439 $widget->emit (size_allocate => $w, $h); 4007 $widget->emit (size_allocate => $w, $h);
3440 } 4008 }
… …
3455 glLoadIdentity; 4023 glLoadIdentity;
3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3457 glMatrixMode GL_MODELVIEW; 4025 glMatrixMode GL_MODELVIEW;
3458 glLoadIdentity; 4026 glLoadIdentity;
3459 4027
4028 {
4029 package CFClient::UI::Base;
4030
4031 ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h});
4033 }
4034
3460 $self->_draw; 4035 $self->_draw;
3461} 4036}
3462 4037
3463############################################################################# 4038#############################################################################
3464 4039

Diff Legend

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