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.302 by root, Mon Jun 12 13:26: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->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
314} 315}
315 316
316sub move_abs { 317sub move_abs {
317 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
318 319
319 $self->{x} = List::Util::max 0, int $x; 320 $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; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
322 323
323 $self->update; 324 $self->update;
324} 325}
325 326
371sub size_allocate { 372sub size_allocate {
372 # nothing to be done 373 # nothing to be done
373} 374}
374 375
375sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
376} 382}
377 383
378sub set_max_size { 384sub set_max_size {
379 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
380 386
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
383} 391}
384 392
385sub set_tooltip { 393sub set_tooltip {
386 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
387 395
392 400
393 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
394 402
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 406 }
399} 407}
400 408
401# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
402sub coord2local { 410sub coord2local {
439 447
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 449 unless $FOCUS;
442} 450}
443 451
444sub mouse_motion { } 452sub mouse_motion { 0 }
445sub button_up { } 453sub button_up { 0 }
446sub key_down { } 454sub key_down { 0 }
447sub key_up { } 455sub key_up { 0 }
448 456
449sub button_down { 457sub button_down {
450 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
451 459
452 $self->focus_in; 460 $self->focus_in;
461
462 0
453} 463}
454 464
455sub find_widget { 465sub find_widget {
456 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
457 467
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 553
544 glPushMatrix; 554 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 556
549 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 559 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 561 glBegin GL_QUADS;
556 glVertex $x , $y; 562 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
560 glEnd; 566 glEnd;
561 glDisable GL_BLEND; 567 glDisable GL_BLEND;
562 } 568 }
563 569
564 if ($ENV{CFPLUS_DEBUG} & 1) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 571 glPushMatrix;
566 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 575 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
573 glEnd; 579 glEnd;
574 glPopMatrix; 580 glPopMatrix;
575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
576 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
577} 586}
578 587
579sub _draw { 588sub _draw {
580 my ($self) = @_; 589 my ($self) = @_;
581 590
584 593
585sub DESTROY { 594sub DESTROY {
586 my ($self) = @_; 595 my ($self) = @_;
587 596
588 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
589 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590} 601}
591 602
592############################################################################# 603#############################################################################
593 604
594package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
619 630
620 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
622 633
623 glEnable GL_BLEND; 634 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 636 glColor_premultiply @$color;
626 637
627 glBegin GL_QUADS; 638 glBegin GL_QUADS;
628 glVertex 0 , 0; 639 glVertex 0 , 0;
629 glVertex 0 , $h; 640 glVertex 0 , $h;
630 glVertex $w, $h; 641 glVertex $w, $h;
661our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
662 673
663sub new { 674sub new {
664 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
665 676
666 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
667 678
668 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
669 children => [], 680 children => [],
670 can_events => 0, 681 can_events => 0,
671 %arg, 682 %arg,
672 ); 683 );
684
673 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
674 687
675 $self 688 $self
676} 689}
677 690
678sub add { 691sub add {
726 $x -= $self->{x}; 739 $x -= $self->{x};
727 $y -= $self->{y}; 740 $y -= $self->{y};
728 741
729 my $res; 742 my $res;
730 743
731 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
733 and return $res; 746 and return $res;
734 } 747 }
735 748
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
757} 770}
758 771
759sub add { 772sub add {
760 my ($self, $child) = @_; 773 my ($self, $child) = @_;
761 774
762 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
763
764 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
765} 777}
766 778
767sub remove { 779sub remove {
768 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
784 796
785 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
786} 798}
787 799
788############################################################################# 800#############################################################################
801
802# back-buffered drawing area
789 803
790package CFClient::UI::Window; 804package CFClient::UI::Window;
791 805
792our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
793 807
845 my $tex = $self->{texture} 859 my $tex = $self->{texture}
846 or return; 860 or return;
847 861
848 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
851 865
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 867
854 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
855} 869}
946package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
947 961
948our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
949 963
950sub new { 964sub new {
951 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
952 968
953 my $self; 969 my $self;
954 970
955 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
956 vertical => 1, 972 vertical => 1,
961 ; 977 ;
962 978
963 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
965 slider => $slider, 981 slider => $slider,
966 @_, 982 %arg,
967 ); 983 );
968 984
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
972 987
973 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
974} 995}
975 996
976sub update { 997sub update {
977 my ($self) = @_; 998 my ($self) = @_;
978 999
1017 1038
1018 if ($self->{bg}) { 1039 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
1020 1041
1021 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1024 1045
1025 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1047 glVertex 0 , 0;
1027 glVertex 0 , $h; 1048 glVertex 0 , $h;
1028 glVertex $w, $h; 1049 glVertex $w, $h;
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1074
1054sub new { 1075sub new {
1055 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1056
1057 my $title = delete $arg{title};
1058 1077
1059 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1081 border => 0.6,
1064 min_w => 16, 1083 min_w => 16,
1065 min_h => 16, 1084 min_h => 16,
1066 %arg, 1085 %arg,
1067 ); 1086 );
1068 1087
1069 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1070 align => 0, 1089 align => 0,
1071 valign => 1, 1090 valign => 1,
1072 text => $title, 1091 text => $self->{title},
1073 fontsize => $self->{border} 1092 fontsize => $self->{border},
1074 if defined $title; 1093 if exists $self->{title};
1075 1094
1076 $self 1095 $self
1077} 1096}
1078 1097
1079sub add { 1098sub add {
1080 my ($self, @widgets) = @_; 1099 my ($self, @widgets) = @_;
1081 1100
1082 $self->SUPER::add (@widgets); 1101 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1103}
1085 1104
1086sub border { 1105sub border {
1087 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1088} 1107}
1089 1108
1090sub size_request { 1109sub size_request {
1091 my ($self) = @_; 1110 my ($self) = @_;
1092 1111
1093 $self->{title}->size_request 1112 $self->{title_widget}->size_request
1094 if $self->{title}; 1113 if $self->{title_widget};
1095 1114
1096 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1097 1116
1098 ( 1117 (
1099 $w + $self->border * 2, 1118 $w + $self->border * 2,
1102} 1121}
1103 1122
1104sub size_allocate { 1123sub size_allocate {
1105 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1106 1125
1107 if ($self->{title}) { 1126 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1127 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1128 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1129 $self->{title_widget}->size_allocate ($w, $h);
1111 } 1130 }
1112 1131
1113 my $border = $self->border; 1132 my $border = $self->border;
1114 1133
1115 $h -= List::Util::max 0, $border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1142 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1143 1162
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1167 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1168 };
1150 1169
1151 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
1156 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1157 1176
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1178
1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1161 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1162 } 1187 1
1163} 1188}
1164 1189
1165sub button_up { 1190sub button_up {
1166 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1167 1192
1168 delete $self->{motion}; 1193 !!delete $self->{motion}
1169} 1194}
1170 1195
1171sub mouse_motion { 1196sub mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1173 1198
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1175} 1202}
1176 1203
1177sub _draw { 1204sub _draw {
1178 my ($self) = @_; 1205 my ($self) = @_;
1179 1206
1205 1232
1206 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1207 1234
1208 $child->draw; 1235 $child->draw;
1209 1236
1210 if ($self->{title}) { 1237 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1238 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1239 $self->{title_widget}->_draw;
1213 } 1240 }
1214} 1241}
1215 1242
1216############################################################################# 1243#############################################################################
1217 1244
1241 1268
1242 $child->set_parent ($self); 1269 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1244 1271
1245 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1246} 1279}
1247 1280
1248# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1249sub clear { 1282sub clear {
1250 my ($self) = @_; 1283 my ($self) = @_;
1511 1544
1512 delete $self->{texture}; 1545 delete $self->{texture};
1513 $self->SUPER::update; 1546 $self->SUPER::update;
1514} 1547}
1515 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1516sub set_text { 1556sub set_text {
1517 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1518 1558
1519 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1521 1561
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1524 1564
1565 delete $self->{size_req};
1525 $self->realloc; 1566 $self->realloc;
1526 $self->update; 1567 $self->update;
1527} 1568}
1528 1569
1529sub set_markup { 1570sub set_markup {
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1577
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1539 1580
1581 delete $self->{size_req};
1540 $self->realloc; 1582 $self->realloc;
1541 $self->update; 1583 $self->update;
1542} 1584}
1543 1585
1544sub size_request { 1586sub size_request {
1545 my ($self) = @_; 1587 my ($self) = @_;
1546 1588
1589 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1595
1553 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1554 1597
1555 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1601
1559 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1560 1603
1561 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1563 } 1609 };
1564 1610
1565 ($w, $h) 1611 @{ $self->{size_req} }
1566} 1612}
1567 1613
1568sub size_allocate { 1614sub size_allocate {
1569 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1570 1616
1579 1625
1580 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1581 delete $self->{texture}; 1627 delete $self->{texture};
1582 1628
1583 $self->realloc; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1584} 1638}
1585 1639
1586sub _draw { 1640sub _draw {
1587 my ($self) = @_; 1641 my ($self) = @_;
1588 1642
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1610 }; 1664 };
1611 1665
1612 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1614 1670
1615 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1616 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1618 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1620 } 1678 }
1621 1679
1622 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1623} 1681}
1624 1682
1641 can_hover => 1, 1699 can_hover => 1,
1642 can_focus => 1, 1700 can_focus => 1,
1643 valign => 0, 1701 valign => 0,
1644 can_events => 1, 1702 can_events => 1,
1645 #text => ... 1703 #text => ...
1704 #hidden => "*",
1646 @_ 1705 @_
1647 ) 1706 )
1648} 1707}
1649 1708
1650sub _set_text { 1709sub _set_text {
1652 1711
1653 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1654 1713
1655 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1656 1715
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1717 $self->{text} = $text;
1661 1718
1662 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1664 1722
1665 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1666} 1727}
1667 1728
1668sub set_text { 1729sub set_text {
1669 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1670 1731
1671 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1733 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1734}
1676 1735
1677sub get_text { 1736sub get_text {
1678 $_[0]{text} 1737 $_[0]{text}
1679} 1738}
1709 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1712 } elsif ($uni) { 1771 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1714 } 1775 }
1715 1776
1716 $self->_set_text ($text); 1777 $self->_set_text ($text);
1717 1778
1718 $self->realloc; 1779 $self->realloc;
1780
1781 1
1719} 1782}
1720 1783
1721sub focus_in { 1784sub focus_in {
1722 my ($self) = @_; 1785 my ($self) = @_;
1723 1786
1738 utf8::encode $text; 1801 utf8::encode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1740 1803
1741 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1742 $self->update; 1805 $self->update;
1806
1807 1
1743} 1808}
1744 1809
1745sub mouse_motion { 1810sub mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1748} 1815}
1749 1816
1750sub _draw { 1817sub _draw {
1751 my ($self) = @_; 1818 my ($self) = @_;
1752 1819
1753 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1754 1821
1755 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1758 } else { 1825 } else {
1759 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1760 } 1827 }
1761 1828
1762 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1832 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
1829 } else { 1896 } else {
1830 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1831 } 1898 }
1832 1899
1833 } else { 1900 } else {
1834 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1835 } 1904 1
1836
1837} 1905}
1838 1906
1839############################################################################# 1907#############################################################################
1840 1908
1841package CFClient::UI::Button; 1909package CFClient::UI::Button;
1870 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1871 1939
1872 $self->emit ("activate") 1940 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1875} 1945}
1876 1946
1877sub _draw { 1947sub _draw {
1878 my ($self) = @_; 1948 my ($self) = @_;
1879 1949
1880 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 1951
1886 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1889 1955
1933 1999
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1937 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1938 } 2008 1
1939} 2009}
1940 2010
1941sub _draw { 2011sub _draw {
1942 my ($self) = @_; 2012 my ($self) = @_;
1943 2013
2110 2180
2111 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2113 2183
2114 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2189
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
2241sub set_range { 2312sub set_range {
2242 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2243 2314
2244 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2245 2316
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2248} 2321}
2249 2322
2250sub set_value { 2323sub set_value {
2251 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2252 2325
2281 2354
2282 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2283 2356
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2358
2286 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2287} 2360}
2288 2361
2289sub mouse_motion { 2362sub mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2291 2364
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2369
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2371
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2300 } 2377 1
2301} 2378}
2302 2379
2303sub update { 2380sub update {
2304 my ($self) = @_; 2381 my ($self) = @_;
2305 2382
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2308 2392
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2311 2395
2317 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2319 2403
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2322 }); 2406 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2407
2330 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2331 2409
2332 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2333 2411
2394sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2396 2474
2397############################################################################# 2475#############################################################################
2398 2476
2399package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2400 2478
2401our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2402 2480
2403use CFClient::OpenGL; 2481use CFClient::OpenGL;
2404 2482
2406 my $class = shift; 2484 my $class = shift;
2407 2485
2408 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2409 fontsize => 1, 2487 fontsize => 1,
2410 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2411 #font => default_font 2490 #font => default_font
2412 @_, 2491 @_,
2413 2492
2414 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2415 par => [], 2494 par => [],
2438 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2439 2518
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443 2523
2444 $self->reflow; 2524 $self->reflow;
2445} 2525}
2446 2526
2447sub text_size { 2527sub text_size {
2449 2529
2450 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2451 2531
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2455 2536
2456 $layout->size 2537 $layout->size
2457} 2538}
2458 2539
2497 2578
2498 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2499 2580
2500 delete $self->{texture}; 2581 delete $self->{texture};
2501 2582
2502 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 2585
2505 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2506 my $height = 0; 2587 my $height = 0;
2507 2588
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 2592
2512 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2515 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h; 2600 $_->[1] = $h;
2519 } 2601 }
2522 } 2604 }
2523 2605
2524 $self->{height} = $height; 2606 $self->{height} = $height;
2525 2607
2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2527 2609
2528 delete $self->{texture}; 2610 delete $self->{texture};
2529 } 2611 }
2530 2612
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2534 2616
2535 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2536 2618
2537 my $y0 = $top; 2619 my $y0 = $top;
2551 my $h = $par->[1]; 2633 my $h = $par->[1];
2552 2634
2553 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2556 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2557 2640
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2559 2642
2560 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
2572sub _draw { 2655sub _draw {
2573 my ($self) = @_; 2656 my ($self) = @_;
2574 2657
2575 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2580 2663
2581 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2582 2665
2583} 2666}
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 2759 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 2760 . "visible $widget->{visible}";
2678 } 2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2679 2765
2680 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2681 markup => $tooltip, 2767 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 2769 fontsize => 0.8,
2711 or return; 2797 or return;
2712 2798
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 2800
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 2802 if $x + $self->{w} > $self->{root}{w};
2717 2803
2718 $self->move_abs ($x, $y); 2804 $self->move_abs ($x, $y);
2719 }); 2805 });
2720} 2806}
2721 2807
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 2897
2812 if ($tex) { 2898 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2818 } 2904 }
2819} 2905}
2820 2906
2821sub DESTROY { 2907sub destroy {
2822 my ($self) = @_; 2908 my ($self) = @_;
2823 2909
2824 $self->{timer}->cancel 2910 $self->{timer}->cancel
2825 if $self->{timer}; 2911 if $self->{timer};
2826 2912
2827 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2828} 2914}
2915
2916#############################################################################
2917
2918package CFClient::UI::Buttonbar;
2919
2920our @ISA = CFClient::UI::HBox::;
2921
2922# TODO: should actualyl wrap buttons and other goodies.
2829 2923
2830############################################################################# 2924#############################################################################
2831 2925
2832package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2833 2927
2845 ); 2939 );
2846 2940
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 2942
2849 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2851 2945
2852 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2853 if (!ref $widget) { 2947 if (!ref $widget) {
2854 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2855 can_hover => 1, 2949 can_hover => 1,
2856 can_events => 1, 2950 can_events => 1,
2857 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2858 } 2953 }
2859 2954
2860 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2861 2956
2862 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
2883 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2884 2979
2885 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2888} 2985}
2889 2986
2890sub button_up { 2987sub button_up {
2891 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2892 2989
2894 undef $GRAB; 2991 undef $GRAB;
2895 $self->hide; 2992 $self->hide;
2896 2993
2897 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2899 } 3000 1
2900} 3001}
2901 3002
2902############################################################################# 3003#############################################################################
2903 3004
2904package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2905 3006
2906our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2907 3008
2908sub new { 3009sub new {
2909 my $class = shift; 3010 my $class = shift;
2910 3011
2911 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3177 fontsize => 0.8,
2913 @_, 3178 @_,
2914 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2915} 3186}
2916 3187
2917sub reorder { 3188sub reorder {
2918 my ($self) = @_; 3189 my ($self) = @_;
2919 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2920 3196
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3199 }
2924 3200
2927 my @items = sort { 3203 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2931 3207
3208 $self->{timer}->interval (1);
3209
2932 my $count = 10 + 1; 3210 my $count = 10 + 1;
2933 for my $item (@items) { 3211 for my $item (@items) {
2934 last unless --$count; 3212 last unless --$count;
2935 3213
2936 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3218 : $item->{text};
2941 3219
2949 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3233 can_events => 1,
2956 can_hover => 1 3234 can_hover => 1
2957 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2958 } 3248 }
2959 3249
2960 $self->clear; 3250 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2962} 3252}
2967 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2969 3259
2970 return unless $text; 3260 return unless $text;
2971 3261
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3263
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3265
2976 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2978 $item->{count}++; 3268 $item->{count}++;
2979 } else { 3269 } else {
2980 $item->{count} = 1; 3270 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2982 } 3272 }
2983 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3275 delete $item->{label};
2986 } else { 3276 } else {
2987 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3278 id => ++$self->{id},
3007 3297
3008 $self->reorder; 3298 $self->reorder;
3009 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
3010} 3300}
3011 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
3012############################################################################# 3310#############################################################################
3013 3311
3014package CFClient::UI::Inventory; 3312package CFClient::UI::Inventory;
3015 3313
3016our @ISA = CFClient::UI::ScrolledWindow::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
3017 3315
3018sub new { 3316sub new {
3019 my $class = shift; 3317 my $class = shift;
3020 3318
3021 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023 @_, 3321 @_,
3024 ); 3322 );
3025 3323
3026 $self 3324 $self
3027} 3325}
3028 3326
3029sub set_items { 3327sub set_items {
3030 my ($self, $items) = @_; 3328 my ($self, $items) = @_;
3031 3329
3032 $self->{scrolled}->clear; 3330 $self->{child}->clear;
3033 return unless $items; 3331 return unless $items;
3034 3332
3035 my @items = sort { 3333 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3334 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3335 or ($a->{name} cmp $b->{name})
3041 3339
3042 my $row = 0; 3340 my $row = 0;
3043 for my $item (@items) { 3341 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3342 CFClient::Item::update_widgets $item;
3045 3343
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3344 $self->{child}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3345 $self->{child}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3346 $self->{child}->add (2, $row, $item->{weight_widget});
3049 3347
3050 $row++; 3348 $row++;
3051 } 3349 }
3052} 3350}
3053 3351
3151 $rec = $::CONN->stop_record if $::CONN; 3449 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY'; 3450 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec); 3451 $self->set_command_list ($rec);
3154} 3452}
3155 3453
3156# if $commit is true, the binding will be set after the user entered a key combo 3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3157sub ask_for_bind { 3460sub ask_for_bind {
3158 my ($self, $commit) = @_; 3461 my ($self, $commit) = @_;
3159 3462
3160 CFClient::Binder::open_binding_dialog (sub { 3463 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_; 3464 my ($mod, $sym) = @_;
3245 3548
3246############################################################################# 3549#############################################################################
3247 3550
3248package CFClient::UI::SpellList; 3551package CFClient::UI::SpellList;
3249 3552
3250our @ISA = CFClient::UI::FancyFrame::; 3553our @ISA = CFClient::UI::Table::;
3251 3554
3252sub new { 3555sub new {
3253 my $class = shift; 3556 my $class = shift;
3254 3557
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3558 my $self = $class->SUPER::new (
3256 3559 binding => [],
3257 $self->add (new CFClient::UI::ScrolledWindow 3560 commands => [],
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3561 @_,
3259 3562 )
3260 $self;
3261} 3563}
3262 3564
3263# XXX: Do sorting? Argl... 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3264sub add_spell { 3650sub add_spell {
3265 my ($self, $spell) = @_; 3651 my ($self, $spell) = @_;
3652
3266 $self->{spells}->{$spell->{name}} = $spell; 3653 $self->{spell}->{$spell->{name}} = $spell;
3267 3654 $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} 3655}
3296 3656
3297sub remove_spell { 3657sub remove_spell {
3298 my ($self, $spell) = @_; 3658 my ($self, $spell) = @_;
3659
3299 delete $self->{spells}->{$spell->{name}}; 3660 delete $self->{spell}->{$spell->{name}};
3300 $self->rebuild_spell_list; 3661 $self->rebuild_spell_list;
3301} 3662}
3302 3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3303############################################################################# 3671#############################################################################
3304 3672
3305package CFClient::UI::Root; 3673package CFClient::UI::Root;
3306 3674
3307our @ISA = CFClient::UI::Container::; 3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3308 3678
3309use CFClient::OpenGL; 3679use CFClient::OpenGL;
3310 3680
3311sub new { 3681sub new {
3312 my $class = shift; 3682 my $class = shift;
3447 3817
3448 delete $queue{$widget+0}; 3818 delete $queue{$widget+0};
3449 3819
3450 my ($w, $h) = $widget->size_request; 3820 my ($w, $h) = $widget->size_request;
3451 3821
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3454 3827
3455 $w = $widget->{force_w} if exists $widget->{force_w}; 3828 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h}; 3829 $h = $widget->{force_h} if exists $widget->{force_h};
3457 3830
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines