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

Diff Legend

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