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.260 by elmex, Tue May 30 14:35:09 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

… …
40 40
41 $LAYOUT = $layout; 41 $LAYOUT = $layout;
42} 42}
43 43
44sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
45 if (!$GRAB) { 47 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide; 51 $TOOLTIP->hide;
51 52
52 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
53 54
… …
170sub rescale_widgets { 171sub rescale_widgets {
171 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
172 173
173 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 178
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 185
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 188
188 } 189 }
189 } 190 }
190 191
191 reconfigure_widgets; 192 reconfigure_widgets;
… …
370sub size_allocate { 371sub size_allocate {
371 # nothing to be done 372 # nothing to be done
372} 373}
373 374
374sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
375} 381}
376 382
377sub set_max_size { 383sub set_max_size {
378 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
379 385
… …
438 444
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 446 unless $FOCUS;
441} 447}
442 448
443sub mouse_motion { } 449sub mouse_motion { 0 }
444sub button_up { } 450sub button_up { 0 }
445sub key_down { } 451sub key_down { 0 }
446sub key_up { } 452sub key_up { 0 }
447 453
448sub button_down { 454sub button_down {
449 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
450 456
451 $self->focus_in; 457 $self->focus_in;
452}
453 458
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459 461
460sub find_widget { 462sub find_widget {
461 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
462 464
463 return () unless $self->{can_events}; 465 return () unless $self->{can_events};
… …
525 527
526 $self->realloc; 528 $self->realloc;
527 $self->update; 529 $self->update;
528} 530}
529 531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
530sub draw { 536sub draw {
531 my ($self) = @_; 537 my ($self) = @_;
532 538
533 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 550
535 glPushMatrix; 551 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw; 553 $self->_draw;
538 glPopMatrix; 554 glPopMatrix;
… …
652our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
653 669
654sub new { 670sub new {
655 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
656 672
657 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
658 674
659 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
660 children => [], 676 children => [],
661 can_events => 0, 677 can_events => 0,
662 %arg, 678 %arg,
663 ); 679 );
680
664 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
665 683
666 $self 684 $self
667} 685}
668 686
669sub add { 687sub add {
… …
717 $x -= $self->{x}; 735 $x -= $self->{x};
718 $y -= $self->{y}; 736 $y -= $self->{y};
719 737
720 my $res; 738 my $res;
721 739
722 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
724 and return $res; 742 and return $res;
725 } 743 }
726 744
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
776 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
777} 795}
778 796
779############################################################################# 797#############################################################################
780 798
799# back-buffered drawing area
800
781package CFClient::UI::Window; 801package CFClient::UI::Window;
782 802
783our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
784 804
785use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
803 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 824 $self->update;
805} 825}
806 826
807sub _render { 827sub _render {
828 my ($self) = @_;
829
808 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
809} 831}
810 832
811sub render_child { 833sub render_child {
812 my ($self) = @_; 834 my ($self) = @_;
813 835
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
817 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
818 $self->_render; 847 $self->_render;
819 }; 848 };
820} 849}
821 850
822sub _draw { 851sub _draw {
823 my ($self) = @_; 852 my ($self) = @_;
824 853
825 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
826 855
827 my $tex = $self->{texture} 856 my $tex = $self->{texture}
828 or return; 857 or return;
829 858
830 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
913} 942}
914 943
915sub _render { 944sub _render {
916 my ($self) = @_; 945 my ($self) = @_;
917 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 951
920 $self->SUPER::_render; 952 $self->SUPER::_render;
921} 953}
922 954
… …
925package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
926 958
927our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
928 960
929sub new { 961sub new {
930 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
931 965
932 my $self; 966 my $self;
933 967
934 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
935 vertical => 1, 969 vertical => 1,
… …
940 ; 974 ;
941 975
942 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 978 slider => $slider,
945 @_, 979 %arg,
946 ); 980 );
947 981
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
951 984
952 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
953} 992}
954 993
955sub update { 994sub update {
956 my ($self) = @_; 995 my ($self) = @_;
957 996
… …
1029my @border = 1068my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1071
1033sub new { 1072sub new {
1034 my $class = shift; 1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1035 1076
1036 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1080 border => 0.6,
1040 can_events => 1, 1081 can_events => 1,
1041 min_w => 16, 1082 min_w => 16,
1042 min_h => 16, 1083 min_h => 16,
1043 @_ 1084 %arg,
1044 ); 1085 );
1045 1086
1046 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
1047 align => 0, 1088 align => 0,
1048 valign => 1, 1089 valign => 1,
1049 text => $self->{title}, 1090 text => $title,
1050 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
1051 1093
1052 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1053} 1102}
1054 1103
1055sub border { 1104sub border {
1056 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
1057} 1106}
1058 1107
1059sub size_request { 1108sub size_request {
1060 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
1061 1113
1062 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
1063 1115
1064 ( 1116 (
1065 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
1068} 1120}
1069 1121
1070sub size_allocate { 1122sub size_allocate {
1071 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
1072 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
1073 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
1075 1135
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
1080} 1137}
1081 1138
1082sub button_down { 1139sub button_down {
1083 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1084 1141
… …
1103 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
1104 1161
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1164
1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1166 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1167 };
1111 1168
1112 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1118 1175
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1177
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
1123 } 1186 1
1124} 1187}
1125 1188
1126sub button_up { 1189sub button_up {
1127 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
1128 1191
1129 delete $self->{motion}; 1192 !!delete $self->{motion}
1130} 1193}
1131 1194
1132sub mouse_motion { 1195sub mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1134 1197
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
1136} 1201}
1137 1202
1138sub _draw { 1203sub _draw {
1139 my ($self) = @_; 1204 my ($self) = @_;
1140 1205
1206 my $child = $self->{children}[0];
1207
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1210
1144 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1213
1147 my $border = $self->border; 1214 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1230 }
1164 1231
1165 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1166 1233
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1170} 1240}
1171 1241
1172############################################################################# 1242#############################################################################
1173 1243
1174package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1522} 1592}
1523 1593
1524sub size_allocate { 1594sub size_allocate {
1525 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1526 1596
1597 delete $self->{ox};
1598
1527 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1528} 1601}
1529 1602
1530sub set_fontsize { 1603sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1532 1605
… …
1547 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1624
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1553 1627
1628 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1557 1632
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1563 }; 1636 };
1564 1637
1565 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 1640
… …
1605 1678
1606 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1607 1680
1608 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1609 1682
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1684 $self->{text} = $text;
1614 1685
1615 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1617 1688
1618 $self->_emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1619} 1691}
1620 1692
1621sub set_text { 1693sub set_text {
1622 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1623 1695
… …
1662 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1736 $self->_emit ('escape');
1665 } elsif ($uni) { 1737 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1667 } 1741 }
1668 1742
1669 $self->_set_text ($text); 1743 $self->_set_text ($text);
1670 1744
1671 $self->realloc; 1745 $self->realloc;
1746
1747 1
1672} 1748}
1673 1749
1674sub focus_in { 1750sub focus_in {
1675 my ($self) = @_; 1751 my ($self) = @_;
1676 1752
… …
1691 utf8::encode $text; 1767 utf8::encode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1693 1769
1694 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1695 $self->update; 1771 $self->update;
1772
1773 1
1696} 1774}
1697 1775
1698sub mouse_motion { 1776sub mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1701} 1781}
1702 1782
1703sub _draw { 1783sub _draw {
1704 my ($self) = @_; 1784 my ($self) = @_;
1705 1785
… …
1782 } else { 1862 } else {
1783 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1784 } 1864 }
1785 1865
1786 } else { 1866 } else {
1787 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1788 } 1870 1
1789
1790} 1871}
1791 1872
1792############################################################################# 1873#############################################################################
1793 1874
1794package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1823 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1824 1905
1825 $self->emit ("activate") 1906 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 1908 && $y >= 0 && $y < $self->{h};
1909
1910 1
1828} 1911}
1829 1912
1830sub _draw { 1913sub _draw {
1831 my ($self) = @_; 1914 my ($self) = @_;
1832 1915
… …
1886 1969
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1890 $self->_emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1891 } 1978 1
1892} 1979}
1893 1980
1894sub _draw { 1981sub _draw {
1895 my ($self) = @_; 1982 my ($self) = @_;
1896 1983
… …
2234 2321
2235 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2236 2323
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2325
2239 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2240} 2327}
2241 2328
2242sub mouse_motion { 2329sub mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2244 2331
… …
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2336
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2338
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2253 } 2344 1
2254} 2345}
2255 2346
2256sub update { 2347sub update {
2257 my ($self) = @_; 2348 my ($self) = @_;
2258 2349
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2261 2359
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2361 my $range = ($hi - $page - $lo) || 1e-100;
2264 2362
… …
2270 $value = ($value - $lo) / $range; 2368 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2369 $value = $value * $self->{scale} + $self->{offset};
2272 2370
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2372 $self->{knob_w} = $knob_w;
2275 }); 2373 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2374
2283 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2284 2376
2285 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2286 2378
… …
2780 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2781} 2873}
2782 2874
2783############################################################################# 2875#############################################################################
2784 2876
2785package CFClient::UI::Inventory; 2877package CFClient::UI::Buttonbar;
2786 2878
2787our @ISA = CFClient::UI::ScrolledWindow::; 2879our @ISA = CFClient::UI::HBox::;
2788 2880
2789sub new { 2881# TODO: should actualyl wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 2882
2825############################################################################# 2883#############################################################################
2826 2884
2827package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2828 2886
… …
2878 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2879 2937
2880 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2883} 2943}
2884 2944
2885sub button_up { 2945sub button_up {
2886 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2887 2947
… …
2889 undef $GRAB; 2949 undef $GRAB;
2890 $self->hide; 2950 $self->hide;
2891 2951
2892 $self->_emit ("popdown"); 2952 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2958 1
2959}
2960
2961#############################################################################
2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
2894 } 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
2895} 3067}
2896 3068
2897############################################################################# 3069#############################################################################
2898 3070
2899package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
3004 $self->SUPER::reconfigure; 3176 $self->SUPER::reconfigure;
3005} 3177}
3006 3178
3007############################################################################# 3179#############################################################################
3008 3180
3009package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
3010 3182
3011our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
3012
3013use CFClient::OpenGL;
3014 3184
3015sub new { 3185sub new {
3016 my $class = shift; 3186 my $class = shift;
3017 3187
3018 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3019 visible => 1, 3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3020 @_, 3190 @_,
3021 ); 3191 );
3022 3192
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self 3193 $self
3026} 3194}
3027 3195
3028sub size_request { 3196sub set_items {
3029 my ($self) = @_; 3197 my ($self, $items) = @_;
3030 3198
3031 ($self->{w}, $self->{h}) 3199 $self->{child}->clear;
3032} 3200 return unless $items;
3033 3201
3034sub _to_pixel { 3202 my @items = sort {
3035 my ($coord, $size, $max) = @_; 3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3036 3206
3037 $coord = 3207 $self->{real_items} = \@items;
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041 3208
3042 $coord = 0 if $coord < 0; 3209 my $row = 0;
3043 $coord = $max - $size if $coord > $max - $size; 3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3044 3212
3045 int $coord + 0.5 3213 $self->{child}->add (0, $row, $item->{face_widget});
3046} 3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3047 3216
3048sub size_allocate { 3217 $row++;
3049 my ($self, $w, $h) = @_;
3050
3051 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053
3054 $X = $child->{force_x} if exists $child->{force_x};
3055 $Y = $child->{force_y} if exists $child->{force_y};
3056
3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
3060 $child->configure ($X, $Y, $W, $H);
3061 } 3218 }
3062}
3063
3064sub coord2local {
3065 my ($self, $x, $y) = @_;
3066
3067 ($x, $y)
3068}
3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
3076sub update {
3077 my ($self) = @_;
3078
3079 $::WANT_REFRESH++;
3080}
3081
3082sub add {
3083 my ($self, @children) = @_;
3084
3085 $_->{is_toplevel} = 1
3086 for @children;
3087
3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
3104}
3105
3106sub on_refresh {
3107 my ($self, $id, $cb) = @_;
3108
3109 $self->{refresh_hook}{$id} = $cb;
3110}
3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
3118sub draw {
3119 my ($self) = @_;
3120
3121 while ($self->{refresh_hook}) {
3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
3199
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT;
3203
3204 glMatrixMode GL_PROJECTION;
3205 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity;
3209
3210 $self->_draw;
3211} 3219}
3212 3220
3213############################################################################# 3221#############################################################################
3214 3222
3215package CFClient::UI::BindEditor; 3223package CFClient::UI::BindEditor;
… …
3221 3229
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223 3231
3224 $self->add (my $vb = new CFClient::UI::VBox); 3232 $self->add (my $vb = new CFClient::UI::VBox);
3225 3233
3226 $vb->add (my $hb = new CFClient::UI::HBox);
3227 $hb->add (new CFClient::UI::Label text => "Key: ");
3228 $hb->add ($self->{keylbl} = new CFClient::UI::Label);
3229 $hb->add (new CFClient::UI::Button
3230 text => "bind",
3231 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3232 on_activate => sub {
3233 $self->ask_for_bind;
3234 });
3235 3234
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3238 text => "start recording", 3236 text => "start recording",
3239 tooltip => "Start/Stops recording of actions." 3237 tooltip => "Start/Stops recording of actions."
3240 ."All subsequent actions after the recording started will be captured." 3238 ."All subsequent actions after the recording started will be captured."
3241 ."The actions are displayed after the record was stopped." 3239 ."The actions are displayed after the record was stopped."
… …
3246 } else { 3244 } else {
3247 $self->stop; 3245 $self->stop;
3248 } 3246 }
3249 }); 3247 });
3250 3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3251 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox); 3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3252 3261
3253 $vb->add (my $hb = new CFClient::UI::HBox); 3262 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add (new CFClient::UI::Button 3263 $hb->add (new CFClient::UI::Button
3255 text => "ok", 3264 text => "ok",
3265 expand => 1,
3256 tooltip => "This closes the binding editor and saves the binding", 3266 tooltip => "This closes the binding editor and saves the binding",
3257 on_activate => sub { 3267 on_activate => sub {
3258 $self->hide; 3268 $self->hide;
3259 $self->commit; 3269 $self->commit;
3260 }); 3270 });
3261 3271
3262 $hb->add (new CFClient::UI::Button 3272 $hb->add (new CFClient::UI::Button
3263 text => "cancel", 3273 text => "cancel",
3274 expand => 1,
3264 tooltip => "This closes the binding editor without saving", 3275 tooltip => "This closes the binding editor without saving",
3265 on_activate => sub { 3276 on_activate => sub {
3266 $self->hide; 3277 $self->hide;
3267 $self->{binding_cancel}->() 3278 $self->{binding_cancel}->()
3268 if $self->{binding_cancel}; 3279 if $self->{binding_cancel};
… …
3280 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3281 ."'. Don't forget 'Save Config'!"); 3292 ."'. Don't forget 'Save Config'!");
3282 $self->{binding_change}->($mod, $sym, $cmds) 3293 $self->{binding_change}->($mod, $sym, $cmds)
3283 if $self->{binding_change}; 3294 if $self->{binding_change};
3284 } else { 3295 } else {
3285 $::STATUSBOX->add ("No action bound, no keys specified!"); 3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3286 $self->{binding_cancel}->() 3297 $self->{binding_cancel}->()
3287 if $self->{binding_cancel}; 3298 if $self->{binding_cancel};
3288 } 3299 }
3289} 3300}
3290 3301
… …
3305 3316
3306 my $rec; 3317 my $rec;
3307 $rec = $::CONN->stop_record if $::CONN; 3318 $rec = $::CONN->stop_record if $::CONN;
3308 return unless ref $rec eq 'ARRAY'; 3319 return unless ref $rec eq 'ARRAY';
3309 $self->set_command_list ($rec); 3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3310} 3327}
3311 3328
3312sub ask_for_bind { 3329sub ask_for_bind {
3313 my ($self, $commit) = @_; 3330 my ($self, $commit) = @_;
3314 3331
… …
3318 $self->update_binding_widgets; 3335 $self->update_binding_widgets;
3319 $self->commit if $commit; 3336 $self->commit if $commit;
3320 }); 3337 });
3321} 3338}
3322 3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3323sub set_binding { 3345sub set_binding {
3324 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_; 3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3325 3347
3326 $self->clear_command_list; 3348 $self->clear_command_list;
3327 $self->{recording} = 0; 3349 $self->{recording} = 0;
… …
3332 3354
3333 $self->{binding_change} = $cb; 3355 $self->{binding_change} = $cb;
3334 $self->{binding_cancel} = $ccb; 3356 $self->{binding_cancel} = $ccb;
3335 3357
3336 $self->update_binding_widgets; 3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3337} 3369}
3338 3370
3339sub update_binding_widgets { 3371sub update_binding_widgets {
3340 my ($self) = @_; 3372 my ($self) = @_;
3341 my ($mod, $sym, $cmds) = $self->get_binding; 3373 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3367 3399
3368 for (@$cmds) { 3400 for (@$cmds) {
3369 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox); 3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3370 3402
3371 my $i = $idx; 3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3372 $hb->add (new CFClient::UI::Button 3405 $hb->add (new CFClient::UI::Button
3373 text => "delete", 3406 text => "delete",
3374 tooltip => "Deletes the action from the record", 3407 tooltip => "Deletes the action from the record",
3375 on_activate => sub { 3408 on_activate => sub {
3376 $self->{cmdbox}->remove ($hb); 3409 $self->{cmdbox}->remove ($hb);
3377 $cmds->[$i] = undef; 3410 $cmds->[$i] = undef;
3378 }); 3411 });
3379 3412
3380 $hb->add (new CFClient::UI::Label text => $_);
3381 3413
3382 $idx++ 3414 $idx++
3383 } 3415 }
3384} 3416}
3385 3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
3430 @_,
3431 )
3432}
3433
3434# XXX: Do sorting? Argl...
3435sub add_spell {
3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
3438
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root;
3477
3478our @ISA = CFClient::UI::Container::;
3479
3480use CFClient::OpenGL;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (
3486 visible => 1,
3487 @_,
3488 );
3489
3490 Scalar::Util::weaken ($self->{root} = $self);
3491
3492 $self
3493}
3494
3495sub size_request {
3496 my ($self) = @_;
3497
3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
3513}
3514
3515sub size_allocate {
3516 my ($self, $w, $h) = @_;
3517
3518 for my $child ($self->children) {
3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3520
3521 $X = $child->{force_x} if exists $child->{force_x};
3522 $Y = $child->{force_y} if exists $child->{force_y};
3523
3524 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h};
3526
3527 $child->configure ($X, $Y, $W, $H);
3528 }
3529}
3530
3531sub coord2local {
3532 my ($self, $x, $y) = @_;
3533
3534 ($x, $y)
3535}
3536
3537sub coord2global {
3538 my ($self, $x, $y) = @_;
3539
3540 ($x, $y)
3541}
3542
3543sub update {
3544 my ($self) = @_;
3545
3546 $::WANT_REFRESH++;
3547}
3548
3549sub add {
3550 my ($self, @children) = @_;
3551
3552 $_->{is_toplevel} = 1
3553 for @children;
3554
3555 $self->SUPER::add (@children);
3556}
3557
3558sub remove {
3559 my ($self, @children) = @_;
3560
3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3565
3566 while (@children) {
3567 my $w = pop @children;
3568 push @children, $w->children;
3569 $w->set_invisible;
3570 }
3571}
3572
3573sub on_refresh {
3574 my ($self, $id, $cb) = @_;
3575
3576 $self->{refresh_hook}{$id} = $cb;
3577}
3578
3579sub on_post_alloc {
3580 my ($self, $id, $cb) = @_;
3581
3582 $self->{post_alloc_hook}{$id} = $cb;
3583}
3584
3585sub draw {
3586 my ($self) = @_;
3587
3588 while ($self->{refresh_hook}) {
3589 $_->()
3590 for values %{delete $self->{refresh_hook}};
3591 }
3592
3593 if ($self->{realloc}) {
3594 my %queue;
3595 my @queue;
3596 my $widget;
3597
3598 outer:
3599 while () {
3600 if (my $realloc = delete $self->{realloc}) {
3601 for $widget (values %$realloc) {
3602 $widget->{visible} or next; # do not resize invisible widgets
3603
3604 $queue{$widget+0}++ and next; # duplicates are common
3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
3608 }
3609
3610 while () {
3611 @queue or last outer;
3612
3613 $widget = pop @{ $queue[-1] || [] }
3614 and last;
3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
3631 $widget->{req_w} = $w;
3632 $widget->{req_h} = $h;
3633
3634 $self->{size_alloc}{$widget+0} = $widget;
3635
3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
3643 }
3644
3645 delete $self->{realloc}{$widget+0};
3646 }
3647 }
3648
3649 while (my $size_alloc = delete $self->{size_alloc}) {
3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3657
3658 $w = 0 if $w < 0;
3659 $h = 0 if $h < 0;
3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3668 $widget->{w} = $w;
3669 $widget->{h} = $h;
3670
3671 $widget->emit (size_allocate => $w, $h);
3672 }
3673 }
3674 }
3675
3676 while ($self->{post_alloc_hook}) {
3677 $_->()
3678 for values %{delete $self->{post_alloc_hook}};
3679 }
3680
3681
3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3684 glClear GL_COLOR_BUFFER_BIT;
3685
3686 glMatrixMode GL_PROJECTION;
3687 glLoadIdentity;
3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3689 glMatrixMode GL_MODELVIEW;
3690 glLoadIdentity;
3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
3699 $self->_draw;
3700}
3386 3701
3387############################################################################# 3702#############################################################################
3388 3703
3389package CFClient::UI; 3704package CFClient::UI;
3390 3705

Diff Legend

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