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.374 by root, Mon Jul 16 12:36:48 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#############################################################################
… …
1016 1033
1017############################################################################# 1034#############################################################################
1018 1035
1019package CFPlus::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1020 1037
1021our @ISA = CFPlus::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1022 1039
1023sub new { 1040sub new {
1024 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1025 1042
1026 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1027 1044
1028 my $self; 1045 my $self;
1029 1046
1030 my $slider = new CFPlus::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
1031 vertical => 1, 1057 vertical => 1,
1032 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1033 on_changed => sub { 1059 on_changed => sub {
1034 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1035 }, 1062 },
1036 ; 1063 ;
1037 1064
1038 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1039 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1040 can_events => 1, 1068 can_events => 1,
1041 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1042 %arg, 1073 %arg,
1043 ); 1074 );
1044 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
1046 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1047 1085
1048 $self 1086 $self
1049} 1087}
1050 1088
… …
1057} 1095}
1058 1096
1059sub invoke_mouse_wheel { 1097sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1098 my ($self, $ev) = @_;
1061 1099
1062 return 0 unless $ev->{dy}; # only vertical movements 1100 return 0 unless $ev->{dy}; # only vertical movements for now
1063 1101
1064 $self->{slider}->emit (mouse_wheel => $ev); 1102 $self->{vslider}->emit (mouse_wheel => $ev);
1065 1103
1066 1 1104 1
1067} 1105}
1068 1106
1069sub update_slider { 1107sub update_slider {
1070 my ($self) = @_; 1108 my ($self) = @_;
1071 1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1072 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1073} 1129}
1074 1130
1075sub update { 1131sub update {
1076 my ($self) = @_; 1132 my ($self) = @_;
1077 1133
1078 $self->SUPER::update; 1134 $self->SUPER::update;
1079
1080 $self->update_slider; 1135 $self->update_slider;
1081} 1136}
1082 1137
1083sub invoke_size_allocate { 1138sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1085 1140
1086 $self->update_slider; 1141 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1142 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1143}
1090 1144
1091############################################################################# 1145#############################################################################
1092 1146
… …
1129} 1183}
1130 1184
1131############################################################################# 1185#############################################################################
1132 1186
1133package CFPlus::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1188
1189our @ISA = CFPlus::UI::Bin::;
1190
1191use CFPlus::OpenGL;
1192
1193sub new {
1194 my ($class, %arg) = @_;
1195
1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1134 1288
1135our @ISA = CFPlus::UI::Bin::; 1289our @ISA = CFPlus::UI::Bin::;
1136 1290
1137use CFPlus::OpenGL; 1291use CFPlus::OpenGL;
1138 1292
… …
1363 1517
1364sub new { 1518sub new {
1365 my $class = shift; 1519 my $class = shift;
1366 1520
1367 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1368 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1369 @_, 1525 @_,
1370 ) 1526 )
1371} 1527}
1372 1528
1373sub children { 1529sub children {
1374 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1375} 1531}
1376 1532
1533# TODO: store row/col info in child widget and use standard add/del
1377sub add { 1534sub add {
1378 my ($self) = shift; 1535 my ($self) = shift;
1379 1536
1380 while (@_) { 1537 while (@_) {
1381 my ($x, $y, $child) = splice @_, 0, 3, (); 1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1382 $child->set_parent ($self); 1539 $child->set_parent ($self);
1383 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1384 } 1541 }
1385 1542
1386 $self->{force_realloc} = 1; 1543 $self->{force_realloc} = 1;
1387 $self->{force_size_alloc} = 1; 1544 $self->{force_size_alloc} = 1;
1388 $self->realloc; 1545 $self->realloc;
1389} 1546}
1390 1547
1391sub remove { 1548sub remove {
1392 my ($self, $child) = @_; 1549 my ($self, $child) = @_;
1393 1550
1394 # TODO: not yet implemented 1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1395} 1556}
1396 1557
1397# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1398sub clear { 1559sub clear {
1399 my ($self) = @_; 1560 my ($self) = @_;
… …
1448 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1449 1610
1450 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1452 1613
1453 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1454 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1457 1618
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1620
1462 CFPlus::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1463 CFPlus::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1464 1630
1465 my $y; 1631 my $y;
1466 1632
1467 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
… …
1507 my ($self) = @_; 1673 my ($self) = @_;
1508 1674
1509 for (grep $_, @{$self->{children}}) { 1675 for (grep $_, @{$self->{children}}) {
1510 $_->draw for grep $_, @$_; 1676 $_->draw for grep $_, @$_;
1511 } 1677 }
1678}
1679
1680#############################################################################
1681
1682package CFPlus::UI::Fixed;
1683
1684use List::Util qw(min max);
1685
1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1512} 1760}
1513 1761
1514############################################################################# 1762#############################################################################
1515 1763
1516package CFPlus::UI::Box; 1764package CFPlus::UI::Box;
… …
1618 #active_bg => none 1866 #active_bg => none
1619 #font => default_font 1867 #font => default_font
1620 #text => initial text 1868 #text => initial text
1621 #markup => initial narkup 1869 #markup => initial narkup
1622 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1623 ellipsise => 3, # end 1872 ellipsise => 3, # end
1624 layout => (new CFPlus::Layout), 1873 layout => (new CFPlus::Layout),
1625 fontsize => 1, 1874 fontsize => 1,
1626 align => -1, 1875 align => -1,
1627 valign => -1, 1876 valign => -1,
… …
1778 }; 2027 };
1779 2028
1780 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1781 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1782 2031
1783 $self->{layout}->render ($self->{ox}, $self->{oy}); 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1784} 2033}
1785 2034
1786############################################################################# 2035#############################################################################
1787 2036
1788package CFPlus::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
… …
1801 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1802 can_hover => 1, 2051 can_hover => 1,
1803 can_focus => 1, 2052 can_focus => 1,
1804 valign => 0, 2053 valign => 0,
1805 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1806 #text => ... 2056 #text => ...
1807 #hidden => "*", 2057 #hidden => "*",
1808 @_ 2058 @_
1809 ) 2059 )
1810} 2060}
… …
1854 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1855 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1856 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1857 2107
1858 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1859 2111
1860 if ($uni == 8) { 2112 if ($uni == 8) {
1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1862 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1863 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1864 } elsif ($sym == CFPlus::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1865 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1866 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1867 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1868 } elsif ($sym == CFPlus::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1869 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1870 } elsif ($sym == CFPlus::SDLK_END) {
1871 $self->{cursor} = length $text;
1872 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1873 $self->emit ('escape'); 2136 $self->emit ('escape');
1874 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1875 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1876 } else { 2141 } else {
1877 return 0; 2142 return 0;
1878 } 2143 }
1879 2144
1880 $self->_set_text ($text); 2145 $self->_set_text ($text);
1881 2146
1882 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1883 2149
1884 1 2150 1
1885} 2151}
1886 2152
1887sub invoke_focus_in { 2153sub invoke_focus_in {
… …
1949 utf8::encode $text; 2215 utf8::encode $text;
1950 2216
1951 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1952 } 2218 }
1953 2219
1954 glColor @{$self->{fg}};
1955 glBegin GL_LINES; 2220 glBegin GL_LINES;
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 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}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1958 glEnd; 2223 glEnd;
1959 } 2224 }
1960} 2225}
2226
2227#############################################################################
1961 2228
1962package CFPlus::UI::Entry; 2229package CFPlus::UI::Entry;
1963 2230
1964our @ISA = CFPlus::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1965 2232
… …
1968sub invoke_key_down { 2235sub invoke_key_down {
1969 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1970 2237
1971 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1972 2239
1973 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1974 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1975 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
1976 2243
1977 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1978 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
… …
2008 1 2275 1
2009} 2276}
2010 2277
2011############################################################################# 2278#############################################################################
2012 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
2013package CFPlus::UI::Button; 2319package CFPlus::UI::Button;
2014 2320
2015our @ISA = CFPlus::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
2016 2322
2017use CFPlus::OpenGL; 2323use CFPlus::OpenGL;
… …
2159 or Carp::croak "'path' or 'tex' attributes required"; 2465 or Carp::croak "'path' or 'tex' attributes required";
2160 2466
2161 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2162 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2163 2469
2164 Scalar::Util::weaken $texture_cache{$self->{path}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
2165 2471
2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2167 2473
2168 $self 2474 $self
2169} 2475}
… …
2542sub invoke_mouse_wheel { 2848sub invoke_mouse_wheel {
2543 my ($self, $ev) = @_; 2849 my ($self, $ev) = @_;
2544 2850
2545 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2546 2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2547 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2548 2856
2549 ! ! $delta 2857 ! ! $delta
2550} 2858}
2551 2859
2552sub update { 2860sub update {
… …
2662 #font => default_font 2970 #font => default_font
2663 @_, 2971 @_,
2664 2972
2665 layout => (new CFPlus::Layout), 2973 layout => (new CFPlus::Layout),
2666 par => [], 2974 par => [],
2975 max_par => 0,
2667 height => 0, 2976 height => 0,
2668 children => [ 2977 children => [
2669 (new CFPlus::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2670 (new CFPlus::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2671 ], 2980 ],
… …
2750sub set_offset { 3059sub set_offset {
2751 my ($self, $offset) = @_; 3060 my ($self, $offset) = @_;
2752 3061
2753 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2754 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
3064}
3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
2755} 3079}
2756 3080
2757sub clear { 3081sub clear {
2758 my ($self) = @_; 3082 my ($self) = @_;
2759 3083
… …
2781 3105
2782 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2783 push @{$self->{par}}, $para; 3107 push @{$self->{par}}, $para;
2784 } 3108 }
2785 3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
2786 $self->{need_reflow}++; 3114 $self->{need_reflow}++;
2787 $self->update; 3115 $self->update;
2788} 3116}
2789 3117
2790sub scroll_to_bottom { 3118sub scroll_to_bottom {
2791 my ($self) = @_; 3119 my ($self) = @_;
2792 3120
2793 $self->{scroll_to_bottom} = 1; 3121 $self->{scroll_to} = $#{$self->{par}};
2794 $self->update; 3122 $self->update;
2795} 3123}
2796 3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
3147 $self->{height} = $height;
3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3149
3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
3156}
3157
2797sub update { 3158sub update {
2798 my ($self) = @_; 3159 my ($self) = @_;
2799 3160
2800 $self->SUPER::update; 3161 $self->SUPER::update;
2801 3162
2802 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2803 3164
2804 delete $self->{texture}; 3165 delete $self->{texture};
2805 3166
2806 $ROOT->on_post_alloc ($self => sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 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 3171
2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2837 glClearColor 0, 0, 0, 0; 3173 glClearColor 0, 0, 0, 0;
2838 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2839 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2840 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2841 3185
2842 my $y0 = $top; 3186 my $y0 = $top;
2843 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2844 3188
2845 my $y = 0;
2846
2847 for my $para (@{$self->{par}}) { 3189 for my $para (@{$self->{par}}) {
2848 my $h = $para->{h}; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2849 3192
2850 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2851
2852 my $layout = $self->get_layout ($para); 3194 my $layout = $self->get_layout ($para);
2853 3195
2854 $layout->render ($para->{indent}, $y - $y0); 3196 $layout->render ($para->{indent}, $y - $y0);
2855 3197
2856 if (my @w = @{ $para->{widget} }) { 3198 if (my @w = @{ $para->{widget} }) {
… …
2865 $_->draw; 3207 $_->draw;
2866 } 3208 }
2867 } 3209 }
2868 } 3210 }
2869 3211
2870 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2871 } 3214 }
3215
3216 $self->{top_paragraph} = $top_paragraph;
2872 }; 3217 };
2873 }); 3218 });
2874} 3219}
2875 3220
2876sub reconfigure { 3221sub reconfigure {
… …
2997 3342
2998 $self->add (new CFPlus::UI::Label 3343 $self->add (new CFPlus::UI::Label
2999 markup => $tooltip, 3344 markup => $tooltip,
3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3001 fontsize => 0.8, 3346 fontsize => 0.8,
3002 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
3003 ellipsise => 0, 3348 ellipsise => 0,
3004 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
3005 ); 3350 );
3006} 3351}
3007 3352
… …
3079 3424
3080sub new { 3425sub new {
3081 my $class = shift; 3426 my $class = shift;
3082 3427
3083 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
3084 aspect => 1, 3431 aspect => 1,
3085 can_events => 0, 3432 can_events => 0,
3086 @_, 3433 @_,
3087 ); 3434 );
3088 3435
3089 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
3090 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
3091 3438
3092 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
3093 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3094 hard => 1, 3441 hard => 1,
3095 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
3096 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
3097 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
3098 $widget->update; 3448 $self->update;
3099 }, 3449 },
3100 ); 3450 );
3451
3452 $self->update_face;
3101 } 3453 }
3102 3454
3103 $self 3455 $self
3104} 3456}
3105 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
3106sub size_request { 3471sub size_request {
3107 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
3108} 3487}
3109 3488
3110sub update { 3489sub update {
3111 my ($self) = @_; 3490 my ($self) = @_;
3112 3491
… …
3120 3499
3121 return unless $::CONN; 3500 return unless $::CONN;
3122 3501
3123 $self->SUPER::_draw; 3502 $self->SUPER::_draw;
3124 3503
3125 my $face;
3126
3127 if ($self->{frame}) {
3128 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
3129 3505 or return;
3130 $face = $anim->[ $self->{frame} % @$anim ]
3131 if $anim && @$anim;
3132 }
3133 3506
3134 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
3135 3508
3136 if ($tex) { 3509 if ($tex) {
3137 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3139 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;
… …
3155 3528
3156package CFPlus::UI::Buttonbar; 3529package CFPlus::UI::Buttonbar;
3157 3530
3158our @ISA = CFPlus::UI::HBox::; 3531our @ISA = CFPlus::UI::HBox::;
3159 3532
3160# TODO: should actualyl wrap buttons and other goodies. 3533# TODO: should actually wrap buttons and other goodies.
3161 3534
3162############################################################################# 3535#############################################################################
3163 3536
3164package CFPlus::UI::Menu; 3537package CFPlus::UI::Menu;
3165 3538
3166our @ISA = CFPlus::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
3167 3540
3168use CFPlus::OpenGL; 3541use CFPlus::OpenGL;
3169 3542
3170sub new { 3543sub new {
3171 my $class = shift; 3544 my $class = shift;
… …
3349} 3722}
3350 3723
3351sub add { 3724sub add {
3352 my ($self, $title, $widget, $tooltip) = @_; 3725 my ($self, $title, $widget, $tooltip) = @_;
3353 3726
3354 Scalar::Util::weaken $self; 3727 CFPlus::weaken $self;
3355 3728
3356 $self->{buttonbar}->add (new CFPlus::UI::Button 3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3357 markup => $title, 3730 markup => $title,
3358 tooltip => $tooltip, 3731 tooltip => $tooltip,
3359 on_activate => sub { $self->set_current_page ($widget) }, 3732 on_activate => sub { $self->set_current_page ($widget) },
… …
3443 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3444 fontsize => 0.8, 3817 fontsize => 0.8,
3445 @_, 3818 @_,
3446 ); 3819 );
3447 3820
3448 Scalar::Util::weaken (my $this = $self); 3821 CFPlus::weaken (my $this = $self);
3449 3822
3450 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3451 3824
3452 $self 3825 $self
3453} 3826}
… …
3576 $self->SUPER::destroy; 3949 $self->SUPER::destroy;
3577} 3950}
3578 3951
3579############################################################################# 3952#############################################################################
3580 3953
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; 3954package CFPlus::UI::Root;
3766 3955
3767our @ISA = CFPlus::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3768 3957
3769use List::Util qw(min max); 3958use List::Util qw(min max);
… …
3776 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3777 visible => 1, 3966 visible => 1,
3778 @_, 3967 @_,
3779 ); 3968 );
3780 3969
3781 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3782 3971
3783 $self 3972 $self
3784} 3973}
3785 3974
3786sub size_request { 3975sub size_request {
… …
3995 glLoadIdentity; 4184 glLoadIdentity;
3996 4185
3997 { 4186 {
3998 package CFPlus::UI::Base; 4187 package CFPlus::UI::Base;
3999 4188
4000 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4001 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
4002 }
4003 4191
4004 $self->_draw; 4192 $self->_draw;
4193 }
4005} 4194}
4006 4195
4007############################################################################# 4196#############################################################################
4008 4197
4009package CFPlus::UI; 4198package CFPlus::UI;

Diff Legend

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