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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 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
… …
366 366
367 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
368 } 368 }
369} 369}
370 370
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
376} 377}
377 378
378sub set_max_size { 379sub set_max_size {
379 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
380 381
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
383} 386}
384 387
385sub set_tooltip { 388sub set_tooltip {
386 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
387 390
… …
392 395
393 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
394 397
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 401 }
399} 402}
400 403
401# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
402sub coord2local { 405sub coord2local {
… …
410 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
411 414
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 416}
414 417
415sub focus_in { 418sub invoke_focus_in {
416 my ($self) = @_; 419 my ($self) = @_;
417 420
418 return if $FOCUS == $self; 421 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
420 423
421 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
422 425
423 $self->_emit (focus_in => $focus);
424
425 $focus->update if $focus; 426 $focus->update if $focus;
426 $FOCUS->update; 427 $FOCUS->update;
427}
428 428
429 0
430}
431
429sub focus_out { 432sub invoke_focus_out {
430 my ($self) = @_; 433 my ($self) = @_;
431 434
432 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
433 436
434 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
435 438
436 $self->_emit (focus_out => $focus);
437
438 $focus->update if $focus; #? 439 $focus->update if $focus; #?
439 440
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 442 unless $FOCUS;
442}
443 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
444sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
445sub button_up { } 454sub invoke_button_up { 1 }
446sub key_down { } 455sub invoke_key_down { 1 }
447sub key_up { } 456sub invoke_key_up { 1 }
448 457
449sub button_down { 458sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
451 460
452 $self->focus_in; 461 $self->grab_focus;
462
463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
453} 478}
454 479
455sub find_widget { 480sub find_widget {
456 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
457 482
… …
467sub set_parent { 492sub set_parent {
468 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
469 494
470 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 496 $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} 497}
496 498
497sub realloc { 499sub realloc {
498 my ($self) = @_; 500 my ($self) = @_;
499 501
… …
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 545
544 glPushMatrix; 546 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 548
549 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 551 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 553 glBegin GL_QUADS;
556 glVertex $x , $y; 554 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
560 glEnd; 558 glEnd;
561 glDisable GL_BLEND; 559 glDisable GL_BLEND;
562 } 560 }
563 561
564 if ($ENV{CFPLUS_DEBUG} & 1) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 563 glPushMatrix;
566 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 567 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
573 glEnd; 571 glEnd;
574 glPopMatrix; 572 glPopMatrix;
575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
576 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
577} 578}
578 579
579sub _draw { 580sub _draw {
580 my ($self) = @_; 581 my ($self) = @_;
581 582
… …
584 585
585sub DESTROY { 586sub DESTROY {
586 my ($self) = @_; 587 my ($self) = @_;
587 588
588 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
589 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590} 593}
591 594
592############################################################################# 595#############################################################################
593 596
594package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
619 622
620 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
622 625
623 glEnable GL_BLEND; 626 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 628 glColor_premultiply @$color;
626 629
627 glBegin GL_QUADS; 630 glBegin GL_QUADS;
628 glVertex 0 , 0; 631 glVertex 0 , 0;
629 glVertex 0 , $h; 632 glVertex 0 , $h;
630 glVertex $w, $h; 633 glVertex $w, $h;
… …
661our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
662 665
663sub new { 666sub new {
664 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
665 668
666 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
667 670
668 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
669 children => [], 672 children => [],
670 can_events => 0, 673 can_events => 0,
671 %arg, 674 %arg,
672 ); 675 );
676
673 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
674 679
675 $self 680 $self
676} 681}
677 682
678sub add { 683sub add {
… …
726 $x -= $self->{x}; 731 $x -= $self->{x};
727 $y -= $self->{y}; 732 $y -= $self->{y};
728 733
729 my $res; 734 my $res;
730 735
731 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
733 and return $res; 738 and return $res;
734 } 739 }
735 740
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757} 762}
758 763
759sub add { 764sub add {
760 my ($self, $child) = @_; 765 my ($self, $child) = @_;
761 766
762 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
763
764 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
765} 769}
766 770
767sub remove { 771sub remove {
768 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
777 781
778sub size_request { 782sub size_request {
779 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
780} 784}
781 785
782sub size_allocate { 786sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
784 788
785 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
786} 792}
787 793
788############################################################################# 794#############################################################################
795
796# back-buffered drawing area
789 797
790package CFClient::UI::Window; 798package CFClient::UI::Window;
791 799
792our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
793 801
… …
804 812
805 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
806 $self->SUPER::update; 814 $self->SUPER::update;
807} 815}
808 816
809sub size_allocate { 817sub invoke_size_allocate {
810 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
811 819
812 $self->SUPER::size_allocate ($w, $h);
813 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
814} 823}
815 824
816sub _render { 825sub _render {
817 my ($self) = @_; 826 my ($self) = @_;
818 827
… …
845 my $tex = $self->{texture} 854 my $tex = $self->{texture}
846 or return; 855 or return;
847 856
848 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
851 860
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 862
854 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
855} 864}
… …
879 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
880 889
881 ($w, $h) 890 ($w, $h)
882} 891}
883 892
884sub size_allocate { 893sub invoke_size_allocate {
885 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
886 895
887 my $child = $self->child; 896 my $child = $self->child;
888 897
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891 900
892 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
893 $self->update; 902 $self->update;
903
904 1
894} 905}
895 906
896sub set_offset { 907sub set_offset {
897 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
898 909
… …
946package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
947 958
948our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
949 960
950sub new { 961sub new {
951 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
952 965
953 my $self; 966 my $self;
954 967
955 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
956 vertical => 1, 969 vertical => 1,
… …
961 ; 974 ;
962 975
963 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
965 slider => $slider, 978 slider => $slider,
966 @_, 979 %arg,
967 ); 980 );
968 981
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
972 984
973 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
974} 992}
975 993
976sub update { 994sub update {
977 my ($self) = @_; 995 my ($self) = @_;
978 996
… …
981 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984} 1002}
985 1003
986sub size_allocate { 1004sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990 1006
991 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
993} 1011}
994 1012
995#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll 1014# update viewport offset on scroll
997 1015
… …
1017 1035
1018 if ($self->{bg}) { 1036 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
1020 1038
1021 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
1024 1042
1025 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1044 glVertex 0 , 0;
1027 glVertex 0 , $h; 1045 glVertex 0 , $h;
1028 glVertex $w, $h; 1046 glVertex $w, $h;
… …
1050my @border = 1068my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 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); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1071
1054sub new { 1072sub new {
1055 my $class = shift; 1073 my ($class, %arg) = @_;
1056 1074
1057 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1058 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1059 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1060 border => 0.6, 1078 border => 0.6,
1061 can_events => 1, 1079 can_events => 1,
1062 min_w => 16, 1080 min_w => 16,
1063 min_h => 16, 1081 min_h => 16,
1064 @_ 1082 %arg,
1065 ); 1083 );
1066 1084
1067 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1068 align => 0, 1086 align => 0,
1069 valign => 1, 1087 valign => 1,
1070 text => $self->{title}, 1088 text => $self->{title},
1071 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1072 1100
1073 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1074} 1110}
1075 1111
1076sub border { 1112sub border {
1077 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1078} 1114}
1079 1115
1080sub size_request { 1116sub size_request {
1081 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1082 1124
1083 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1084 1126
1085 ( 1127 (
1086 $w + $self->border * 2, 1128 $w + $self->border * 2,
1087 $h + $self->border * 2, 1129 $h + $self->border * 2,
1088 ) 1130 )
1089} 1131}
1090 1132
1091sub size_allocate { 1133sub invoke_size_allocate {
1092 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1093 1135
1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1141
1142 my $border = $self->border;
1143
1094 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1095 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1096 1146
1097 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1098 if $self->{title};
1099
1100 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1101}
1102 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1103sub button_down { 1155sub invoke_button_down {
1104 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1105 1157
1106 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1107 my $border = $self->border; 1159 my $border = $self->border;
1108 1160
… …
1124 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1125 1177
1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128 1180
1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 $self->realloc; 1182 $self->realloc;
1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1131 }; 1183 };
1132 1184
1133 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1134 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1135 my ($bx, $by) = ($self->{x}, $self->{y}); 1187 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1138 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1139 1191
1140 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1141 1193
1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1195 # HACK: the next line is required to enforce placement
1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1143 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1144 } 1202 1
1145} 1203}
1146 1204
1147sub button_up { 1205sub invoke_button_up {
1148 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1149 1207
1150 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1151} 1209}
1152 1210
1153sub mouse_motion { 1211sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1155 1213
1156 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1157} 1217}
1158 1218
1159sub _draw { 1219sub _draw {
1160 my ($self) = @_; 1220 my ($self) = @_;
1161 1221
1222 my $child = $self->{children}[0];
1223
1162 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1163 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1164 1226
1165 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1167 1229
1168 my $border = $self->border; 1230 my $border = $self->border;
… …
1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184 } 1246 }
1185 1247
1186 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1187 1249
1188 $self->{title}->draw if $self->{title};
1189
1190 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1191} 1261}
1192 1262
1193############################################################################# 1263#############################################################################
1194 1264
1195package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1218 1288
1219 $child->set_parent ($self); 1289 $child->set_parent ($self);
1220 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1221 1291
1222 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1223} 1299}
1224 1300
1225# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1226sub clear { 1302sub clear {
1227 my ($self) = @_; 1303 my ($self) = @_;
… …
1268 (sum @$ws), 1344 (sum @$ws),
1269 (sum @$hs), 1345 (sum @$hs),
1270 ) 1346 )
1271} 1347}
1272 1348
1273sub size_allocate { 1349sub invoke_size_allocate {
1274 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1275 1351
1276 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1277 1353
1278 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1310 } 1386 }
1311 1387
1312 $y += $row_h; 1388 $y += $row_h;
1313 } 1389 }
1314 1390
1391 1
1315} 1392}
1316 1393
1317sub find_widget { 1394sub find_widget {
1318 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1319 1396
… …
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 ) 1435 )
1359} 1436}
1360 1437
1361sub size_allocate { 1438sub invoke_size_allocate {
1362 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1363 1440
1364 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1365 my $children = $self->{children}; 1442 my $children = $self->{children};
1366 1443
… …
1488 1565
1489 delete $self->{texture}; 1566 delete $self->{texture};
1490 $self->SUPER::update; 1567 $self->SUPER::update;
1491} 1568}
1492 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1493sub set_text { 1577sub set_text {
1494 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1495 1579
1496 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1497 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1498 1582
1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1500 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1501 1585
1586 delete $self->{size_req};
1502 $self->realloc; 1587 $self->realloc;
1503 $self->update; 1588 $self->update;
1504} 1589}
1505 1590
1506sub set_markup { 1591sub set_markup {
… …
1512 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513 1598
1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1515 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1516 1601
1602 delete $self->{size_req};
1517 $self->realloc; 1603 $self->realloc;
1518 $self->update; 1604 $self->update;
1519} 1605}
1520 1606
1521sub size_request { 1607sub size_request {
1522 my ($self) = @_; 1608 my ($self) = @_;
1523 1609
1610 $self->{size_req} ||= do {
1524 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1525 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1616
1530 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1531 1618
1532 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1533 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1534 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1535 1622
1536 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1537 1624
1538 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1539 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1540 } 1630 };
1541 1631
1542 ($w, $h) 1632 @{ $self->{size_req} }
1543} 1633}
1544 1634
1545sub size_allocate { 1635sub invoke_size_allocate {
1546 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1637
1638 delete $self->{ox};
1547 1639
1548 delete $self->{texture} 1640 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1550} 1644}
1551 1645
1552sub set_fontsize { 1646sub set_fontsize {
1553 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1554 1648
1555 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1556 delete $self->{texture}; 1650 delete $self->{texture};
1557 1651
1558 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1559} 1661}
1560 1662
1561sub _draw { 1663sub _draw {
1562 my ($self) = @_; 1664 my ($self) = @_;
1563 1665
… …
1569 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1570 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1675
1574 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1575 1678
1679 unless (exists $self->{ox}) {
1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1578 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1579 1683
1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1582 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1583
1584 $tex
1585 }; 1687 };
1586 1688
1587 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1588 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1589 1693
1590 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1591 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1592 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1593 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1595 } 1701 }
1596 1702
1597 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1598} 1704}
1599 1705
… …
1616 can_hover => 1, 1722 can_hover => 1,
1617 can_focus => 1, 1723 can_focus => 1,
1618 valign => 0, 1724 valign => 0,
1619 can_events => 1, 1725 can_events => 1,
1620 #text => ... 1726 #text => ...
1727 #hidden => "*",
1621 @_ 1728 @_
1622 ) 1729 )
1623} 1730}
1624 1731
1625sub _set_text { 1732sub _set_text {
… …
1627 1734
1628 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1629 1736
1630 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1631 1738
1632 delete $self->{texture};
1633
1634 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1635 $self->{text} = $text; 1740 $self->{text} = $text;
1636 1741
1637 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1638 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1639 1745
1640 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1641} 1750}
1642 1751
1643sub set_text { 1752sub set_text {
1644 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1645 1754
1646 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1647 $self->_set_text ($text); 1756 $self->_set_text ($text);
1648
1649 $self->realloc;
1650} 1757}
1651 1758
1652sub get_text { 1759sub get_text {
1653 $_[0]{text} 1760 $_[0]{text}
1654} 1761}
… …
1659 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1660 1767
1661 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1662} 1769}
1663 1770
1664sub key_down { 1771sub invoke_key_down {
1665 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1666 1773
1667 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1668 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1669 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1681 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1682 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1683 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1684 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1685 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1686 $self->_emit ('escape'); 1793 $self->emit ('escape');
1687 } elsif ($uni) { 1794 } elsif ($uni) {
1688 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1689 } 1798 }
1690 1799
1691 $self->_set_text ($text); 1800 $self->_set_text ($text);
1692 1801
1693 $self->realloc; 1802 $self->realloc;
1694}
1695 1803
1804 1
1805}
1806
1696sub focus_in { 1807sub invoke_focus_in {
1697 my ($self) = @_; 1808 my ($self) = @_;
1698 1809
1699 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1700 1811
1701 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1702} 1813}
1703 1814
1704sub button_down { 1815sub invoke_button_down {
1705 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1706 1817
1707 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1708 1819
1709 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1710 1821
1711 # byte-index to char-index 1822 # byte-index to char-index
1712 my $text = $self->{text}; 1823 my $text = $self->{text};
1713 utf8::encode $text; 1824 utf8::encode $text;
1714 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1715 1826
1716 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1717 $self->update; 1828 $self->update;
1829
1830 1
1718} 1831}
1719 1832
1720sub mouse_motion { 1833sub invoke_mouse_motion {
1721 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1722# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1723} 1838}
1724 1839
1725sub _draw { 1840sub _draw {
1726 my ($self) = @_; 1841 my ($self) = @_;
1727 1842
1728 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1729 1844
1730 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1731 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1732 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1733 } else { 1848 } else {
1734 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1735 } 1850 }
1736 1851
1737 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1739 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1740 glVertex 0 , 0; 1855 glVertex 0 , 0;
1741 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1742 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1743 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1768 1883
1769our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1770 1885
1771use CFClient::OpenGL; 1886use CFClient::OpenGL;
1772 1887
1773sub key_down { 1888sub invoke_key_down {
1774 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1775 1890
1776 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1777 1892
1778 if ($sym == 13) { 1893 if ($sym == 13) {
1779 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1780 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1781 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1782 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1783 $self->_emit (activate => $txt); 1899 $self->emit (activate => $txt);
1784 $self->update; 1900 $self->update;
1785 1901
1786 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1787 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1788 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1804 } else { 1920 } else {
1805 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1806 } 1922 }
1807 1923
1808 } else { 1924 } else {
1809 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::invoke_key_down ($ev)
1926 }
1927
1810 } 1928 1
1811
1812} 1929}
1813 1930
1814############################################################################# 1931#############################################################################
1815 1932
1816package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1837 can_events => 1, 1954 can_events => 1,
1838 @_ 1955 @_
1839 ) 1956 )
1840} 1957}
1841 1958
1842sub activate { }
1843
1844sub button_up { 1959sub invoke_button_up {
1845 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1846 1961
1847 $self->emit ("activate") 1962 $self->emit ("activate")
1848 if $x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1849 && $y >= 0 && $y < $self->{h}; 1964 && $y >= 0 && $y < $self->{h};
1965
1966 1
1850} 1967}
1851 1968
1852sub _draw { 1969sub _draw {
1853 my ($self) = @_; 1970 my ($self) = @_;
1854 1971
1855 local $self->{fg} = $self->{fg}; 1972 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1856
1857 if ($GRAB == $self) {
1858 $self->{fg} = $self->{active_fg};
1859 }
1860 1973
1861 glEnable GL_TEXTURE_2D; 1974 glEnable GL_TEXTURE_2D;
1862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1975 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1863 glColor 0, 0, 0, 1; 1976 glColor 0, 0, 0, 1;
1864 1977
1865 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1978 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1866 1979
1867 glDisable GL_TEXTURE_2D; 1980 glDisable GL_TEXTURE_2D;
1868 1981
1869 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1983}
1984
1985#############################################################################
1986
1987package CFClient::UI::ImageButton;
1988
1989our @ISA = CFClient::UI::Image::;
1990
1991use CFClient::OpenGL;
1992
1993my %textures;
1994
1995sub new {
1996 my $class = shift;
1997
1998 my $self = $class->SUPER::new (
1999 padding_x => 4,
2000 padding_y => 4,
2001 fg => [1, 1, 1],
2002 active_fg => [0, 0, 1],
2003 can_hover => 1,
2004 align => 0,
2005 valign => 0,
2006 can_events => 1,
2007 @_
2008 );
2009}
2010
2011sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_;
2013
2014 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w}
2016 && $y >= 0 && $y < $self->{h};
2017
2018 1
1870} 2019}
1871 2020
1872############################################################################# 2021#############################################################################
1873 2022
1874package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
… …
1901 my ($self) = @_; 2050 my ($self) = @_;
1902 2051
1903 (6) x 2 2052 (6) x 2
1904} 2053}
1905 2054
1906sub button_down { 2055sub invoke_button_down {
1907 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1908 2057
1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1911 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1912 $self->_emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
2062 } else {
2063 return 0
2064 }
2065
1913 } 2066 1
1914} 2067}
1915 2068
1916sub _draw { 2069sub _draw {
1917 my ($self) = @_; 2070 my ($self) = @_;
1918 2071
… …
2085 2238
2086 my $h1 = $self->{h} * (1 - $ycut1); 2239 my $h1 = $self->{h} * (1 - $ycut1);
2087 my $h2 = $self->{h} * (1 - $ycut2); 2240 my $h2 = $self->{h} * (1 - $ycut2);
2088 2241
2089 glEnable GL_BLEND; 2242 glEnable GL_BLEND;
2090 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2091 glEnable GL_TEXTURE_2D; 2245 glEnable GL_TEXTURE_2D;
2092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2093 2247
2094 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2248 glBindTexture GL_TEXTURE_2D, $t1->{name};
2095 glBegin GL_QUADS; 2249 glBegin GL_QUADS;
… …
2209 $self->update; 2363 $self->update;
2210 2364
2211 $self 2365 $self
2212} 2366}
2213 2367
2214sub changed { }
2215
2216sub set_range { 2368sub set_range {
2217 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2218 2370
2219 ($range, $self->{range}) = ($self->{range}, $range); 2371 ($range, $self->{range}) = ($self->{range}, $range);
2220 2372
2221 $self->update
2222 if "@$range" ne "@{$self->{range}}"; 2373 if ("@$range" ne "@{$self->{range}}") {
2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2223} 2377}
2224 2378
2225sub set_value { 2379sub set_value {
2226 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2227 2381
… …
2238 if $unit; 2392 if $unit;
2239 2393
2240 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2241 2395
2242 if ($value != $old_value) { 2396 if ($value != $old_value) {
2243 $self->_emit (changed => $value); 2397 $self->emit (changed => $value);
2244 $self->update; 2398 $self->update;
2245 } 2399 }
2246} 2400}
2247 2401
2248sub size_request { 2402sub size_request {
2249 my ($self) = @_; 2403 my ($self) = @_;
2250 2404
2251 ($self->{req_w}, $self->{req_h}) 2405 ($self->{req_w}, $self->{req_h})
2252} 2406}
2253 2407
2254sub button_down { 2408sub invoke_button_down {
2255 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2256 2410
2257 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2258 2412
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260 2414
2261 $self->mouse_motion ($ev, $x, $y); 2415 $self->mouse_motion ($ev, $x, $y)
2262} 2416}
2263 2417
2264sub mouse_motion { 2418sub invoke_mouse_motion {
2265 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2266 2420
2267 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2268 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2269 2423
2270 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2424 my (undef, $lo, $hi, $page) = @{$self->{range}};
2271 2425
2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2426 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273 2427
2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2428 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2429 } else {
2430 return 0;
2431 }
2432
2275 } 2433 1
2276} 2434}
2277 2435
2278sub update { 2436sub update {
2279 my ($self) = @_; 2437 my ($self) = @_;
2280 2438
2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2439 delete $self->{knob_w};
2440 $self->SUPER::update;
2441}
2442
2443sub _draw {
2444 my ($self) = @_;
2445
2446 unless ($self->{knob_w}) {
2282 $self->set_value ($self->{range}[0]); 2447 $self->set_value ($self->{range}[0]);
2283 2448
2284 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2449 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100; 2450 my $range = ($hi - $page - $lo) || 1e-100;
2286 2451
… …
2292 $value = ($value - $lo) / $range; 2457 $value = ($value - $lo) / $range;
2293 $value = $value * $self->{scale} + $self->{offset}; 2458 $value = $value * $self->{scale} + $self->{offset};
2294 2459
2295 $self->{knob_x} = $value - $knob_w * 0.5; 2460 $self->{knob_x} = $value - $knob_w * 0.5;
2296 $self->{knob_w} = $knob_w; 2461 $self->{knob_w} = $knob_w;
2297 }); 2462 }
2298
2299 $self->SUPER::update;
2300}
2301
2302sub _draw {
2303 my ($self) = @_;
2304 2463
2305 $self->SUPER::_draw (); 2464 $self->SUPER::_draw ();
2306 2465
2307 glScale $self->{w}, $self->{h}; 2466 glScale $self->{w}, $self->{h};
2308 2467
… …
2369sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2370sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2371 2530
2372############################################################################# 2531#############################################################################
2373 2532
2374package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2375 2534
2376our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2377 2536
2378use CFClient::OpenGL; 2537use CFClient::OpenGL;
2379 2538
… …
2381 my $class = shift; 2540 my $class = shift;
2382 2541
2383 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2384 fontsize => 1, 2543 fontsize => 1,
2385 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2386 #font => default_font 2546 #font => default_font
2387 @_, 2547 @_,
2388 2548
2389 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2390 par => [], 2550 par => [],
… …
2405 2565
2406 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2407 $self->reflow; 2567 $self->reflow;
2408} 2568}
2409 2569
2410sub size_allocate { 2570sub invoke_size_allocate {
2411 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2412
2413 $self->SUPER::size_allocate ($w, $h);
2414 2572
2415 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2416 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2417 $self->{layout}->set_width ($self->{children}[0]{w}); 2575 $self->{layout}->set_width ($self->{children}[0]{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2418 2577
2419 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2420} 2581}
2421 2582
2422sub text_size { 2583sub text_size {
2423 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2424 2585
2425 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2426 2587
2427 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428 $layout->set_width ($self->{children}[0]{w} - $indent); 2589 $layout->set_width ($self->{children}[0]{w} - $indent);
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2429 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2430 2592
2431 $layout->size 2593 $layout->size
2432} 2594}
2433 2595
… …
2472 2634
2473 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2474 2636
2475 delete $self->{texture}; 2637 delete $self->{texture};
2476 2638
2477 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479 2641
2480 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2481 my $height = 0; 2643 my $height = 0;
2482 2644
… …
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486 2648
2487 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2488 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2489 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2490 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2491 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2492 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2493 $_->[1] = $h; 2656 $_->[1] = $h;
2494 } 2657 }
… …
2497 } 2660 }
2498 2661
2499 $self->{height} = $height; 2662 $self->{height} = $height;
2500 2663
2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2502 2665
2503 delete $self->{texture}; 2666 delete $self->{texture};
2504 } 2667 }
2505 2668
2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2507 glClearColor 0.5, 0.5, 0.5, 0; 2670 glClearColor 0, 0, 0, 0;
2508 glClear GL_COLOR_BUFFER_BIT; 2671 glClear GL_COLOR_BUFFER_BIT;
2509 2672
2510 my $top = int $self->{children}[1]{range}[0]; 2673 my $top = int $self->{children}[1]{range}[0];
2511 2674
2512 my $y0 = $top; 2675 my $y0 = $top;
… …
2526 my $h = $par->[1]; 2689 my $h = $par->[1];
2527 2690
2528 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2529 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2530 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2531 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2532 2696
2533 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2534 2698
2535 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2547sub _draw { 2711sub _draw {
2548 my ($self) = @_; 2712 my ($self) = @_;
2549 2713
2550 glEnable GL_TEXTURE_2D; 2714 glEnable GL_TEXTURE_2D;
2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552 glColor 1, 1, 1, 1; 2716 glColor 0, 0, 0, 1;
2553 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2554 glDisable GL_TEXTURE_2D; 2718 glDisable GL_TEXTURE_2D;
2555 2719
2556 $self->{children}[1]->draw; 2720 $self->{children}[1]->draw;
2557 2721
2558} 2722}
… …
2649 $tooltip .= "\n\n" . (ref $widget) . "\n" 2813 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n" 2815 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}"; 2816 . "visible $widget->{visible}";
2653 } 2817 }
2818
2819 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//;
2654 2821
2655 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2656 markup => $tooltip, 2823 markup => $tooltip,
2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2658 fontsize => 0.8, 2825 fontsize => 0.8,
… …
2668 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2669 2836
2670 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2671} 2838}
2672 2839
2673sub size_allocate { 2840sub invoke_size_allocate {
2674 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2675 2842
2676 $self->SUPER::size_allocate ($w - 4, $h - 4); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2677} 2844}
2678 2845
2679sub visibility_change { 2846sub invoke_visibility_change {
2680 my ($self, $visible) = @_; 2847 my ($self, $visible) = @_;
2681 2848
2682 return unless $visible; 2849 return unless $visible;
2683 2850
2684 $self->{root}->on_post_alloc ("move_$self" => sub { 2851 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2686 or return; 2853 or return;
2687 2854
2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689 2856
2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691 if $x + $self->{w} > $::WIDTH; 2858 if $x + $self->{w} > $self->{root}{w};
2692 2859
2693 $self->move_abs ($x, $y); 2860 $self->move_abs ($x, $y);
2694 }); 2861 });
2695} 2862}
2696 2863
… …
2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2786 2953
2787 if ($tex) { 2954 if ($tex) {
2788 glEnable GL_TEXTURE_2D; 2955 glEnable GL_TEXTURE_2D;
2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2790 glColor 1, 1, 1, 1; 2957 glColor 0, 0, 0, 1;
2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2792 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2793 } 2960 }
2794} 2961}
2795 2962
2796sub DESTROY { 2963sub destroy {
2797 my ($self) = @_; 2964 my ($self) = @_;
2798 2965
2799 $self->{timer}->cancel 2966 $self->{timer}->cancel
2800 if $self->{timer}; 2967 if $self->{timer};
2801 2968
2802 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2803} 2970}
2971
2972#############################################################################
2973
2974package CFClient::UI::Buttonbar;
2975
2976our @ISA = CFClient::UI::HBox::;
2977
2978# TODO: should actualyl wrap buttons and other goodies.
2804 2979
2805############################################################################# 2980#############################################################################
2806 2981
2807package CFClient::UI::Menu; 2982package CFClient::UI::Menu;
2808 2983
… …
2820 ); 2995 );
2821 2996
2822 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2823 2998
2824 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2825 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2826 3001
2827 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2828 if (!ref $widget) { 3003 if (!ref $widget) {
2829 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2830 can_hover => 1, 3005 can_hover => 1,
2831 can_events => 1, 3006 can_events => 1,
2832 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2833 } 3009 }
2834 3010
2835 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2836 3012
2837 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2842 3018
2843# popup given the event (must be a mouse button down event currently) 3019# popup given the event (must be a mouse button down event currently)
2844sub popup { 3020sub popup {
2845 my ($self, $ev) = @_; 3021 my ($self, $ev) = @_;
2846 3022
2847 $self->_emit ("popdown"); 3023 $self->emit ("popdown");
2848 3024
2849 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2850 $GRAB = $self; 3026 $GRAB = $self;
2851 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2852 3028
2853 $self->show; 3029 $self->show;
2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3030 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2855} 3031}
2856 3032
2857sub mouse_motion { 3033sub invoke_mouse_motion {
2858 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2859 3035
2860 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2861 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2862 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2863}
2864 3039
3040 0
3041}
3042
2865sub button_up { 3043sub invoke_button_up {
2866 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2867 3045
2868 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2869 undef $GRAB; 3047 undef $GRAB;
2870 $self->hide; 3048 $self->hide;
2871 3049
2872 $self->_emit ("popdown"); 3050 $self->emit ("popdown");
2873 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
3052 } else {
3053 return 0
3054 }
3055
2874 } 3056 1
2875} 3057}
2876 3058
2877############################################################################# 3059#############################################################################
2878 3060
2879package CFClient::UI::Statusbox; 3061package CFClient::UI::Multiplexer;
2880 3062
2881our @ISA = CFClient::UI::VBox::; 3063our @ISA = CFClient::UI::Container::;
2882 3064
2883sub new { 3065sub new {
2884 my $class = shift; 3066 my $class = shift;
2885 3067
2886 $class->SUPER::new ( 3068 my $self = $class->SUPER::new (
3069 @_,
3070 );
3071
3072 $self->{current} = $self->{children}[0]
3073 if @{ $self->{children} };
3074
3075 $self
3076}
3077
3078sub add {
3079 my ($self, @widgets) = @_;
3080
3081 $self->SUPER::add (@widgets);
3082
3083 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} };
3085}
3086
3087sub set_current_page {
3088 my ($self, $page_or_widget) = @_;
3089
3090 my $widget = ref $page_or_widget
3091 ? $page_or_widget
3092 : $self->{children}[$page_or_widget];
3093
3094 $self->{current} = $widget;
3095 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3096
3097 $self->emit (page_changed => $self->{current});
3098
3099 $self->realloc;
3100}
3101
3102sub visible_children {
3103 $_[0]{current}
3104}
3105
3106sub size_request {
3107 my ($self) = @_;
3108
3109 $self->{current}->size_request
3110}
3111
3112sub invoke_size_allocate {
3113 my ($self, $w, $h) = @_;
3114
3115 $self->{current}->configure (0, 0, $w, $h);
3116
3117 1
3118}
3119
3120sub _draw {
3121 my ($self) = @_;
3122
3123 $self->{current}->draw;
3124}
3125
3126#############################################################################
3127
3128package CFClient::UI::Notebook;
3129
3130our @ISA = CFClient::UI::VBox::;
3131
3132sub new {
3133 my $class = shift;
3134
3135 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self
3139 @_,
3140 );
3141
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3143 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3144
3145 $self
3146}
3147
3148sub add {
3149 my ($self, $title, $widget, $tooltip) = @_;
3150
3151 Scalar::Util::weaken $self;
3152
3153 $self->{buttonbar}->add (new CFClient::UI::Button
3154 markup => $title,
3155 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) },
3157 );
3158
3159 $self->{multiplexer}->add ($widget);
3160}
3161
3162sub set_current_page {
3163 my ($self, $page) = @_;
3164
3165 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current});
3167}
3168
3169#############################################################################
3170
3171package CFClient::UI::Combobox;
3172
3173use utf8;
3174
3175our @ISA = CFClient::UI::Button::;
3176
3177sub new {
3178 my $class = shift;
3179
3180 my $self = $class->SUPER::new (
3181 options => [], # [value, title, longdesc], ...
3182 value => undef,
3183 @_,
3184 );
3185
3186 $self->_set_value ($self->{value});
3187
3188 $self
3189}
3190
3191sub invoke_button_down {
3192 my ($self, $ev) = @_;
3193
3194 my @menu_items;
3195
3196 for (@{ $self->{options} }) {
3197 my ($value, $title, $tooltip) = @$_;
3198
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 }
3201
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203}
3204
3205sub _set_value {
3206 my ($self, $value) = @_;
3207
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3209 or return;
3210
3211 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]);
3214}
3215
3216sub set_value {
3217 my ($self, $value) = @_;
3218
3219 return unless $self->{value} ne $value;
3220
3221 $self->_set_value ($value);
3222 $self->emit (changed => $value);
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Statusbox;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
2887 fontsize => 0.8, 3235 fontsize => 0.8,
2888 @_, 3236 @_,
2889 ) 3237 );
3238
3239 Scalar::Util::weaken (my $this = $self);
3240
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242
3243 $self
2890} 3244}
2891 3245
2892sub reorder { 3246sub reorder {
2893 my ($self) = @_; 3247 my ($self) = @_;
2894 my $NOW = time; 3248 my $NOW = Time::HiRes::time;
3249
3250 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} };
2895 3254
2896 while (my ($k, $v) = each %{ $self->{item} }) { 3255 while (my ($k, $v) = each %{ $self->{item} }) {
2897 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3256 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2898 } 3257 }
2899 3258
… …
2902 my @items = sort { 3261 my @items = sort {
2903 $a->{pri} <=> $b->{pri} 3262 $a->{pri} <=> $b->{pri}
2904 or $b->{id} <=> $a->{id} 3263 or $b->{id} <=> $a->{id}
2905 } values %{ $self->{item} }; 3264 } values %{ $self->{item} };
2906 3265
3266 $self->{timer}->interval (1);
3267
2907 my $count = 10 + 1; 3268 my $count = 10 + 1;
2908 for my $item (@items) { 3269 for my $item (@items) {
2909 last unless --$count; 3270 last unless --$count;
2910 3271
2911 push @widgets, $item->{label} ||= do { 3272 my $label = $item->{label} ||= do {
2912 # TODO: doesn't handle markup well (read as: at all) 3273 # TODO: doesn't handle markup well (read as: at all)
2913 my $short = $item->{count} > 1 3274 my $short = $item->{count} > 1
2914 ? "<b>$item->{count} ×</b> $item->{text}" 3275 ? "<b>$item->{count} ×</b> $item->{text}"
2915 : $item->{text}; 3276 : $item->{text};
2916 3277
… …
2924 tooltip => $item->{tooltip}, 3285 tooltip => $item->{tooltip},
2925 tooltip_font => $::FONT_PROP, 3286 tooltip_font => $::FONT_PROP,
2926 tooltip_width => 0.67, 3287 tooltip_width => 0.67,
2927 fontsize => $item->{fontsize} || $self->{fontsize}, 3288 fontsize => $item->{fontsize} || $self->{fontsize},
2928 max_w => $::WIDTH * 0.44, 3289 max_w => $::WIDTH * 0.44,
2929 fg => $item->{fg}, 3290 fg => [@{ $item->{fg} }],
2930 can_events => 1, 3291 can_events => 1,
2931 can_hover => 1 3292 can_hover => 1
2932 }; 3293 };
3294
3295 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3296 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3297 $label->update;
3298 $label->set_max_size (undef, $label->{req_h} * $diff)
3299 if $diff < 1;
3300 $self->{timer}->interval (1/30);
3301 } else {
3302 $label->{fg}[3] = $item->{fg}[3] || 1;
3303 }
3304
3305 push @widgets, $label;
2933 } 3306 }
2934 3307
2935 $self->clear; 3308 $self->clear;
2936 $self->SUPER::add (reverse @widgets); 3309 $self->SUPER::add (reverse @widgets);
2937} 3310}
… …
2942 $text =~ s/^\s+//; 3315 $text =~ s/^\s+//;
2943 $text =~ s/\s+$//; 3316 $text =~ s/\s+$//;
2944 3317
2945 return unless $text; 3318 return unless $text;
2946 3319
2947 my $timeout = time + ((delete $arg{timeout}) || 60); 3320 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2948 3321
2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3322 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2950 3323
2951 if (my $item = $self->{item}{$group}) { 3324 if (my $item = $self->{item}{$group}) {
2952 if ($item->{text} eq $text) { 3325 if ($item->{text} eq $text) {
2953 $item->{count}++; 3326 $item->{count}++;
2954 } else { 3327 } else {
2955 $item->{count} = 1; 3328 $item->{count} = 1;
2956 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
2957 } 3330 }
2958 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
2959 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
2960 delete $item->{label}; 3333 delete $item->{label};
2961 } else { 3334 } else {
2962 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
2963 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
2982 3355
2983 $self->reorder; 3356 $self->reorder;
2984 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
2985} 3358}
2986 3359
3360sub destroy {
3361 my ($self) = @_;
3362
3363 $self->{timer}->cancel;
3364
3365 $self->SUPER::destroy;
3366}
3367
2987############################################################################# 3368#############################################################################
2988 3369
2989package CFClient::UI::Inventory; 3370package CFClient::UI::Inventory;
2990 3371
2991our @ISA = CFClient::UI::ScrolledWindow::; 3372our @ISA = CFClient::UI::ScrolledWindow::;
2992 3373
2993sub new { 3374sub new {
2994 my $class = shift; 3375 my $class = shift;
2995 3376
2996 my $self = $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3378 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2998 @_, 3379 @_,
2999 ); 3380 );
3000 3381
3001 $self 3382 $self
3002} 3383}
3003 3384
3004sub set_items { 3385sub set_items {
3005 my ($self, $items) = @_; 3386 my ($self, $items) = @_;
3006 3387
3007 $self->{scrolled}->clear; 3388 $self->{child}->clear;
3008 return unless $items; 3389 return unless $items;
3009 3390
3010 my @items = sort { 3391 my @items = sort {
3011 ($a->{type} <=> $b->{type}) 3392 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name}) 3393 or ($a->{name} cmp $b->{name})
… …
3016 3397
3017 my $row = 0; 3398 my $row = 0;
3018 for my $item (@items) { 3399 for my $item (@items) {
3019 CFClient::Item::update_widgets $item; 3400 CFClient::Item::update_widgets $item;
3020 3401
3021 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3402 $self->{child}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3403 $self->{child}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3404 $self->{child}->add (2, $row, $item->{weight_widget});
3024 3405
3025 $row++; 3406 $row++;
3026 } 3407 }
3027} 3408}
3028 3409
… …
3126 $rec = $::CONN->stop_record if $::CONN; 3507 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY'; 3508 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec); 3509 $self->set_command_list ($rec);
3129} 3510}
3130 3511
3131# if $commit is true, the binding will be set after the user entered a key combo 3512
3513sub ask_for_bind_and_commit {
3514 my ($self) = @_;
3515 $self->ask_for_bind (1);
3516}
3517
3132sub ask_for_bind { 3518sub ask_for_bind {
3133 my ($self, $commit) = @_; 3519 my ($self, $commit, $end_cb) = @_;
3134 3520
3135 CFClient::Binder::open_binding_dialog (sub { 3521 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_; 3522 my ($mod, $sym) = @_;
3137 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138 $self->update_binding_widgets; 3524 $self->update_binding_widgets;
3139 $self->commit if $commit; 3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3140 }); 3527 });
3141} 3528}
3142 3529
3143# $mod and $sym are the modifiers and key symbol 3530# $mod and $sym are the modifiers and key symbol
3144# $cmds is a array ref of strings (the commands) 3531# $cmds is a array ref of strings (the commands)
… …
3162} 3549}
3163 3550
3164# this is a shortcut method that asks for a binding 3551# this is a shortcut method that asks for a binding
3165# and then just binds it. 3552# and then just binds it.
3166sub do_quick_binding { 3553sub do_quick_binding {
3167 my ($self, $cmds) = @_; 3554 my ($self, $cmds, $end_cb) = @_;
3168 $self->set_binding (undef, undef, $cmds, sub { 3555 $self->set_binding (undef, undef, $cmds, sub {
3169 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170 }); 3557 });
3171 $self->ask_for_bind (1); 3558 $self->ask_for_bind (1, $end_cb);
3172} 3559}
3173 3560
3174sub update_binding_widgets { 3561sub update_binding_widgets {
3175 my ($self) = @_; 3562 my ($self) = @_;
3176 my ($mod, $sym, $cmds) = $self->get_binding; 3563 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3220 3607
3221############################################################################# 3608#############################################################################
3222 3609
3223package CFClient::UI::SpellList; 3610package CFClient::UI::SpellList;
3224 3611
3225our @ISA = CFClient::UI::FancyFrame::; 3612our @ISA = CFClient::UI::Table::;
3226 3613
3227sub new { 3614sub new {
3228 my $class = shift; 3615 my $class = shift;
3229 3616
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3617 my $self = $class->SUPER::new (
3231 3618 binding => [],
3232 $self->add (new CFClient::UI::ScrolledWindow 3619 commands => [],
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3620 @_,
3234 3621 )
3235 $self;
3236} 3622}
3237 3623
3238# XXX: Do sorting? Argl... 3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3625
3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3636
3637sub rebuild_spell_list {
3638 my ($self) = @_;
3639
3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3641 $self->clear;
3642
3643 return unless $::CONN;
3644
3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3650
3651 my $row = 0;
3652
3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3654 my $spell = $self->{spell}{$_};
3655
3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3683
3684 $self->add (0, $row, new CFClient::UI::Face
3685 face => $spell->{face},
3686 can_hover => 1,
3687 can_events => 1,
3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3690 );
3691
3692 $self->add (1, $row, new CFClient::UI::Label
3693 expand => 1,
3694 text => $spell->{name},
3695 can_hover => 1,
3696 can_events => 1,
3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3699 );
3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3705 }
3706 });
3707}
3708
3239sub add_spell { 3709sub add_spell {
3240 my ($self, $spell) = @_; 3710 my ($self, $spell) = @_;
3711
3241 $self->{spells}->{$spell->{name}} = $spell; 3712 $self->{spell}->{$spell->{name}} = $spell;
3242 3713 $self->rebuild_spell_list;
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270} 3714}
3271 3715
3272sub remove_spell { 3716sub remove_spell {
3273 my ($self, $spell) = @_; 3717 my ($self, $spell) = @_;
3718
3274 delete $self->{spells}->{$spell->{name}}; 3719 delete $self->{spell}->{$spell->{name}};
3275 $self->rebuild_spell_list; 3720 $self->rebuild_spell_list;
3276} 3721}
3277 3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3727 $self->rebuild_spell_list;
3728}
3729
3278############################################################################# 3730#############################################################################
3279 3731
3280package CFClient::UI::Root; 3732package CFClient::UI::Root;
3281 3733
3282our @ISA = CFClient::UI::Container::; 3734our @ISA = CFClient::UI::Container::;
3735
3736use List::Util qw(min max);
3283 3737
3284use CFClient::OpenGL; 3738use CFClient::OpenGL;
3285 3739
3286sub new { 3740sub new {
3287 my $class = shift; 3741 my $class = shift;
… …
3314 $coord = $max - $size if $coord > $max - $size; 3768 $coord = $max - $size if $coord > $max - $size;
3315 3769
3316 int $coord + 0.5 3770 int $coord + 0.5
3317} 3771}
3318 3772
3319sub size_allocate { 3773sub invoke_size_allocate {
3320 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
3321 3775
3322 for my $child ($self->children) { 3776 for my $child ($self->children) {
3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3777 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3324 3778
… …
3328 $X = _to_pixel $X, $W, $self->{w}; 3782 $X = _to_pixel $X, $W, $self->{w};
3329 $Y = _to_pixel $Y, $H, $self->{h}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
3330 3784
3331 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3332 } 3786 }
3787
3788 1
3333} 3789}
3334 3790
3335sub coord2local { 3791sub coord2local {
3336 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3337 3793
… …
3422 3878
3423 delete $queue{$widget+0}; 3879 delete $queue{$widget+0};
3424 3880
3425 my ($w, $h) = $widget->size_request; 3881 my ($w, $h) = $widget->size_request;
3426 3882
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3883 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3884 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3885
3886 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3887 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3429 3888
3430 $w = $widget->{force_w} if exists $widget->{force_w}; 3889 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h}; 3890 $h = $widget->{force_h} if exists $widget->{force_h};
3432 3891
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3892 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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