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.270 by elmex, Fri Jun 2 09:02:49 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 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $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;
320 $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;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
383} 390}
384 391
385sub set_tooltip { 392sub set_tooltip {
386 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
387 394
… …
392 399
393 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
394 401
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 405 }
399} 406}
400 407
401# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
402sub coord2local { 409sub coord2local {
… …
410 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
411 418
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 420}
414 421
415sub focus_in { 422sub invoke_focus_in {
416 my ($self) = @_; 423 my ($self) = @_;
417 424
418 return if $FOCUS == $self; 425 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
420 427
421 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
422 429
423 $self->_emit (focus_in => $focus);
424
425 $focus->update if $focus; 430 $focus->update if $focus;
426 $FOCUS->update; 431 $FOCUS->update;
427}
428 432
433 0
434}
435
429sub focus_out { 436sub invoke_focus_out {
430 my ($self) = @_; 437 my ($self) = @_;
431 438
432 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
433 440
434 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
435 442
436 $self->_emit (focus_out => $focus);
437
438 $focus->update if $focus; #? 443 $focus->update if $focus; #?
439 444
440 $::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
441 unless $FOCUS; 446 unless $FOCUS;
442}
443 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
444sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
445sub button_up { } 458sub invoke_button_up { 1 }
446sub key_down { } 459sub invoke_key_down { 1 }
447sub key_up { } 460sub invoke_key_up { 1 }
448 461
449sub button_down { 462sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
451 464
452 $self->focus_in; 465 $self->grab_focus;
466
467 1
468}
469
470sub connect {
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
453} 483}
454 484
455sub find_widget { 485sub find_widget {
456 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
457 487
… …
467sub set_parent { 497sub set_parent {
468 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
469 499
470 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 502}
496 503
497sub realloc { 504sub realloc {
498 my ($self) = @_; 505 my ($self) = @_;
499 506
… …
532 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
533 540
534 # update screen rectangle 541 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539 544
540 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 548
544 glPushMatrix; 549 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 551
549 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 554 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 556 glBegin GL_QUADS;
556 glVertex $x , $y; 557 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
560 glEnd; 561 glEnd;
561 glDisable GL_BLEND; 562 glDisable GL_BLEND;
562 } 563 }
563 564
564 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 566 glPushMatrix;
566 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 570 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
573 glEnd; 574 glEnd;
574 glPopMatrix; 575 glPopMatrix;
575 #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;
576 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
577} 581}
578 582
579sub _draw { 583sub _draw {
580 my ($self) = @_; 584 my ($self) = @_;
581 585
… …
584 588
585sub DESTROY { 589sub DESTROY {
586 my ($self) = @_; 590 my ($self) = @_;
587 591
588 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
589 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590} 596}
591 597
592############################################################################# 598#############################################################################
593 599
594package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
619 625
620 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
622 628
623 glEnable GL_BLEND; 629 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 631 glColor_premultiply @$color;
626 632
627 glBegin GL_QUADS; 633 glBegin GL_QUADS;
628 glVertex 0 , 0; 634 glVertex 0 , 0;
629 glVertex 0 , $h; 635 glVertex 0 , $h;
630 glVertex $w, $h; 636 glVertex $w, $h;
… …
661our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
662 668
663sub new { 669sub new {
664 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
665 671
666 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
667 673
668 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
669 children => [], 675 children => [],
670 can_events => 0, 676 can_events => 0,
671 %arg, 677 %arg,
672 ); 678 );
679
673 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
674 682
675 $self 683 $self
676} 684}
677 685
678sub add { 686sub add {
… …
726 $x -= $self->{x}; 734 $x -= $self->{x};
727 $y -= $self->{y}; 735 $y -= $self->{y};
728 736
729 my $res; 737 my $res;
730 738
731 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
733 and return $res; 741 and return $res;
734 } 742 }
735 743
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757} 765}
758 766
759sub add { 767sub add {
760 my ($self, $child) = @_; 768 my ($self, $child) = @_;
761 769
762 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
763
764 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
765} 772}
766 773
767sub remove { 774sub remove {
768 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
777 784
778sub size_request { 785sub size_request {
779 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
780} 787}
781 788
782sub size_allocate { 789sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
784 791
785 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
786} 795}
787 796
788############################################################################# 797#############################################################################
798
799# back-buffered drawing area
789 800
790package CFClient::UI::Window; 801package CFClient::UI::Window;
791 802
792our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
793 804
… …
804 815
805 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
806 $self->SUPER::update; 817 $self->SUPER::update;
807} 818}
808 819
809sub size_allocate { 820sub invoke_size_allocate {
810 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
811 822
812 $self->SUPER::size_allocate ($w, $h);
813 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
814} 826}
815 827
816sub _render { 828sub _render {
817 my ($self) = @_; 829 my ($self) = @_;
818 830
… …
845 my $tex = $self->{texture} 857 my $tex = $self->{texture}
846 or return; 858 or return;
847 859
848 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
851 863
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 865
854 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
855} 867}
… …
879 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
880 892
881 ($w, $h) 893 ($w, $h)
882} 894}
883 895
884sub size_allocate { 896sub invoke_size_allocate {
885 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
886 898
887 my $child = $self->child; 899 my $child = $self->child;
888 900
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891 903
892 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
893 $self->update; 905 $self->update;
906
907 1
894} 908}
895 909
896sub set_offset { 910sub set_offset {
897 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
898 912
… …
946package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
947 961
948our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
949 963
950sub new { 964sub new {
951 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
952 968
953 my $self; 969 my $self;
954 970
955 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
956 vertical => 1, 972 vertical => 1,
… …
961 ; 977 ;
962 978
963 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
965 slider => $slider, 981 slider => $slider,
966 @_, 982 %arg,
967 ); 983 );
968 984
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
972 987
973 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
974} 995}
975 996
976sub update { 997sub update {
977 my ($self) = @_; 998 my ($self) = @_;
978 999
… …
981 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
983 $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]);
984} 1005}
985 1006
986sub size_allocate { 1007sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990 1009
991 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
992 $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)
993} 1014}
994 1015
995#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll 1017# update viewport offset on scroll
997 1018
… …
1017 1038
1018 if ($self->{bg}) { 1039 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
1020 1041
1021 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1024 1045
1025 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1047 glVertex 0 , 0;
1027 glVertex 0 , $h; 1048 glVertex 0 , $h;
1028 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 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);
1053 1074
1054sub new { 1075sub new {
1055 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1056
1057 my $title = delete $arg{title};
1058 1077
1059 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1081 border => 0.6,
… …
1064 min_w => 16, 1083 min_w => 16,
1065 min_h => 16, 1084 min_h => 16,
1066 %arg, 1085 %arg,
1067 ); 1086 );
1068 1087
1069 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1070 align => 0, 1089 align => 0,
1071 valign => 1, 1090 valign => 1,
1072 text => $title, 1091 text => $self->{title},
1073 fontsize => $self->{border} 1092 fontsize => $self->{border},
1074 if defined $title; 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 }
1075 1103
1076 $self 1104 $self
1077} 1105}
1078 1106
1079sub add { 1107sub add {
1080 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1081 1109
1082 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1113}
1085 1114
1086sub border { 1115sub border {
1087 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1088} 1117}
1089 1118
1090sub size_request { 1119sub size_request {
1091 my ($self) = @_; 1120 my ($self) = @_;
1092 1121
1093 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1094 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1095 1127
1096 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1097 1129
1098 ( 1130 (
1099 $w + $self->border * 2, 1131 $w + $self->border * 2,
1100 $h + $self->border * 2, 1132 $h + $self->border * 2,
1101 ) 1133 )
1102} 1134}
1103 1135
1104sub size_allocate { 1136sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1106 1138
1107 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1143 }
1112 1144
1113 my $border = $self->border; 1145 my $border = $self->border;
1114 1146
1115 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1116 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1117 1149
1118 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1119}
1120 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1121sub button_down { 1158sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1123 1160
1124 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1162 my $border = $self->border;
1126 1163
… …
1142 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
1143 1180
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1183
1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1185 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1186 };
1150 1187
1151 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
1157 1194
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1196
1160 $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});
1161 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
1162 } 1205 1
1163} 1206}
1164 1207
1165sub button_up { 1208sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1167 1210
1168 delete $self->{motion}; 1211 ! ! delete $self->{motion}
1169} 1212}
1170 1213
1171sub mouse_motion { 1214sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1173 1216
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
1175} 1220}
1176 1221
1177sub _draw { 1222sub _draw {
1178 my ($self) = @_; 1223 my ($self) = @_;
1179 1224
… …
1205 1250
1206 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1207 1252
1208 $child->draw; 1253 $child->draw;
1209 1254
1210 if ($self->{title}) { 1255 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1256 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1213 } 1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1214} 1264}
1215 1265
1216############################################################################# 1266#############################################################################
1217 1267
1218package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1241 1291
1242 $child->set_parent ($self); 1292 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1244 1294
1245 $self->realloc; 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1246} 1302}
1247 1303
1248# 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?
1249sub clear { 1305sub clear {
1250 my ($self) = @_; 1306 my ($self) = @_;
… …
1291 (sum @$ws), 1347 (sum @$ws),
1292 (sum @$hs), 1348 (sum @$hs),
1293 ) 1349 )
1294} 1350}
1295 1351
1296sub size_allocate { 1352sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1298 1354
1299 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1300 1356
1301 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1333 } 1389 }
1334 1390
1335 $y += $row_h; 1391 $y += $row_h;
1336 } 1392 }
1337 1393
1394 1
1338} 1395}
1339 1396
1340sub find_widget { 1397sub find_widget {
1341 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1342 1399
… …
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 ) 1438 )
1382} 1439}
1383 1440
1384sub size_allocate { 1441sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1386 1443
1387 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1389 1446
1390 my @req; 1447 my @req;
1391 1448
1392 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1394 } else { 1451 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1397 1454
1398 if ($req > $space) { 1455 if ($req > $space) {
1399 # ah well, not enough space 1456 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1401 } else { 1458 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1460
1404 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1405 1462
1406 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1464 for 0 .. $#children;
1408 } 1465 }
1409 } 1466 }
1410 1467
1411 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1412 1469
1413 my $pos = 0; 1470 my $pos = 0;
1414 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1416 $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));
1417 1474
1418 $pos += $alloc; 1475 $pos += $alloc;
1419 } 1476 }
1420 1477
1421 1 1478 1
… …
1511 1568
1512 delete $self->{texture}; 1569 delete $self->{texture};
1513 $self->SUPER::update; 1570 $self->SUPER::update;
1514} 1571}
1515 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1516sub set_text { 1580sub set_text {
1517 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1518 1582
1519 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1521 1585
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1524 1588
1589 delete $self->{size_req};
1525 $self->realloc; 1590 $self->realloc;
1526 $self->update; 1591 $self->update;
1527} 1592}
1528 1593
1529sub set_markup { 1594sub set_markup {
… …
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1601
1537 $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;
1538 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1539 1604
1605 delete $self->{size_req};
1540 $self->realloc; 1606 $self->realloc;
1541 $self->update; 1607 $self->update;
1542} 1608}
1543 1609
1544sub size_request { 1610sub size_request {
1545 my ($self) = @_; 1611 my ($self) = @_;
1546 1612
1613 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1619
1553 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1554 1621
1555 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1625
1559 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1560 1627
1561 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1563 } 1633 };
1564 1634
1565 ($w, $h) 1635 @{ $self->{size_req} }
1566} 1636}
1567 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1568sub size_allocate { 1642sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1570 1644
1571 delete $self->{ox}; 1645 delete $self->{ox};
1572 1646
1573 delete $self->{texture} 1647 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1575} 1651}
1576 1652
1577sub set_fontsize { 1653sub set_fontsize {
1578 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1579 1655
1580 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1581 delete $self->{texture}; 1657 delete $self->{texture};
1582 1658
1583 $self->realloc; 1659 $self->realloc;
1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1584} 1668}
1585 1669
1586sub _draw { 1670sub _draw {
1587 my ($self) = @_; 1671 my ($self) = @_;
1588 1672
… …
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1610 }; 1694 };
1611 1695
1612 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1613 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};
1614 1700
1615 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1616 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1618 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1620 } 1708 }
1621 1709
1622 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1623} 1711}
1624 1712
… …
1641 can_hover => 1, 1729 can_hover => 1,
1642 can_focus => 1, 1730 can_focus => 1,
1643 valign => 0, 1731 valign => 0,
1644 can_events => 1, 1732 can_events => 1,
1645 #text => ... 1733 #text => ...
1734 #hidden => "*",
1646 @_ 1735 @_
1647 ) 1736 )
1648} 1737}
1649 1738
1650sub _set_text { 1739sub _set_text {
… …
1652 1741
1653 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1654 1743
1655 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1656 1745
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1747 $self->{text} = $text;
1661 1748
1662 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1664 1752
1665 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1666} 1757}
1667 1758
1668sub set_text { 1759sub set_text {
1669 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1670 1761
1671 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1763 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1764}
1676 1765
1677sub get_text { 1766sub get_text {
1678 $_[0]{text} 1767 $_[0]{text}
1679} 1768}
… …
1684 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1685 1774
1686 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1687} 1776}
1688 1777
1689sub key_down { 1778sub invoke_key_down {
1690 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1691 1780
1692 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1706 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1707 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1709 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1800 $self->emit ('escape');
1712 } elsif ($uni) { 1801 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1714 } 1805 }
1715 1806
1716 $self->_set_text ($text); 1807 $self->_set_text ($text);
1717 1808
1718 $self->realloc; 1809 $self->realloc;
1719}
1720 1810
1811 1
1812}
1813
1721sub focus_in { 1814sub invoke_focus_in {
1722 my ($self) = @_; 1815 my ($self) = @_;
1723 1816
1724 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1725 1818
1726 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1727} 1820}
1728 1821
1729sub button_down { 1822sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1731 1824
1732 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 1826
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 1828
1736 # byte-index to char-index 1829 # byte-index to char-index
1737 my $text = $self->{text}; 1830 my $text = $self->{text};
1738 utf8::encode $text; 1831 utf8::encode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1740 1833
1741 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1742 $self->update; 1835 $self->update;
1836
1837 1
1743} 1838}
1744 1839
1745sub mouse_motion { 1840sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1747# 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
1748} 1845}
1749 1846
1750sub _draw { 1847sub _draw {
1751 my ($self) = @_; 1848 my ($self) = @_;
1752 1849
1753 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1754 1851
1755 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1758 } else { 1855 } else {
1759 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1760 } 1857 }
1761 1858
1762 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1862 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1793 1890
1794our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1795 1892
1796use CFClient::OpenGL; 1893use CFClient::OpenGL;
1797 1894
1798sub key_down { 1895sub invoke_key_down {
1799 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1800 1897
1801 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1802 1899
1803 if ($sym == 13) { 1900 if ($sym == 13) {
1804 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1806 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1809 $self->update; 1907 $self->update;
1810 1908
1811 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1829 } else { 1927 } else {
1830 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1831 } 1929 }
1832 1930
1833 } else { 1931 } else {
1834 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1835 } 1935 1
1836
1837} 1936}
1838 1937
1839############################################################################# 1938#############################################################################
1840 1939
1841package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1862 can_events => 1, 1961 can_events => 1,
1863 @_ 1962 @_
1864 ) 1963 )
1865} 1964}
1866 1965
1867sub activate { }
1868
1869sub button_up { 1966sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1871 1968
1872 $self->emit ("activate") 1969 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1972
1973 1
1875} 1974}
1876 1975
1877sub _draw { 1976sub _draw {
1878 my ($self) = @_; 1977 my ($self) = @_;
1879 1978
1880 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 1980
1886 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1889 1984
1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1891 1986
1892 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1893 1988
1894 $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
1895} 2026}
1896 2027
1897############################################################################# 2028#############################################################################
1898 2029
1899package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1926 my ($self) = @_; 2057 my ($self) = @_;
1927 2058
1928 (6) x 2 2059 (6) x 2
1929} 2060}
1930 2061
1931sub button_down { 2062sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1933 2064
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1937 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1938 } 2073 1
1939} 2074}
1940 2075
1941sub _draw { 2076sub _draw {
1942 my ($self) = @_; 2077 my ($self) = @_;
1943 2078
… …
1963package CFClient::UI::Image; 2098package CFClient::UI::Image;
1964 2099
1965our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1966 2101
1967use CFClient::OpenGL; 2102use CFClient::OpenGL;
1968use Carp qw/confess/;
1969 2103
1970our %loaded_images; 2104our %texture_cache;
1971 2105
1972sub new { 2106sub new {
1973 my $class = shift; 2107 my $class = shift;
1974 2108
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1976 2113
1977 $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";
1978 2116
1979 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1980 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;
1981 2119
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1983 2121
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2123
1988 $self 2124 $self
1989} 2125}
1990 2126
1991sub size_request { 2127sub size_request {
1992 my ($self) = @_; 2128 my ($self) = @_;
1993 2129
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1995} 2131}
1996 2132
1997sub _draw { 2133sub _draw {
1998 my ($self) = @_; 2134 my ($self) = @_;
1999 2135
… …
2110 2246
2111 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
2113 2249
2114 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
2115 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;
2116 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2255
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2234 $self->update; 2371 $self->update;
2235 2372
2236 $self 2373 $self
2237} 2374}
2238 2375
2239sub changed { }
2240
2241sub set_range { 2376sub set_range {
2242 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2243 2378
2244 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2245 2380
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2248} 2385}
2249 2386
2250sub set_value { 2387sub set_value {
2251 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2252 2389
… …
2263 if $unit; 2400 if $unit;
2264 2401
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 2403
2267 if ($value != $old_value) { 2404 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2269 $self->update; 2406 $self->update;
2270 } 2407 }
2271} 2408}
2272 2409
2273sub size_request { 2410sub size_request {
2274 my ($self) = @_; 2411 my ($self) = @_;
2275 2412
2276 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2277} 2414}
2278 2415
2279sub button_down { 2416sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2281 2418
2282 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 2420
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2422
2286 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2287} 2424}
2288 2425
2289sub mouse_motion { 2426sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2291 2428
2292 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 2431
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2433
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2435
2299 $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
2300 } 2441 1
2301} 2442}
2302 2443
2303sub update { 2444sub update {
2304 my ($self) = @_; 2445 my ($self) = @_;
2305 2446
2306 $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}) {
2307 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2308 2456
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2311 2459
… …
2317 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2319 2467
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2322 }); 2470 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2471
2330 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2331 2473
2332 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2333 2475
… …
2394sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2396 2538
2397############################################################################# 2539#############################################################################
2398 2540
2399package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2400 2542
2401our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2402 2544
2403use CFClient::OpenGL; 2545use CFClient::OpenGL;
2404 2546
… …
2406 my $class = shift; 2548 my $class = shift;
2407 2549
2408 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2409 fontsize => 1, 2551 fontsize => 1,
2410 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2411 #font => default_font 2554 #font => default_font
2412 @_, 2555 @_,
2413 2556
2414 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2415 par => [], 2558 par => [],
… …
2430 2573
2431 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2432 $self->reflow; 2575 $self->reflow;
2433} 2576}
2434 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
2435sub size_allocate { 2587sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2437 2589
2438 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 2592
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $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});
2443 2597
2444 $self->reflow; 2598 $self->reflow;
2445}
2446 2599
2447sub text_size { 2600 local $self->{children} = [$empty, $slider];
2448 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2449 2606
2450 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2451 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $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});
2454 $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}}
2455 2620 );
2621
2456 $layout->size 2622 $layout
2457} 2623}
2458 2624
2459sub reflow { 2625sub reflow {
2460 my ($self) = @_; 2626 my ($self) = @_;
2461 2627
… …
2470 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2471} 2637}
2472 2638
2473sub clear { 2639sub clear {
2474 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2475 2644
2476 $self->{par} = []; 2645 $self->{par} = [];
2477 $self->{height} = 0; 2646 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 2648}
2480 2649
2481sub add_paragraph { 2650sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2483 2652
2484 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2485 my ($w, $h) = $self->text_size ($line); 2654
2486 $self->{height} += $h; 2655 $para = {
2487 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,
2488 } 2662 };
2489 2663
2490 $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;
2491} 2676}
2492 2677
2493sub update { 2678sub update {
2494 my ($self) = @_; 2679 my ($self) = @_;
2495 2680
… …
2497 2682
2498 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2499 2684
2500 delete $self->{texture}; 2685 delete $self->{texture};
2501 2686
2502 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 2689
2505 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2506 my $height = 0; 2691 my $height = 0;
2507 2692
2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2514 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3]; 2697
2518 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2519 } 2701 }
2520 2702
2521 $height += $_->[1]; 2703 $height += $para->{h};
2522 } 2704 }
2523 2705
2524 $self->{height} = $height; 2706 $self->{height} = $height;
2525 2707
2526 $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]);
2527 2709
2528 delete $self->{texture}; 2710 delete $self->{texture};
2529 } 2711 }
2530 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2534 2720
2535 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2536 2722
2537 my $y0 = $top; 2723 my $y0 = $top;
2538 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2539 2725
2540 my $y = 0; 2726 my $y = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545 2727
2546 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549 2731
2550 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 2733 my $h = $para->{h};
2552 2734
2553 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] }); 2736
2555 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($par->[4]);
2557 2738
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2559 2740
2560 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2561 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 }
2562 } 2756 }
2563 2757
2564 $y += $h; 2758 $y += $h;
2565 } 2759 }
2566 2760
2567 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2568 }; 2762 };
2569 }); 2763 });
2570} 2764}
2571 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2572sub _draw { 2775sub _draw {
2573 my ($self) = @_; 2776 my ($self) = @_;
2574 2777
2575 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2578 $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});
2579 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2580 2783
2581 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2582
2583} 2785}
2584 2786
2585############################################################################# 2787#############################################################################
2586 2788
2587package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2678 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2679 2884
2680 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2681 markup => $tooltip, 2886 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 2899
2695 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2696} 2901}
2697 2902
2698sub size_allocate { 2903sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2700 2905
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 2907}
2703 2908
2704sub visibility_change { 2909sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2706 2911
2707 return unless $visible; 2912 return unless $visible;
2708 2913
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2711 or return; 2916 or return;
2712 2917
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 2919
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2717 2922
2718 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2719 }); 2924 });
2720} 2925}
2721 2926
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 3016
2812 if ($tex) { 3017 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2818 } 3023 }
2819} 3024}
2820 3025
2821sub DESTROY { 3026sub destroy {
2822 my ($self) = @_; 3027 my ($self) = @_;
2823 3028
2824 $self->{timer}->cancel 3029 $self->{timer}->cancel
2825 if $self->{timer}; 3030 if $self->{timer};
2826 3031
2827 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2828} 3033}
3034
3035#############################################################################
3036
3037package CFClient::UI::Buttonbar;
3038
3039our @ISA = CFClient::UI::HBox::;
3040
3041# TODO: should actualyl wrap buttons and other goodies.
2829 3042
2830############################################################################# 3043#############################################################################
2831 3044
2832package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2833 3046
… …
2845 ); 3058 );
2846 3059
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 3061
2849 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2851 3064
2852 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2853 if (!ref $widget) { 3066 if (!ref $widget) {
2854 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2855 can_hover => 1, 3068 can_hover => 1,
2856 can_events => 1, 3069 can_events => 1,
2857 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2858 } 3072 }
2859 3073
2860 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2861 3075
2862 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2867 3081
2868# 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)
2869sub popup { 3083sub popup {
2870 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2871 3085
2872 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2873 3087
2874 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3089 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2877 3091
2878 $self->show; 3092 $self->show;
2879 $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);
2880} 3094}
2881 3095
2882sub mouse_motion { 3096sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2884 3098
2885 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3102
3103 0
3104}
3105
2890sub button_up { 3106sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2892 3108
2893 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3110 undef $GRAB;
2895 $self->hide; 3111 $self->hide;
2896 3112
2897 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3115 } else {
3116 return 0
3117 }
3118
2899 } 3119 1
2900} 3120}
2901 3121
2902############################################################################# 3122#############################################################################
2903 3123
2904package CFClient::UI::Statusbox; 3124package CFClient::UI::Multiplexer;
2905 3125
2906our @ISA = CFClient::UI::VBox::; 3126our @ISA = CFClient::UI::Container::;
2907 3127
2908sub new { 3128sub new {
2909 my $class = shift; 3129 my $class = shift;
2910 3130
2911 $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 (
2912 fontsize => 0.8, 3298 fontsize => 0.8,
2913 @_, 3299 @_,
2914 ) 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
2915} 3307}
2916 3308
2917sub reorder { 3309sub reorder {
2918 my ($self) = @_; 3310 my ($self) = @_;
2919 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} };
2920 3317
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3320 }
2924 3321
… …
2927 my @items = sort { 3324 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
2931 3328
3329 $self->{timer}->interval (1);
3330
2932 my $count = 10 + 1; 3331 my $count = 10 + 1;
2933 for my $item (@items) { 3332 for my $item (@items) {
2934 last unless --$count; 3333 last unless --$count;
2935 3334
2936 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3339 : $item->{text};
2941 3340
… …
2949 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3354 can_events => 1,
2956 can_hover => 1 3355 can_hover => 1
2957 }; 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;
2958 } 3369 }
2959 3370
2960 $self->clear; 3371 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
2962} 3373}
… …
2967 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
2969 3380
2970 return unless $text; 3381 return unless $text;
2971 3382
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3384
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3386
2976 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
2978 $item->{count}++; 3389 $item->{count}++;
2979 } else { 3390 } else {
2980 $item->{count} = 1; 3391 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
2982 } 3393 }
2983 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3396 delete $item->{label};
2986 } else { 3397 } else {
2987 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
3007 3418
3008 $self->reorder; 3419 $self->reorder;
3009 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
3010} 3421}
3011 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
3012############################################################################# 3431#############################################################################
3013 3432
3014package CFClient::UI::Inventory; 3433package CFClient::UI::Inventory;
3015 3434
3016our @ISA = CFClient::UI::ScrolledWindow::; 3435our @ISA = CFClient::UI::ScrolledWindow::;
3017 3436
3018sub new { 3437sub new {
3019 my $class = shift; 3438 my $class = shift;
3020 3439
3021 my $self = $class->SUPER::new ( 3440 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_, 3442 @_,
3024 ); 3443 );
3025 3444
3026 $self 3445 $self
3027} 3446}
3028 3447
3029sub set_items { 3448sub set_items {
3030 my ($self, $items) = @_; 3449 my ($self, $items) = @_;
3031 3450
3032 $self->{scrolled}->clear; 3451 $self->{child}->clear;
3033 return unless $items; 3452 return unless $items;
3034 3453
3035 my @items = sort { 3454 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3455 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3456 or ($a->{name} cmp $b->{name})
… …
3041 3460
3042 my $row = 0; 3461 my $row = 0;
3043 for my $item (@items) { 3462 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3463 CFClient::Item::update_widgets $item;
3045 3464
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3465 $self->{child}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3466 $self->{child}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3467 $self->{child}->add (2, $row, $item->{weight_widget});
3049 3468
3050 $row++; 3469 $row++;
3051 } 3470 }
3052} 3471}
3053 3472
… …
3115 $self->update_binding_widgets; 3534 $self->update_binding_widgets;
3116 3535
3117 $self 3536 $self
3118} 3537}
3119 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
3120sub commit { 3551sub commit {
3121 my ($self) = @_; 3552 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding; 3553 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) { 3554 if ($sym != 0 && @$cmds > 0) {
3124 $::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)
… …
3158 my ($self) = @_; 3589 my ($self) = @_;
3159 $self->ask_for_bind (1); 3590 $self->ask_for_bind (1);
3160} 3591}
3161 3592
3162sub ask_for_bind { 3593sub ask_for_bind {
3163 my ($self, $commit) = @_; 3594 my ($self, $commit, $end_cb) = @_;
3164 3595
3165 CFClient::Binder::open_binding_dialog (sub { 3596 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_; 3597 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets; 3599 $self->update_binding_widgets;
3169 $self->commit if $commit; 3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3170 }); 3602 });
3171} 3603}
3172 3604
3173# $mod and $sym are the modifiers and key symbol 3605# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands) 3606# $cmds is a array ref of strings (the commands)
… …
3192} 3624}
3193 3625
3194# this is a shortcut method that asks for a binding 3626# this is a shortcut method that asks for a binding
3195# and then just binds it. 3627# and then just binds it.
3196sub do_quick_binding { 3628sub do_quick_binding {
3197 my ($self, $cmds) = @_; 3629 my ($self, $cmds, $end_cb) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub { 3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1); 3631 $self->ask_for_bind (1, $end_cb);
3202} 3632}
3203 3633
3204sub update_binding_widgets { 3634sub update_binding_widgets {
3205 my ($self) = @_; 3635 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding; 3636 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3250 3680
3251############################################################################# 3681#############################################################################
3252 3682
3253package CFClient::UI::SpellList; 3683package CFClient::UI::SpellList;
3254 3684
3255our @ISA = CFClient::UI::FancyFrame::; 3685our @ISA = CFClient::UI::Table::;
3256 3686
3257sub new { 3687sub new {
3258 my $class = shift; 3688 my $class = shift;
3259 3689
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3690 my $self = $class->SUPER::new (
3261 3691 binding => [],
3262 $self->add (new CFClient::UI::ScrolledWindow 3692 commands => [],
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3693 @_,
3264 3694 )
3265 $self;
3266} 3695}
3267 3696
3268# 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
3269sub add_spell { 3782sub add_spell {
3270 my ($self, $spell) = @_; 3783 my ($self, $spell) = @_;
3784
3271 $self->{spells}->{$spell->{name}} = $spell; 3785 $self->{spell}->{$spell->{name}} = $spell;
3272 3786 $self->rebuild_spell_list;
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300} 3787}
3301 3788
3302sub remove_spell { 3789sub remove_spell {
3303 my ($self, $spell) = @_; 3790 my ($self, $spell) = @_;
3791
3304 delete $self->{spells}->{$spell->{name}}; 3792 delete $self->{spell}->{$spell->{name}};
3305 $self->rebuild_spell_list; 3793 $self->rebuild_spell_list;
3306} 3794}
3307 3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3308############################################################################# 3803#############################################################################
3309 3804
3310package CFClient::UI::Root; 3805package CFClient::UI::Root;
3311 3806
3312our @ISA = CFClient::UI::Container::; 3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3313 3810
3314use CFClient::OpenGL; 3811use CFClient::OpenGL;
3315 3812
3316sub new { 3813sub new {
3317 my $class = shift; 3814 my $class = shift;
… …
3344 $coord = $max - $size if $coord > $max - $size; 3841 $coord = $max - $size if $coord > $max - $size;
3345 3842
3346 int $coord + 0.5 3843 int $coord + 0.5
3347} 3844}
3348 3845
3349sub size_allocate { 3846sub invoke_size_allocate {
3350 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3351 3848
3352 for my $child ($self->children) { 3849 for my $child ($self->children) {
3353 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)};
3354 3851
… …
3358 $X = _to_pixel $X, $W, $self->{w}; 3855 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3360 3857
3361 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3362 } 3859 }
3860
3861 1
3363} 3862}
3364 3863
3365sub coord2local { 3864sub coord2local {
3366 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3367 3866
… …
3452 3951
3453 delete $queue{$widget+0}; 3952 delete $queue{$widget+0};
3454 3953
3455 my ($w, $h) = $widget->size_request; 3954 my ($w, $h) = $widget->size_request;
3456 3955
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $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};
3459 3961
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 3962 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 3963 $h = $widget->{force_h} if exists $widget->{force_h};
3462 3964
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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