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.342 by root, Sun Aug 13 14:38:35 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
262 264
263sub destroy { 265sub destroy {
264 my ($self) = @_; 266 my ($self) = @_;
265 267
266 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
271}
272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
268} 275}
269 276
270sub show { 277sub show {
271 my ($self) = @_; 278 my ($self) = @_;
272 279
… …
313sub set_visibility { 320sub set_visibility {
314 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
315 322
316 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
317 324
318 $visible ? $self->hide 325 $visible ? $self->show
319 : $self->show; 326 : $self->hide;
320} 327}
321 328
322sub toggle_visibility { 329sub toggle_visibility {
323 my ($self) = @_; 330 my ($self) = @_;
324 331
… …
502 509
503 defined wantarray and CFPlus::guard { 510 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
506 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
507} 520}
508 521
509my %has_coords = ( 522my %has_coords = (
510 button_down => 1, 523 button_down => 1,
511 button_up => 1, 524 button_up => 1,
… …
514); 527);
515 528
516sub emit { 529sub emit {
517 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
518 531
519 # I do not really like this solution, but I dislike duplication 532 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
521 my @append 534 my @append
522 = $has_coords{$signal} 535 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
524 : (); 537 : ();
525 538
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 540
528 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 550}
533 551
534sub find_widget { 552sub find_widget {
535 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
536 554
… …
544} 562}
545 563
546sub set_parent { 564sub set_parent {
547 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
548 566
549 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
551} 569}
552 570
553sub realloc { 571sub realloc {
554 my ($self) = @_; 572 my ($self) = @_;
… …
633 my ($self) = @_; 651 my ($self) = @_;
634 652
635 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
636} 654}
637 655
656my $cntx;#d#
638sub DESTROY { 657sub DESTROY {
639 my ($self) = @_; 658 my ($self) = @_;
640 659
641 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 661
645 eval { $self->destroy }; 662 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
647} 666}
648 667
649############################################################################# 668#############################################################################
650 669
651package CFPlus::UI::DrawBG; 670package CFPlus::UI::DrawBG;
… …
898 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
899 918
900 { 919 {
901 package CFPlus::UI::Base; 920 package CFPlus::UI::Base;
902 921
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
905 } 926 }
906
907 $self->_render;
908 }; 927 };
909} 928}
910 929
911sub _draw { 930sub _draw {
912 my ($self) = @_; 931 my ($self) = @_;
913
914 my ($w, $h) = @$self{qw(w h)};
915 932
916 my $tex = $self->{texture} 933 my $tex = $self->{texture}
917 or return; 934 or return;
918 935
919 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
921 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
922 939
923 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
924 941
925 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
926} 943}
927 944
928############################################################################# 945#############################################################################
929 946
930package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
948
949use List::Util qw(min max);
931 950
932our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
933 952
934sub new { 953sub new {
935 my $class = shift; 954 my $class = shift;
… …
967} 986}
968 987
969sub set_offset { 988sub set_offset {
970 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
971 990
972 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
973 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
974 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
975 $self->update; 995 $self->update;
976} 996}
977 997
978# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
979sub coord2local { 999sub coord2local {
… …
1016 1036
1017############################################################################# 1037#############################################################################
1018 1038
1019package CFPlus::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
1020 1040
1021our @ISA = CFPlus::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
1022 1042
1023sub new { 1043sub new {
1024 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
1025 1045
1026 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
1027 1047
1028 my $self; 1048 my $self;
1029 1049
1030 my $slider = new CFPlus::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
1031 vertical => 1, 1060 vertical => 1,
1032 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub { 1062 on_changed => sub {
1034 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035 }, 1065 },
1036 ; 1066 ;
1037 1067
1038 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
1039 vp => (new CFPlus::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1040 can_events => 1, 1071 can_events => 1,
1041 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1042 %arg, 1076 %arg,
1043 ); 1077 );
1044 1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1093 $self->SUPER::add (0, 0, $self->{vp});
1094
1046 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
1047 1096
1048 $self 1097 $self
1049} 1098}
1050 1099
… …
1054 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
1055 1104
1056 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
1057} 1106}
1058 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->SUPER::update;
1136 $self->update_slider;
1137}
1138
1059sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1061 1141
1062 return 0 unless $ev->{dy}; # only vertical movements 1142 return 0 unless $ev->{dy}; # only vertical movements for now
1063 1143
1064 $self->{slider}->emit (mouse_wheel => $ev); 1144 $self->{vslider}->emit (mouse_wheel => $ev);
1065 1145
1066 1 1146 1
1067} 1147}
1068 1148
1069sub update_slider { 1149sub invoke_button_down {
1070 my ($self) = @_; 1150 my ($self, $ev, $x, $y) = @_;
1071 1151
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1152 if ($ev->{button} == 2) {
1073} 1153 $self->grab_focus;
1074 1154
1075sub update { 1155 my $ox = $self->{vp}{view_x} + $ev->{x};
1076 my ($self) = @_; 1156 my $oy = $self->{vp}{view_y} + $ev->{y};
1157
1158 $self->{motion} = sub {
1159 my ($ev, $x, $y) = @_;
1077 1160
1078 $self->SUPER::update; 1161 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1162 $self->update;
1163 };
1079 1164
1080 $self->update_slider; 1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1081} 1190}
1082 1191
1083sub invoke_size_allocate { 1192sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1085 1194
1086 $self->update_slider; 1195 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1197}
1090 1198
1091############################################################################# 1199#############################################################################
1092 1200
… …
1129} 1237}
1130 1238
1131############################################################################# 1239#############################################################################
1132 1240
1133package CFPlus::UI::FancyFrame; 1241package CFPlus::UI::FancyFrame;
1242
1243our @ISA = CFPlus::UI::Bin::;
1244
1245use CFPlus::OpenGL;
1246
1247sub new {
1248 my ($class, %arg) = @_;
1249
1250 if ((exists $arg{label}) && !ref $arg{label}) {
1251 $arg{label} = new CFPlus::UI::Label
1252 align => 1,
1253 valign => 0,
1254 text => $arg{label},
1255 fontsize => ($arg{border} || 0.8) * 0.75;
1256 }
1257
1258 my $self = $class->SUPER::new (
1259 # label => "",
1260 fg => [0.6, 0.3, 0.1],
1261 border => 0.8,
1262 style => 'single',
1263 %arg,
1264 );
1265
1266 $self
1267}
1268
1269sub add {
1270 my ($self, @widgets) = @_;
1271
1272 $self->SUPER::add (@widgets);
1273 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1274}
1275
1276sub border {
1277 int $_[0]{border} * $::FONTSIZE
1278}
1279
1280sub size_request {
1281 my ($self) = @_;
1282
1283 ($self->{label_w}, undef) = $self->{label}->size_request
1284 if $self->{label};
1285
1286 my ($w, $h) = $self->SUPER::size_request;
1287
1288 (
1289 $w + $self->border * 2,
1290 $h + $self->border * 2,
1291 )
1292}
1293
1294sub invoke_size_allocate {
1295 my ($self, $w, $h) = @_;
1296
1297 my $border = $self->border;
1298
1299 $w -= List::Util::max 0, $border * 2;
1300 $h -= List::Util::max 0, $border * 2;
1301
1302 if (my $label = $self->{label}) {
1303 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1304 $label->{h} = List::Util::min $h, $border;
1305 $label->invoke_size_allocate ($label->{w}, $label->{h});
1306 }
1307
1308 $self->child->configure ($border, $border, $w, $h);
1309
1310 1
1311}
1312
1313sub _draw {
1314 my ($self) = @_;
1315
1316 my $child = $self->{children}[0];
1317
1318 my $border = $self->border;
1319 my ($w, $h) = ($self->{w}, $self->{h});
1320
1321 $child->draw;
1322
1323 glColor @{$self->{fg}};
1324 glBegin GL_LINE_STRIP;
1325 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1329 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1330 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1331 glEnd;
1332
1333 if ($self->{label}) {
1334 glTranslate $border * 2, 0;
1335 $self->{label}->_draw;
1336 }
1337}
1338
1339#############################################################################
1340
1341package CFPlus::UI::Toplevel;
1134 1342
1135our @ISA = CFPlus::UI::Bin::; 1343our @ISA = CFPlus::UI::Bin::;
1136 1344
1137use CFPlus::OpenGL; 1345use CFPlus::OpenGL;
1138 1346
… …
1363 1571
1364sub new { 1572sub new {
1365 my $class = shift; 1573 my $class = shift;
1366 1574
1367 $class->SUPER::new ( 1575 $class->SUPER::new (
1576 children => [],
1368 col_expand => [], 1577 col_expand => [],
1578 row_expand => [],
1369 @_, 1579 @_,
1370 ) 1580 )
1371} 1581}
1372 1582
1373sub children { 1583sub children {
1374 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1584 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375} 1585}
1376 1586
1587# TODO: store row/col info in child widget and use standard add/del
1377sub add { 1588sub add {
1378 my ($self) = shift; 1589 my ($self) = shift;
1379 1590
1380 while (@_) { 1591 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, (); 1592 my ($x, $y, $child) = splice @_, 0, 3, ();
1382 $child->set_parent ($self); 1593 $child->set_parent ($self);
1383 $self->{children}[$y][$x] = $child; 1594 $self->{children}[$y][$x] = $child;
1384 } 1595 }
1385 1596
1386 $self->{force_realloc} = 1; 1597 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1; 1598 $self->{force_size_alloc} = 1;
1388 $self->realloc; 1599 $self->realloc;
1389} 1600}
1390 1601
1391sub remove { 1602sub remove {
1392 my ($self, $child) = @_; 1603 my ($self, $child) = @_;
1393 1604
1394 # TODO: not yet implemented 1605 for (@{ $self->{children} }) {
1606 for (@{ $_ || [] }) {
1607 $_ = undef if $_ == $child;
1608 }
1609 }
1395} 1610}
1396 1611
1397# TODO: move to container class maybe? send children a signal on removal? 1612# TODO: move to container class maybe? send children a signal on removal?
1398sub clear { 1613sub clear {
1399 my ($self) = @_; 1614 my ($self) = @_;
… …
1448 my ($ws, $hs) = $self->get_wh; 1663 my ($ws, $hs) = $self->get_wh;
1449 1664
1450 my $req_w = (sum @$ws) || 1; 1665 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1666 my $req_h = (sum @$hs) || 1;
1452 1667
1453 # TODO: nicer code && do row_expand 1668 # TODO: nicer code
1454 my @col_expand = @{$self->{col_expand}}; 1669 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1670 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1671 my $col_expand = (sum @col_expand) || 1;
1457 1672
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1673 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1674
1462 CFPlus::UI::harmonize $ws; 1675 CFPlus::UI::harmonize $ws;
1676
1677 my @row_expand = @{$self->{row_expand}};
1678 @row_expand = (1) x @$ws unless @row_expand;
1679 my $row_expand = (sum @row_expand) || 1;
1680
1681 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1682
1463 CFPlus::UI::harmonize $hs; 1683 CFPlus::UI::harmonize $hs;
1464 1684
1465 my $y; 1685 my $y;
1466 1686
1467 for my $r (0 .. $#{$self->{children}}) { 1687 for my $r (0 .. $#{$self->{children}}) {
… …
1507 my ($self) = @_; 1727 my ($self) = @_;
1508 1728
1509 for (grep $_, @{$self->{children}}) { 1729 for (grep $_, @{$self->{children}}) {
1510 $_->draw for grep $_, @$_; 1730 $_->draw for grep $_, @$_;
1511 } 1731 }
1732}
1733
1734#############################################################################
1735
1736package CFPlus::UI::Fixed;
1737
1738use List::Util qw(min max);
1739
1740our @ISA = CFPlus::UI::Container::;
1741
1742sub add {
1743 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1744
1745 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1746 $self->SUPER::add ($child);
1747}
1748
1749sub _scale($$$) {
1750 my ($mode, $val, $max) = @_;
1751
1752 $mode eq "abs" ? $val
1753 : $mode eq "rel" ? $val * $max
1754 : 0
1755}
1756
1757sub size_request {
1758 my ($self) = @_;
1759
1760 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1761
1762 # determine overall size by querying abs widgets
1763 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1765
1766 if ($pos eq "abs") {
1767 $w = _scale $size, $w, $child->{req_w};
1768 $h = _scale $size, $h, $child->{req_h};
1769
1770 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1771 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1772 }
1773 }
1774
1775 my $W = $x2 - $x1;
1776 my $H = $y2 - $y1;
1777
1778 # now layout remaining widgets
1779 for my $child ($self->visible_children) {
1780 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1781
1782 if ($pos ne "abs") {
1783 $x = _scale $pos, $x, $W;
1784 $y = _scale $pos, $x, $H;
1785 $w = _scale $size, $w, $child->{req_w};
1786 $h = _scale $size, $h, $child->{req_h};
1787
1788 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1789 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1790 }
1791 }
1792
1793 my $W = $x2 - $x1;
1794 my $H = $y2 - $y1;
1795
1796 ($W, $H)
1797}
1798
1799sub invoke_size_allocate {
1800 my ($self, $W, $H) = @_;
1801
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $child->configure ($x, $y, $w, $h);
1811 }
1812
1813 1
1512} 1814}
1513 1815
1514############################################################################# 1816#############################################################################
1515 1817
1516package CFPlus::UI::Box; 1818package CFPlus::UI::Box;
… …
1618 #active_bg => none 1920 #active_bg => none
1619 #font => default_font 1921 #font => default_font
1620 #text => initial text 1922 #text => initial text
1621 #markup => initial narkup 1923 #markup => initial narkup
1622 #max_w => maximum pixel width 1924 #max_w => maximum pixel width
1925 #style => 0, # render flags
1623 ellipsise => 3, # end 1926 ellipsise => 3, # end
1624 layout => (new CFPlus::Layout), 1927 layout => (new CFPlus::Layout),
1625 fontsize => 1, 1928 fontsize => 1,
1626 align => -1, 1929 align => -1,
1627 valign => -1, 1930 valign => -1,
… …
1778 }; 2081 };
1779 2082
1780 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2083 my $w = List::Util::min $self->{w} + 4, $size->[0];
1781 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2084 my $h = List::Util::min $self->{h} + 2, $size->[1];
1782 2085
1783 $self->{layout}->render ($self->{ox}, $self->{oy}); 2086 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1784} 2087}
1785 2088
1786############################################################################# 2089#############################################################################
1787 2090
1788package CFPlus::UI::EntryBase; 2091package CFPlus::UI::EntryBase;
… …
1801 active_fg => [0, 0, 0], 2104 active_fg => [0, 0, 0],
1802 can_hover => 1, 2105 can_hover => 1,
1803 can_focus => 1, 2106 can_focus => 1,
1804 valign => 0, 2107 valign => 0,
1805 can_events => 1, 2108 can_events => 1,
2109 ellipsise => 0,
1806 #text => ... 2110 #text => ...
1807 #hidden => "*", 2111 #hidden => "*",
1808 @_ 2112 @_
1809 ) 2113 )
1810} 2114}
… …
1854 my $mod = $ev->{mod}; 2158 my $mod = $ev->{mod};
1855 my $sym = $ev->{sym}; 2159 my $sym = $ev->{sym};
1856 my $uni = $ev->{unicode}; 2160 my $uni = $ev->{unicode};
1857 2161
1858 my $text = $self->get_text; 2162 my $text = $self->get_text;
2163
2164 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1859 2165
1860 if ($uni == 8) { 2166 if ($uni == 8) {
1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2167 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1862 } elsif ($uni == 127) { 2168 } elsif ($uni == 127) {
1863 substr $text, $self->{cursor}, 1, ""; 2169 substr $text, $self->{cursor}, 1, "";
1864 } elsif ($sym == CFPlus::SDLK_LEFT) { 2170 } elsif ($sym == CFPlus::SDLK_LEFT) {
1865 --$self->{cursor} if $self->{cursor}; 2171 --$self->{cursor} if $self->{cursor};
1866 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2172 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1867 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2173 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1868 } elsif ($sym == CFPlus::SDLK_HOME) { 2174 } elsif ($sym == CFPlus::SDLK_HOME) {
2175 # what a hack
2176 $self->{cursor} =
2177 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2178 ? length $1
2179 : 0;
2180 } elsif ($sym == CFPlus::SDLK_END) {
2181 # uh, again
2182 $self->{cursor} =
2183 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2184 ? $self->{cursor} + length $1
2185 : length $self->{text};
2186 } elsif ($uni == 21) { # ctrl-u
2187 $text = "";
1869 $self->{cursor} = 0; 2188 $self->{cursor} = 0;
1870 } elsif ($sym == CFPlus::SDLK_END) {
1871 $self->{cursor} = length $text;
1872 } elsif ($uni == 27) { 2189 } elsif ($uni == 27) {
1873 $self->emit ('escape'); 2190 $self->emit ('escape');
1874 } elsif ($uni) { 2191 } elsif ($uni == 0x0d) {
2192 substr $text, $self->{cursor}++, 0, "\012";
2193 } elsif ($uni >= 0x20) {
1875 substr $text, $self->{cursor}++, 0, chr $uni; 2194 substr $text, $self->{cursor}++, 0, chr $uni;
1876 } else { 2195 } else {
1877 return 0; 2196 return 0;
1878 } 2197 }
1879 2198
1880 $self->_set_text ($text); 2199 $self->_set_text ($text);
1881 2200
1882 $self->realloc; 2201 $self->realloc;
2202 $self->update;
1883 2203
1884 1 2204 1
1885} 2205}
1886 2206
1887sub invoke_focus_in { 2207sub invoke_focus_in {
… …
1949 utf8::encode $text; 2269 utf8::encode $text;
1950 2270
1951 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2271 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1952 } 2272 }
1953 2273
1954 glColor @{$self->{fg}};
1955 glBegin GL_LINES; 2274 glBegin GL_LINES;
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958 glEnd; 2277 glEnd;
1959 } 2278 }
1960} 2279}
2280
2281#############################################################################
1961 2282
1962package CFPlus::UI::Entry; 2283package CFPlus::UI::Entry;
1963 2284
1964our @ISA = CFPlus::UI::EntryBase::; 2285our @ISA = CFPlus::UI::EntryBase::;
1965 2286
… …
1968sub invoke_key_down { 2289sub invoke_key_down {
1969 my ($self, $ev) = @_; 2290 my ($self, $ev) = @_;
1970 2291
1971 my $sym = $ev->{sym}; 2292 my $sym = $ev->{sym};
1972 2293
1973 if ($sym == 13) { 2294 if ($ev->{uni} == 0x0d || $sym == 13) {
1974 unshift @{$self->{history}}, 2295 unshift @{$self->{history}},
1975 my $txt = $self->get_text; 2296 my $txt = $self->get_text;
1976 2297
1977 $self->{history_pointer} = -1; 2298 $self->{history_pointer} = -1;
1978 $self->{history_saveback} = ''; 2299 $self->{history_saveback} = '';
… …
2008 1 2329 1
2009} 2330}
2010 2331
2011############################################################################# 2332#############################################################################
2012 2333
2334package CFPlus::UI::TextEdit;
2335
2336our @ISA = CFPlus::UI::EntryBase::;
2337
2338use CFPlus::OpenGL;
2339
2340sub move_cursor_ver {
2341 my ($self, $dy) = @_;
2342
2343 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2344
2345 $y += $dy;
2346
2347 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2348 $self->{cursor} = $index;
2349 delete $self->{cur_h};
2350 $self->update;
2351 return;
2352 }
2353}
2354
2355sub invoke_key_down {
2356 my ($self, $ev) = @_;
2357
2358 my $sym = $ev->{sym};
2359
2360 if ($sym == CFPlus::SDLK_UP) {
2361 $self->move_cursor_ver (-1);
2362 } elsif ($sym == CFPlus::SDLK_DOWN) {
2363 $self->move_cursor_ver (+1);
2364 } else {
2365 return $self->SUPER::invoke_key_down ($ev)
2366 }
2367
2368 1
2369}
2370
2371#############################################################################
2372
2013package CFPlus::UI::Button; 2373package CFPlus::UI::Button;
2014 2374
2015our @ISA = CFPlus::UI::Label::; 2375our @ISA = CFPlus::UI::Label::;
2016 2376
2017use CFPlus::OpenGL; 2377use CFPlus::OpenGL;
… …
2159 or Carp::croak "'path' or 'tex' attributes required"; 2519 or Carp::croak "'path' or 'tex' attributes required";
2160 2520
2161 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2521 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2522 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163 2523
2164 Scalar::Util::weaken $texture_cache{$self->{path}}; 2524 CFPlus::weaken $texture_cache{$self->{path}};
2165 2525
2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2526 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167 2527
2168 $self 2528 $self
2169} 2529}
… …
2542sub invoke_mouse_wheel { 2902sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_; 2903 my ($self, $ev) = @_;
2544 2904
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2905 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546 2906
2907 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2908
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2909 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2548 2910
2549 ! ! $delta 2911 ! ! $delta
2550} 2912}
2551 2913
2552sub update { 2914sub update {
… …
2662 #font => default_font 3024 #font => default_font
2663 @_, 3025 @_,
2664 3026
2665 layout => (new CFPlus::Layout), 3027 layout => (new CFPlus::Layout),
2666 par => [], 3028 par => [],
3029 max_par => 0,
2667 height => 0, 3030 height => 0,
2668 children => [ 3031 children => [
2669 (new CFPlus::UI::Empty expand => 1), 3032 (new CFPlus::UI::Empty expand => 1),
2670 (new CFPlus::UI::Slider vertical => 1), 3033 (new CFPlus::UI::Slider vertical => 1),
2671 ], 3034 ],
… …
2750sub set_offset { 3113sub set_offset {
2751 my ($self, $offset) = @_; 3114 my ($self, $offset) = @_;
2752 3115
2753 # todo: base offset on lines or so, not on pixels 3116 # todo: base offset on lines or so, not on pixels
2754 $self->{children}[1]->set_value ($offset); 3117 $self->{children}[1]->set_value ($offset);
3118}
3119
3120sub current_paragraph {
3121 my ($self) = @_;
3122
3123 $self->{top_paragraph} - 1
3124}
3125
3126sub scroll_to {
3127 my ($self, $para) = @_;
3128
3129 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3130
3131 $self->{scroll_to} = $para;
3132 $self->update;
2755} 3133}
2756 3134
2757sub clear { 3135sub clear {
2758 my ($self) = @_; 3136 my ($self) = @_;
2759 3137
… …
2781 3159
2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3160 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para; 3161 push @{$self->{par}}, $para;
2784 } 3162 }
2785 3163
3164 if (my $max = $self->{max_par}) {
3165 shift @{$self->{par}} while @{$self->{par}} > $max;
3166 }
3167
2786 $self->{need_reflow}++; 3168 $self->{need_reflow}++;
2787 $self->update; 3169 $self->update;
2788} 3170}
2789 3171
2790sub scroll_to_bottom { 3172sub scroll_to_bottom {
2791 my ($self) = @_; 3173 my ($self) = @_;
2792 3174
2793 $self->{scroll_to_bottom} = 1; 3175 $self->{scroll_to} = $#{$self->{par}};
2794 $self->update; 3176 $self->update;
2795} 3177}
2796 3178
3179sub force_uptodate {
3180 my ($self) = @_;
3181
3182 if (delete $self->{need_reflow}) {
3183 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3184
3185 my $height = 0;
3186
3187 for my $para (@{$self->{par}}) {
3188 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3189 my $layout = $self->get_layout ($para);
3190 my ($w, $h) = $layout->size;
3191
3192 $para->{w} = $w + $para->{indent};
3193 $para->{h} = $h;
3194 $para->{wrapped} = $layout->has_wrapped;
3195 }
3196
3197 $para->{y} = $height;
3198 $height += $para->{h};
3199 }
3200
3201 $self->{height} = $height;
3202 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3203
3204 delete $self->{texture};
3205 }
3206
3207 if (my $paridx = delete $self->{scroll_to}) {
3208 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3209 }
3210}
3211
2797sub update { 3212sub update {
2798 my ($self) = @_; 3213 my ($self) = @_;
2799 3214
2800 $self->SUPER::update; 3215 $self->SUPER::update;
2801 3216
2802 return unless $self->{h} > 0; 3217 return unless $self->{h} > 0;
2803 3218
2804 delete $self->{texture}; 3219 delete $self->{texture};
2805 3220
2806 $ROOT->on_post_alloc ($self => sub { 3221 $ROOT->on_post_alloc ($self => sub {
3222 $self->force_uptodate;
3223
2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3224 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2808
2809 if (delete $self->{need_reflow}) {
2810 my $height = 0;
2811
2812 for my $para (@{$self->{par}}) {
2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2814 my $layout = $self->get_layout ($para);
2815 my ($w, $h) = $layout->size;
2816
2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2820 }
2821
2822 $height += $para->{h};
2823 }
2824
2825 $self->{height} = $height;
2826
2827 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2828
2829 delete $self->{texture};
2830 }
2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835 3225
2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3226 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837 glClearColor 0, 0, 0, 0; 3227 glClearColor 0, 0, 0, 0;
2838 glClear GL_COLOR_BUFFER_BIT; 3228 glClear GL_COLOR_BUFFER_BIT;
2839 3229
3230 package CFPlus::UI::Base;
3231 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3232 (0, 0, $self->{w}, $self->{h});
3233
3234 my $top = int $self->{children}[1]{range}[0];
3235
3236 my $paridx = 0;
3237 my $top_paragraph;
2840 my $top = int $self->{children}[1]{range}[0]; 3238 my $top = int $self->{children}[1]{range}[0];
2841 3239
2842 my $y0 = $top; 3240 my $y0 = $top;
2843 my $y1 = $top + $H; 3241 my $y1 = $top + $H;
2844 3242
2845 my $y = 0;
2846
2847 for my $para (@{$self->{par}}) { 3243 for my $para (@{$self->{par}}) {
2848 my $h = $para->{h}; 3244 my $h = $para->{h};
3245 my $y = $para->{y};
2849 3246
2850 if ($y0 < $y + $h && $y < $y1) { 3247 if ($y0 < $y + $h && $y < $y1) {
2851
2852 my $layout = $self->get_layout ($para); 3248 my $layout = $self->get_layout ($para);
2853 3249
2854 $layout->render ($para->{indent}, $y - $y0); 3250 $layout->render ($para->{indent}, $y - $y0);
2855 3251
2856 if (my @w = @{ $para->{widget} }) { 3252 if (my @w = @{ $para->{widget} }) {
… …
2865 $_->draw; 3261 $_->draw;
2866 } 3262 }
2867 } 3263 }
2868 } 3264 }
2869 3265
2870 $y += $h; 3266 $paridx++;
3267 $top_paragraph ||= $paridx if $y >= $top;
2871 } 3268 }
3269
3270 $self->{top_paragraph} = $top_paragraph;
2872 }; 3271 };
2873 }); 3272 });
2874} 3273}
2875 3274
2876sub reconfigure { 3275sub reconfigure {
… …
2997 3396
2998 $self->add (new CFPlus::UI::Label 3397 $self->add (new CFPlus::UI::Label
2999 markup => $tooltip, 3398 markup => $tooltip,
3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3399 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001 fontsize => 0.8, 3400 fontsize => 0.8,
3002 fg => [0, 0, 0, 1], 3401 style => 1, # FLAG_INVERSE
3003 ellipsise => 0, 3402 ellipsise => 0,
3004 font => ($widget->{tooltip_font} || $::FONT_PROP), 3403 font => ($widget->{tooltip_font} || $::FONT_PROP),
3005 ); 3404 );
3006} 3405}
3007 3406
… …
3079 3478
3080sub new { 3479sub new {
3081 my $class = shift; 3480 my $class = shift;
3082 3481
3083 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3483 size_w => 32,
3484 size_h => 8,
3084 aspect => 1, 3485 aspect => 1,
3085 can_events => 0, 3486 can_events => 0,
3086 @_, 3487 @_,
3087 ); 3488 );
3088 3489
3089 if ($self->{anim} && $self->{animspeed}) { 3490 if ($self->{anim} && $self->{animspeed}) {
3090 Scalar::Util::weaken (my $widget = $self); 3491 CFPlus::weaken (my $widget = $self);
3091 3492
3092 $self->{timer} = Event->timer ( 3493 $self->{timer} = Event->timer (
3093 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3494 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3094 hard => 1, 3495 hard => 1,
3095 interval => $self->{animspeed}, 3496 interval => $self->{animspeed},
3096 cb => sub { 3497 cb => sub {
3498 return unless $::CONN;
3499
3097 ++$widget->{frame}; 3500 ++$widget->{frame};
3501 $self->update_face;
3098 $widget->update; 3502 $self->update;
3099 }, 3503 },
3100 ); 3504 );
3505
3506 $self->update_face;
3101 } 3507 }
3102 3508
3103 $self 3509 $self
3104} 3510}
3105 3511
3512sub update_face {
3513 my ($self) = @_;
3514
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
3106sub size_request { 3525sub size_request {
3107 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc;
3535 });
3536 }
3537 }
3538 }
3539
3540 ($self->{size_w} || 8, $self->{size_h} || 8)
3108} 3541}
3109 3542
3110sub update { 3543sub update {
3111 my ($self) = @_; 3544 my ($self) = @_;
3112 3545
… …
3120 3553
3121 return unless $::CONN; 3554 return unless $::CONN;
3122 3555
3123 $self->SUPER::_draw; 3556 $self->SUPER::_draw;
3124 3557
3125 my $face;
3126
3127 if ($self->{frame}) {
3128 my $anim = $::CONN->{anim}[$self->{anim}]; 3558 my $faceid = $::CONN->{faceid}[$self->{face}]
3129 3559 or return;
3130 $face = $anim->[ $self->{frame} % @$anim ]
3131 if $anim && @$anim;
3132 }
3133 3560
3134 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3561 my $tex = $::CONN->{texture}[$faceid];
3135 3562
3136 if ($tex) { 3563 if ($tex) {
3137 glEnable GL_TEXTURE_2D; 3564 glEnable GL_TEXTURE_2D;
3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3565 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3139 glColor 0, 0, 0, 1; 3566 glColor 0, 0, 0, 1;
… …
3155 3582
3156package CFPlus::UI::Buttonbar; 3583package CFPlus::UI::Buttonbar;
3157 3584
3158our @ISA = CFPlus::UI::HBox::; 3585our @ISA = CFPlus::UI::HBox::;
3159 3586
3160# TODO: should actualyl wrap buttons and other goodies. 3587# TODO: should actually wrap buttons and other goodies.
3161 3588
3162############################################################################# 3589#############################################################################
3163 3590
3164package CFPlus::UI::Menu; 3591package CFPlus::UI::Menu;
3165 3592
3166our @ISA = CFPlus::UI::FancyFrame::; 3593our @ISA = CFPlus::UI::Toplevel::;
3167 3594
3168use CFPlus::OpenGL; 3595use CFPlus::OpenGL;
3169 3596
3170sub new { 3597sub new {
3171 my $class = shift; 3598 my $class = shift;
… …
3349} 3776}
3350 3777
3351sub add { 3778sub add {
3352 my ($self, $title, $widget, $tooltip) = @_; 3779 my ($self, $title, $widget, $tooltip) = @_;
3353 3780
3354 Scalar::Util::weaken $self; 3781 CFPlus::weaken $self;
3355 3782
3356 $self->{buttonbar}->add (new CFPlus::UI::Button 3783 $self->{buttonbar}->add (new CFPlus::UI::Button
3357 markup => $title, 3784 markup => $title,
3358 tooltip => $tooltip, 3785 tooltip => $tooltip,
3359 on_activate => sub { $self->set_current_page ($widget) }, 3786 on_activate => sub { $self->set_current_page ($widget) },
… …
3443 my $self = $class->SUPER::new ( 3870 my $self = $class->SUPER::new (
3444 fontsize => 0.8, 3871 fontsize => 0.8,
3445 @_, 3872 @_,
3446 ); 3873 );
3447 3874
3448 Scalar::Util::weaken (my $this = $self); 3875 CFPlus::weaken (my $this = $self);
3449 3876
3450 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3877 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451 3878
3452 $self 3879 $self
3453} 3880}
… …
3576 $self->SUPER::destroy; 4003 $self->SUPER::destroy;
3577} 4004}
3578 4005
3579############################################################################# 4006#############################################################################
3580 4007
3581package CFPlus::UI::Inventory;
3582
3583our @ISA = CFPlus::UI::Table::;
3584
3585sub new {
3586 my $class = shift;
3587
3588 my $self = $class->SUPER::new (
3589 col_expand => [0, 1, 0],
3590 items => [],
3591 @_,
3592 );
3593
3594 $self->set_sort_order (undef);
3595
3596 $self
3597}
3598
3599sub update_items {
3600 my ($self) = @_;
3601
3602 $self->clear;
3603
3604 my @item = $self->{sort}->(@{ $self->{items} });
3605
3606 my @adds;
3607 my $row = 0;
3608 for my $item ($self->{sort}->(@{ $self->{items} })) {
3609 CFPlus::Item::update_widgets $item;
3610
3611 push @adds, 0, $row, $item->{face_widget};
3612 push @adds, 1, $row, $item->{desc_widget};
3613 push @adds, 2, $row, $item->{weight_widget};
3614
3615 $row++;
3616 }
3617
3618 $self->add (@adds);
3619}
3620
3621sub set_sort_order {
3622 my ($self, $order) = @_;
3623
3624 $self->{sort} = $order ||= sub {
3625 sort {
3626 $a->{type} <=> $b->{type}
3627 or $a->{name} cmp $b->{name}
3628 } @_
3629 };
3630
3631 $self->update_items;
3632}
3633
3634sub set_items {
3635 my ($self, $items) = @_;
3636
3637 $self->{items} = [$items ? values %$items : ()];
3638 $self->update_items;
3639}
3640
3641#############################################################################
3642
3643package CFPlus::UI::SpellList;
3644
3645our @ISA = CFPlus::UI::Table::;
3646
3647sub new {
3648 my $class = shift;
3649
3650 my $self = $class->SUPER::new (
3651 binding => [],
3652 commands => [],
3653 @_,
3654 )
3655}
3656
3657my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3658
3659my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3665my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3667my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3668 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3669
3670sub rebuild_spell_list {
3671 my ($self) = @_;
3672
3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3674 $self->clear;
3675
3676 return unless $::CONN;
3677
3678 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3679 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3680 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3681 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3682 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3683
3684 my $row = 0;
3685
3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3687 my $spell = $self->{spell}{$_};
3688
3689 $row++;
3690
3691 my $spell_cb = sub {
3692 my ($widget, $ev) = @_;
3693
3694 if ($ev->{button} == 1) {
3695 $::CONN->user_send ("cast $spell->{name}");
3696 } elsif ($ev->{button} == 2) {
3697 $::CONN->user_send ("invoke $spell->{name}");
3698 } elsif ($ev->{button} == 3) {
3699 (new CFPlus::UI::Menu
3700 items => [
3701 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3702 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3703 ],
3704 )->popup ($ev);
3705 } else {
3706 return 0;
3707 }
3708
3709 1
3710 };
3711
3712 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3713
3714 #TODO: add path info to tooltip
3715 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3716
3717 $self->add (0, $row, new CFPlus::UI::Face
3718 face => $spell->{face},
3719 can_hover => 1,
3720 can_events => 1,
3721 tooltip => $tooltip,
3722 on_button_down => $spell_cb,
3723 );
3724
3725 $self->add (1, $row, new CFPlus::UI::Label
3726 expand => 1,
3727 text => $spell->{name},
3728 can_hover => 1,
3729 can_events => 1,
3730 tooltip => $tooltip,
3731 on_button_down => $spell_cb,
3732 );
3733
3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3735 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3736 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3737 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3738 }
3739 });
3740}
3741
3742sub add_spell {
3743 my ($self, $spell) = @_;
3744
3745 $self->{spell}->{$spell->{name}} = $spell;
3746 $self->rebuild_spell_list;
3747}
3748
3749sub remove_spell {
3750 my ($self, $spell) = @_;
3751
3752 delete $self->{spell}->{$spell->{name}};
3753 $self->rebuild_spell_list;
3754}
3755
3756sub clear_spells {
3757 my ($self) = @_;
3758
3759 $self->{spell} = {};
3760 $self->rebuild_spell_list;
3761}
3762
3763#############################################################################
3764
3765package CFPlus::UI::Root; 4008package CFPlus::UI::Root;
3766 4009
3767our @ISA = CFPlus::UI::Container::; 4010our @ISA = CFPlus::UI::Container::;
3768 4011
3769use List::Util qw(min max); 4012use List::Util qw(min max);
… …
3776 my $self = $class->SUPER::new ( 4019 my $self = $class->SUPER::new (
3777 visible => 1, 4020 visible => 1,
3778 @_, 4021 @_,
3779 ); 4022 );
3780 4023
3781 Scalar::Util::weaken ($self->{root} = $self); 4024 CFPlus::weaken ($self->{root} = $self);
3782 4025
3783 $self 4026 $self
3784} 4027}
3785 4028
3786sub size_request { 4029sub size_request {
… …
3995 glLoadIdentity; 4238 glLoadIdentity;
3996 4239
3997 { 4240 {
3998 package CFPlus::UI::Base; 4241 package CFPlus::UI::Base;
3999 4242
4000 ($draw_x, $draw_y, $draw_w, $draw_h) = 4243 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001 (0, 0, $self->{w}, $self->{h}); 4244 (0, 0, $self->{w}, $self->{h});
4002 }
4003 4245
4004 $self->_draw; 4246 $self->_draw;
4247 }
4005} 4248}
4006 4249
4007############################################################################# 4250#############################################################################
4008 4251
4009package CFPlus::UI; 4252package CFPlus::UI;

Diff Legend

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