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.346 by root, Mon Aug 14 01:21:02 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 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) = @_;
… …
924} 943}
925 944
926############################################################################# 945#############################################################################
927 946
928package CFPlus::UI::ViewPort; 947package CFPlus::UI::ViewPort;
948
949use List::Util qw(min max);
929 950
930our @ISA = CFPlus::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
931 952
932sub new { 953sub new {
933 my $class = shift; 954 my $class = shift;
… …
965} 986}
966 987
967sub set_offset { 988sub set_offset {
968 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
969 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
970 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
971 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
972 997
998 $self->emit (changed => $x, $y);
973 $self->update; 999 $self->update;
1000 }
974} 1001}
975 1002
976# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
977sub coord2local { 1004sub coord2local {
978 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
1014 1041
1015############################################################################# 1042#############################################################################
1016 1043
1017package CFPlus::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
1018 1045
1019our @ISA = CFPlus::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
1020 1047
1021sub new { 1048sub new {
1022 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
1023 1050
1024 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
1025 1052
1026 my $self; 1053 my $self;
1027 1054
1028 my $slider = new CFPlus::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1029 vertical => 1, 1065 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1067 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1070 },
1034 ; 1071 ;
1035 1072
1036 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1038 can_events => 1, 1076 can_events => 1,
1039 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
1040 %arg, 1081 %arg,
1041 ); 1082 );
1042 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1099
1044 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1045 1101
1046 $self 1102 $self
1047} 1103}
1048 1104
… …
1052 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1053 1109
1054 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1055} 1111}
1056 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1143
1057sub invoke_mouse_wheel { 1144sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1145 my ($self, $ev) = @_;
1059 1146
1060 return 0 unless $ev->{dy}; # only vertical movements 1147 return 0 unless $ev->{dy}; # only vertical movements for now
1061 1148
1062 $self->{slider}->emit (mouse_wheel => $ev); 1149 $self->{vslider}->emit (mouse_wheel => $ev);
1063 1150
1064 1 1151 1
1065} 1152}
1066 1153
1067sub update_slider { 1154sub invoke_button_down {
1068 my ($self) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1069 1156
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1157 if ($ev->{button} == 2) {
1071} 1158 $self->grab_focus;
1072 1159
1073sub update { 1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1074 my ($self) = @_; 1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1075 1165
1076 $self->SUPER::update; 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1077 1169
1078 $self->update_slider; 1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1079} 1195}
1080 1196
1081sub invoke_size_allocate { 1197sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1083 1199
1084 $self->update_slider; 1200 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1202}
1088 1203
1089############################################################################# 1204#############################################################################
1090 1205
… …
1138 my ($class, %arg) = @_; 1253 my ($class, %arg) = @_;
1139 1254
1140 if ((exists $arg{label}) && !ref $arg{label}) { 1255 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label 1256 $arg{label} = new CFPlus::UI::Label
1142 align => 1, 1257 align => 1,
1143 valign => 1, 1258 valign => 0,
1144 text => $arg{label}, 1259 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75; 1260 fontsize => ($arg{border} || 0.8) * 0.75;
1146 } 1261 }
1147 1262
1148 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
… …
1240 1355
1241my @border = 1356my @border =
1242 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244 1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1245sub new { 1364sub new {
1246 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1247 1366
1248 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1249 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
… …
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418 1537
1419 my $border = $self->border; 1538 my $border = $self->border;
1420 1539
1421 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1422 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426 1559
1427 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1429 1562
1430 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1461 1594
1462sub new { 1595sub new {
1463 my $class = shift; 1596 my $class = shift;
1464 1597
1465 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1466 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1467 @_, 1602 @_,
1468 ) 1603 )
1469} 1604}
1470 1605
1471sub children { 1606sub children {
1472 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473} 1608}
1474 1609
1610# TODO: store row/col info in child widget and use standard add/del
1475sub add { 1611sub add {
1476 my ($self) = shift; 1612 my ($self) = shift;
1477 1613
1478 while (@_) { 1614 while (@_) {
1479 my ($x, $y, $child) = splice @_, 0, 3, (); 1615 my ($x, $y, $child) = splice @_, 0, 3, ();
1480 $child->set_parent ($self); 1616 $child->set_parent ($self);
1481 $self->{children}[$y][$x] = $child; 1617 $self->{children}[$y][$x] = $child;
1482 } 1618 }
1483 1619
1484 $self->{force_realloc} = 1; 1620 $self->{force_realloc} = 1;
1485 $self->{force_size_alloc} = 1; 1621 $self->{force_size_alloc} = 1;
1486 $self->realloc; 1622 $self->realloc;
1487} 1623}
1488 1624
1489sub remove { 1625sub remove {
1490 my ($self, $child) = @_; 1626 my ($self, $child) = @_;
1491 1627
1492 # TODO: not yet implemented 1628 for (@{ $self->{children} }) {
1629 for (@{ $_ || [] }) {
1630 $_ = undef if $_ == $child;
1631 }
1632 }
1493} 1633}
1494 1634
1495# TODO: move to container class maybe? send children a signal on removal? 1635# TODO: move to container class maybe? send children a signal on removal?
1496sub clear { 1636sub clear {
1497 my ($self) = @_; 1637 my ($self) = @_;
… …
1546 my ($ws, $hs) = $self->get_wh; 1686 my ($ws, $hs) = $self->get_wh;
1547 1687
1548 my $req_w = (sum @$ws) || 1; 1688 my $req_w = (sum @$ws) || 1;
1549 my $req_h = (sum @$hs) || 1; 1689 my $req_h = (sum @$hs) || 1;
1550 1690
1551 # TODO: nicer code && do row_expand 1691 # TODO: nicer code
1552 my @col_expand = @{$self->{col_expand}}; 1692 my @col_expand = @{$self->{col_expand}};
1553 @col_expand = (1) x @$ws unless @col_expand; 1693 @col_expand = (1) x @$ws unless @col_expand;
1554 my $col_expand = (sum @col_expand) || 1; 1694 my $col_expand = (sum @col_expand) || 1;
1555 1695
1556 # linearly scale sizes
1557 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1696 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559 1697
1560 CFPlus::UI::harmonize $ws; 1698 CFPlus::UI::harmonize $ws;
1699
1700 my @row_expand = @{$self->{row_expand}};
1701 @row_expand = (1) x @$ws unless @row_expand;
1702 my $row_expand = (sum @row_expand) || 1;
1703
1704 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1705
1561 CFPlus::UI::harmonize $hs; 1706 CFPlus::UI::harmonize $hs;
1562 1707
1563 my $y; 1708 my $y;
1564 1709
1565 for my $r (0 .. $#{$self->{children}}) { 1710 for my $r (0 .. $#{$self->{children}}) {
… …
1605 my ($self) = @_; 1750 my ($self) = @_;
1606 1751
1607 for (grep $_, @{$self->{children}}) { 1752 for (grep $_, @{$self->{children}}) {
1608 $_->draw for grep $_, @$_; 1753 $_->draw for grep $_, @$_;
1609 } 1754 }
1755}
1756
1757#############################################################################
1758
1759package CFPlus::UI::Fixed;
1760
1761use List::Util qw(min max);
1762
1763our @ISA = CFPlus::UI::Container::;
1764
1765sub add {
1766 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1767
1768 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1769 $self->SUPER::add ($child);
1770}
1771
1772sub _scale($$$) {
1773 my ($mode, $val, $max) = @_;
1774
1775 $mode eq "abs" ? $val
1776 : $mode eq "rel" ? $val * $max
1777 : 0
1778}
1779
1780sub size_request {
1781 my ($self) = @_;
1782
1783 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1784
1785 # determine overall size by querying abs widgets
1786 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788
1789 if ($pos eq "abs") {
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 # now layout remaining widgets
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 if ($pos ne "abs") {
1806 $x = _scale $pos, $x, $W;
1807 $y = _scale $pos, $x, $H;
1808 $w = _scale $size, $w, $child->{req_w};
1809 $h = _scale $size, $h, $child->{req_h};
1810
1811 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1812 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1813 }
1814 }
1815
1816 my $W = $x2 - $x1;
1817 my $H = $y2 - $y1;
1818
1819 ($W, $H)
1820}
1821
1822sub invoke_size_allocate {
1823 my ($self, $W, $H) = @_;
1824
1825 for my $child ($self->visible_children) {
1826 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1827
1828 $x = _scale $pos, $x, $W;
1829 $y = _scale $pos, $x, $H;
1830 $w = _scale $size, $w, $child->{req_w};
1831 $h = _scale $size, $h, $child->{req_h};
1832
1833 $child->configure ($x, $y, $w, $h);
1834 }
1835
1836 1
1610} 1837}
1611 1838
1612############################################################################# 1839#############################################################################
1613 1840
1614package CFPlus::UI::Box; 1841package CFPlus::UI::Box;
… …
1900 active_fg => [0, 0, 0], 2127 active_fg => [0, 0, 0],
1901 can_hover => 1, 2128 can_hover => 1,
1902 can_focus => 1, 2129 can_focus => 1,
1903 valign => 0, 2130 valign => 0,
1904 can_events => 1, 2131 can_events => 1,
2132 ellipsise => 0,
1905 #text => ... 2133 #text => ...
1906 #hidden => "*", 2134 #hidden => "*",
1907 @_ 2135 @_
1908 ) 2136 )
1909} 2137}
… …
1953 my $mod = $ev->{mod}; 2181 my $mod = $ev->{mod};
1954 my $sym = $ev->{sym}; 2182 my $sym = $ev->{sym};
1955 my $uni = $ev->{unicode}; 2183 my $uni = $ev->{unicode};
1956 2184
1957 my $text = $self->get_text; 2185 my $text = $self->get_text;
2186
2187 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958 2188
1959 if ($uni == 8) { 2189 if ($uni == 8) {
1960 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2190 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961 } elsif ($uni == 127) { 2191 } elsif ($uni == 127) {
1962 substr $text, $self->{cursor}, 1, ""; 2192 substr $text, $self->{cursor}, 1, "";
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 2193 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 2194 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2195 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2196 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 2197 } elsif ($sym == CFPlus::SDLK_HOME) {
2198 # what a hack
2199 $self->{cursor} =
2200 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2201 ? length $1
2202 : 0;
2203 } elsif ($sym == CFPlus::SDLK_END) {
2204 # uh, again
2205 $self->{cursor} =
2206 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2207 ? $self->{cursor} + length $1
2208 : length $self->{text};
2209 } elsif ($uni == 21) { # ctrl-u
2210 $text = "";
1968 $self->{cursor} = 0; 2211 $self->{cursor} = 0;
1969 } elsif ($sym == CFPlus::SDLK_END) {
1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 27) { 2212 } elsif ($uni == 27) {
1972 $self->emit ('escape'); 2213 $self->emit ('escape');
1973 } elsif ($uni) { 2214 } elsif ($uni == 0x0d) {
2215 substr $text, $self->{cursor}++, 0, "\012";
2216 } elsif ($uni >= 0x20) {
1974 substr $text, $self->{cursor}++, 0, chr $uni; 2217 substr $text, $self->{cursor}++, 0, chr $uni;
1975 } else { 2218 } else {
1976 return 0; 2219 return 0;
1977 } 2220 }
1978 2221
1979 $self->_set_text ($text); 2222 $self->_set_text ($text);
1980 2223
1981 $self->realloc; 2224 $self->realloc;
2225 $self->update;
1982 2226
1983 1 2227 1
1984} 2228}
1985 2229
1986sub invoke_focus_in { 2230sub invoke_focus_in {
… …
2055 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2299 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2056 glEnd; 2300 glEnd;
2057 } 2301 }
2058} 2302}
2059 2303
2304#############################################################################
2305
2060package CFPlus::UI::Entry; 2306package CFPlus::UI::Entry;
2061 2307
2062our @ISA = CFPlus::UI::EntryBase::; 2308our @ISA = CFPlus::UI::EntryBase::;
2063 2309
2064use CFPlus::OpenGL; 2310use CFPlus::OpenGL;
… …
2066sub invoke_key_down { 2312sub invoke_key_down {
2067 my ($self, $ev) = @_; 2313 my ($self, $ev) = @_;
2068 2314
2069 my $sym = $ev->{sym}; 2315 my $sym = $ev->{sym};
2070 2316
2071 if ($sym == 13) { 2317 if ($ev->{uni} == 0x0d || $sym == 13) {
2072 unshift @{$self->{history}}, 2318 unshift @{$self->{history}},
2073 my $txt = $self->get_text; 2319 my $txt = $self->get_text;
2074 2320
2075 $self->{history_pointer} = -1; 2321 $self->{history_pointer} = -1;
2076 $self->{history_saveback} = ''; 2322 $self->{history_saveback} = '';
… …
2106 1 2352 1
2107} 2353}
2108 2354
2109############################################################################# 2355#############################################################################
2110 2356
2357package CFPlus::UI::TextEdit;
2358
2359our @ISA = CFPlus::UI::EntryBase::;
2360
2361use CFPlus::OpenGL;
2362
2363sub move_cursor_ver {
2364 my ($self, $dy) = @_;
2365
2366 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2367
2368 $y += $dy;
2369
2370 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2371 $self->{cursor} = $index;
2372 delete $self->{cur_h};
2373 $self->update;
2374 return;
2375 }
2376}
2377
2378sub invoke_key_down {
2379 my ($self, $ev) = @_;
2380
2381 my $sym = $ev->{sym};
2382
2383 if ($sym == CFPlus::SDLK_UP) {
2384 $self->move_cursor_ver (-1);
2385 } elsif ($sym == CFPlus::SDLK_DOWN) {
2386 $self->move_cursor_ver (+1);
2387 } else {
2388 return $self->SUPER::invoke_key_down ($ev)
2389 }
2390
2391 1
2392}
2393
2394#############################################################################
2395
2111package CFPlus::UI::Button; 2396package CFPlus::UI::Button;
2112 2397
2113our @ISA = CFPlus::UI::Label::; 2398our @ISA = CFPlus::UI::Label::;
2114 2399
2115use CFPlus::OpenGL; 2400use CFPlus::OpenGL;
2116 2401
2117my @tex = 2402my @tex =
2118 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2403 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2119 qw(b1_button_active.png); 2404 qw(b1_button_inactive.png b1_button_active.png);
2120 2405
2121sub new { 2406sub new {
2122 my $class = shift; 2407 my $class = shift;
2123 2408
2124 $class->SUPER::new ( 2409 $class->SUPER::new (
2125 padding_x => 4, 2410 padding_x => 4,
2126 padding_y => 4, 2411 padding_y => 4,
2127 fg => [1, 1, 1], 2412 fg => [1.0, 1.0, 1.0],
2128 active_fg => [0, 0, 1], 2413 active_fg => [0.8, 0.8, 0.8],
2129 can_hover => 1, 2414 can_hover => 1,
2130 align => 0, 2415 align => 0,
2131 valign => 0, 2416 valign => 0,
2132 can_events => 1, 2417 can_events => 1,
2133 @_ 2418 @_
… …
2151 2436
2152 glEnable GL_TEXTURE_2D; 2437 glEnable GL_TEXTURE_2D;
2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2154 glColor 0, 0, 0, 1; 2439 glColor 0, 0, 0, 1;
2155 2440
2441 my $tex = $tex[$GRAB == $self];
2156 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2442 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2157 2443
2158 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
2159 2445
2160 $self->SUPER::_draw; 2446 $self->SUPER::_draw;
2161} 2447}
… …
2257 or Carp::croak "'path' or 'tex' attributes required"; 2543 or Carp::croak "'path' or 'tex' attributes required";
2258 2544
2259 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2545 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2260 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2546 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2261 2547
2262 Scalar::Util::weaken $texture_cache{$self->{path}}; 2548 CFPlus::weaken $texture_cache{$self->{path}};
2263 2549
2264 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2550 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2265 2551
2266 $self 2552 $self
2267} 2553}
… …
2640sub invoke_mouse_wheel { 2926sub invoke_mouse_wheel {
2641 my ($self, $ev) = @_; 2927 my ($self, $ev) = @_;
2642 2928
2643 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2929 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2644 2930
2931 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2932
2645 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2933 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2646 2934
2647 ! ! $delta 2935 ! ! $delta
2648} 2936}
2649 2937
2650sub update { 2938sub update {
… …
2760 #font => default_font 3048 #font => default_font
2761 @_, 3049 @_,
2762 3050
2763 layout => (new CFPlus::Layout), 3051 layout => (new CFPlus::Layout),
2764 par => [], 3052 par => [],
3053 max_par => 0,
2765 height => 0, 3054 height => 0,
2766 children => [ 3055 children => [
2767 (new CFPlus::UI::Empty expand => 1), 3056 (new CFPlus::UI::Empty expand => 1),
2768 (new CFPlus::UI::Slider vertical => 1), 3057 (new CFPlus::UI::Slider vertical => 1),
2769 ], 3058 ],
… …
2853} 3142}
2854 3143
2855sub current_paragraph { 3144sub current_paragraph {
2856 my ($self) = @_; 3145 my ($self) = @_;
2857 3146
2858 $self->force_uptodate;
2859 $self->{top_paragraph} - 1 3147 $self->{top_paragraph} - 1
2860} 3148}
2861 3149
2862sub scroll_to { 3150sub scroll_to {
2863 my ($self, $para) = @_; 3151 my ($self, $para) = @_;
2864 3152
2865 $self->force_uptodate;
2866
2867 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; 3153 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868 3154
2869 $self->{children}[1]->set_value ($self->{par}[$para]{y}); 3155 $self->{scroll_to} = $para;
3156 $self->update;
2870} 3157}
2871 3158
2872sub clear { 3159sub clear {
2873 my ($self) = @_; 3160 my ($self) = @_;
2874 3161
… …
2896 3183
2897 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3184 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2898 push @{$self->{par}}, $para; 3185 push @{$self->{par}}, $para;
2899 } 3186 }
2900 3187
3188 if (my $max = $self->{max_par}) {
3189 shift @{$self->{par}} while @{$self->{par}} > $max;
3190 }
3191
2901 $self->{need_reflow}++; 3192 $self->{need_reflow}++;
2902 $self->update; 3193 $self->update;
2903} 3194}
2904 3195
2905sub scroll_to_bottom { 3196sub scroll_to_bottom {
2906 my ($self) = @_; 3197 my ($self) = @_;
2907 3198
2908 $self->{scroll_to_bottom} = 1; 3199 $self->{scroll_to} = $#{$self->{par}};
2909 $self->update; 3200 $self->update;
2910} 3201}
2911 3202
2912sub force_uptodate { 3203sub force_uptodate {
2913 my ($self) = @_; 3204 my ($self) = @_;
2914 3205
2915 if (delete $self->{need_reflow}) { 3206 if (delete $self->{need_reflow}) {
2916 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3207 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2917 3208
2918 my $height = 0; 3209 my $height = 0;
2919 my $paridx;
2920 my $top_paragraph;
2921 my $top = int $self->{children}[1]{range}[0];
2922 3210
2923 for my $para (@{$self->{par}}) { 3211 for my $para (@{$self->{par}}) {
2924 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 3212 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2925 my $layout = $self->get_layout ($para); 3213 my $layout = $self->get_layout ($para);
2926 my ($w, $h) = $layout->size; 3214 my ($w, $h) = $layout->size;
… …
2929 $para->{h} = $h; 3217 $para->{h} = $h;
2930 $para->{wrapped} = $layout->has_wrapped; 3218 $para->{wrapped} = $layout->has_wrapped;
2931 } 3219 }
2932 3220
2933 $para->{y} = $height; 3221 $para->{y} = $height;
2934
2935 $paridx++;
2936 $top_paragraph ||= $paridx if $height >= $top;
2937
2938 $height += $para->{h}; 3222 $height += $para->{h};
2939 } 3223 }
2940 3224
2941 $self->{top_paragraph} = $top_paragraph;
2942 $self->{height} = $height; 3225 $self->{height} = $height;
2943
2944 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); 3226 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2945 3227
2946 delete $self->{texture}; 3228 delete $self->{texture};
2947 } 3229 }
2948 3230
2949 if (delete $self->{scroll_to_bottom}) { 3231 if (my $paridx = delete $self->{scroll_to}) {
2950 $self->{children}[1]->set_value (1e10); 3232 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2951 } 3233 }
2952} 3234}
2953 3235
2954sub update { 3236sub update {
2955 my ($self) = @_; 3237 my ($self) = @_;
… …
2967 3249
2968 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3250 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2969 glClearColor 0, 0, 0, 0; 3251 glClearColor 0, 0, 0, 0;
2970 glClear GL_COLOR_BUFFER_BIT; 3252 glClear GL_COLOR_BUFFER_BIT;
2971 3253
3254 package CFPlus::UI::Base;
3255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3256 (0, 0, $self->{w}, $self->{h});
3257
3258 my $top = int $self->{children}[1]{range}[0];
3259
3260 my $paridx = 0;
3261 my $top_paragraph;
2972 my $top = int $self->{children}[1]{range}[0]; 3262 my $top = int $self->{children}[1]{range}[0];
2973 3263
2974 my $y0 = $top; 3264 my $y0 = $top;
2975 my $y1 = $top + $H; 3265 my $y1 = $top + $H;
2976 3266
… …
2994 3284
2995 $_->draw; 3285 $_->draw;
2996 } 3286 }
2997 } 3287 }
2998 } 3288 }
3289
3290 $paridx++;
3291 $top_paragraph ||= $paridx if $y >= $top;
2999 } 3292 }
3293
3294 $self->{top_paragraph} = $top_paragraph;
3000 }; 3295 };
3001 }); 3296 });
3002} 3297}
3003 3298
3004sub reconfigure { 3299sub reconfigure {
… …
3207 3502
3208sub new { 3503sub new {
3209 my $class = shift; 3504 my $class = shift;
3210 3505
3211 my $self = $class->SUPER::new ( 3506 my $self = $class->SUPER::new (
3507 size_w => 32,
3508 size_h => 8,
3212 aspect => 1, 3509 aspect => 1,
3213 can_events => 0, 3510 can_events => 0,
3214 @_, 3511 @_,
3215 ); 3512 );
3216 3513
3217 if ($self->{anim} && $self->{animspeed}) { 3514 if ($self->{anim} && $self->{animspeed}) {
3218 Scalar::Util::weaken (my $widget = $self); 3515 CFPlus::weaken (my $widget = $self);
3219 3516
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3220 $self->{timer} = Event->timer ( 3519 $self->{timer} = Event->timer (
3221 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3222 hard => 1, 3520 parked => 1,
3223 interval => $self->{animspeed},
3224 cb => sub { 3521 cb => sub {
3522 return unless $::CONN && $widget;
3523
3225 ++$widget->{frame}; 3524 ++$widget->{frame};
3525 $widget->update_face;
3226 $widget->update; 3526 $widget->update;
3527
3528 $widget->update_timer;
3227 }, 3529 },
3228 ); 3530 );
3531
3532 $self->update_face;
3533 $self->update_timer;
3229 } 3534 }
3230 3535
3231 $self 3536 $self
3232} 3537}
3233 3538
3539sub update_timer {
3540 my ($self) = @_;
3541
3542 return unless $self->{timer};
3543
3544 if ($self->{visible}) {
3545 $self->{timer}->at (
3546 $self->{anim_start}
3547 + $self->{animspeed}
3548 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3549 );
3550 $self->{timer}->start;
3551 } else {
3552 $self->{timer}->stop;
3553 }
3554}
3555
3556sub update_face {
3557 my ($self) = @_;
3558
3559 return unless $::CONN;
3560
3561 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3562 if ($anim && @$anim) {
3563 delete $self->{wait_face};
3564 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3565 }
3566 }
3567}
3568
3234sub size_request { 3569sub size_request {
3235 (32, 8) 3570 my ($self) = @_;
3571
3572 if ($::CONN) {
3573 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3574 if (my $tex = $::CONN->{texture}[$faceid]) {
3575 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3576 } else {
3577 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3578 $self->realloc;
3579 });
3580 }
3581 }
3582 }
3583
3584 ($self->{size_w} || 8, $self->{size_h} || 8)
3236} 3585}
3237 3586
3238sub update { 3587sub update {
3239 my ($self) = @_; 3588 my ($self) = @_;
3240 3589
3241 return unless $self->{visible}; 3590 return unless $self->{visible};
3242 3591
3243 $self->SUPER::update; 3592 $self->SUPER::update;
3244} 3593}
3245 3594
3595sub invoke_visibility_change {
3596 my ($self) = @_;
3597
3598 $self->update_timer;
3599
3600 0
3601}
3602
3246sub _draw { 3603sub _draw {
3247 my ($self) = @_; 3604 my ($self) = @_;
3248 3605
3249 return unless $::CONN; 3606 return unless $::CONN;
3250 3607
3251 $self->SUPER::_draw; 3608 $self->SUPER::_draw;
3252 3609
3253 my $face;
3254
3255 if ($self->{frame}) {
3256 my $anim = $::CONN->{anim}[$self->{anim}]; 3610 my $faceid = $::CONN->{faceid}[$self->{face}]
3257 3611 or return;
3258 $face = $anim->[ $self->{frame} % @$anim ]
3259 if $anim && @$anim;
3260 }
3261 3612
3262 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3613 my $tex = $::CONN->{texture}[$faceid];
3263 3614
3264 if ($tex) { 3615 if ($tex) {
3265 glEnable GL_TEXTURE_2D; 3616 glEnable GL_TEXTURE_2D;
3266 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3267 glColor 0, 0, 0, 1; 3618 glColor 0, 0, 0, 1;
… …
3271} 3622}
3272 3623
3273sub destroy { 3624sub destroy {
3274 my ($self) = @_; 3625 my ($self) = @_;
3275 3626
3276 $self->{timer}->cancel 3627 (delete $self->{timer})->cancel
3277 if $self->{timer}; 3628 if $self->{timer};
3278 3629
3279 $self->SUPER::destroy; 3630 $self->SUPER::destroy;
3280} 3631}
3281 3632
… …
3283 3634
3284package CFPlus::UI::Buttonbar; 3635package CFPlus::UI::Buttonbar;
3285 3636
3286our @ISA = CFPlus::UI::HBox::; 3637our @ISA = CFPlus::UI::HBox::;
3287 3638
3288# TODO: should actualyl wrap buttons and other goodies. 3639# TODO: should actually wrap buttons and other goodies.
3289 3640
3290############################################################################# 3641#############################################################################
3291 3642
3292package CFPlus::UI::Menu; 3643package CFPlus::UI::Menu;
3293 3644
… …
3477} 3828}
3478 3829
3479sub add { 3830sub add {
3480 my ($self, $title, $widget, $tooltip) = @_; 3831 my ($self, $title, $widget, $tooltip) = @_;
3481 3832
3482 Scalar::Util::weaken $self; 3833 CFPlus::weaken $self;
3483 3834
3484 $self->{buttonbar}->add (new CFPlus::UI::Button 3835 $self->{buttonbar}->add (new CFPlus::UI::Button
3485 markup => $title, 3836 markup => $title,
3486 tooltip => $tooltip, 3837 tooltip => $tooltip,
3487 on_activate => sub { $self->set_current_page ($widget) }, 3838 on_activate => sub { $self->set_current_page ($widget) },
… …
3571 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
3572 fontsize => 0.8, 3923 fontsize => 0.8,
3573 @_, 3924 @_,
3574 ); 3925 );
3575 3926
3576 Scalar::Util::weaken (my $this = $self); 3927 CFPlus::weaken (my $this = $self);
3577 3928
3578 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3929 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3579 3930
3580 $self 3931 $self
3581} 3932}
… …
3704 $self->SUPER::destroy; 4055 $self->SUPER::destroy;
3705} 4056}
3706 4057
3707############################################################################# 4058#############################################################################
3708 4059
3709package CFPlus::UI::Inventory;
3710
3711our @ISA = CFPlus::UI::Table::;
3712
3713sub new {
3714 my $class = shift;
3715
3716 my $self = $class->SUPER::new (
3717 col_expand => [0, 1, 0],
3718 items => [],
3719 @_,
3720 );
3721
3722 $self->set_sort_order (undef);
3723
3724 $self
3725}
3726
3727sub update_items {
3728 my ($self) = @_;
3729
3730 $self->clear;
3731
3732 my @item = $self->{sort}->(@{ $self->{items} });
3733
3734 my @adds;
3735 my $row = 0;
3736 for my $item ($self->{sort}->(@{ $self->{items} })) {
3737 CFPlus::Item::update_widgets $item;
3738
3739 push @adds, 0, $row, $item->{face_widget};
3740 push @adds, 1, $row, $item->{desc_widget};
3741 push @adds, 2, $row, $item->{weight_widget};
3742
3743 $row++;
3744 }
3745
3746 $self->add (@adds);
3747}
3748
3749sub set_sort_order {
3750 my ($self, $order) = @_;
3751
3752 $self->{sort} = $order ||= sub {
3753 sort {
3754 $a->{type} <=> $b->{type}
3755 or $a->{name} cmp $b->{name}
3756 } @_
3757 };
3758
3759 $self->update_items;
3760}
3761
3762sub set_items {
3763 my ($self, $items) = @_;
3764
3765 $self->{items} = [$items ? values %$items : ()];
3766 $self->update_items;
3767}
3768
3769#############################################################################
3770
3771package CFPlus::UI::SpellList;
3772
3773our @ISA = CFPlus::UI::Table::;
3774
3775sub new {
3776 my $class = shift;
3777
3778 my $self = $class->SUPER::new (
3779 binding => [],
3780 commands => [],
3781 @_,
3782 )
3783}
3784
3785my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3786
3787my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3788 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3789my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3790 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3791my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3792 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3793my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3794 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3795my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3796 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3797
3798sub rebuild_spell_list {
3799 my ($self) = @_;
3800
3801 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3802 $self->clear;
3803
3804 return unless $::CONN;
3805
3806 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3807 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3808 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3809 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3810 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3811
3812 my $row = 0;
3813
3814 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3815 my $spell = $self->{spell}{$_};
3816
3817 $row++;
3818
3819 my $spell_cb = sub {
3820 my ($widget, $ev) = @_;
3821
3822 if ($ev->{button} == 1) {
3823 $::CONN->user_send ("cast $spell->{name}");
3824 } elsif ($ev->{button} == 2) {
3825 $::CONN->user_send ("invoke $spell->{name}");
3826 } elsif ($ev->{button} == 3) {
3827 (new CFPlus::UI::Menu
3828 items => [
3829 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3830 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3831 ],
3832 )->popup ($ev);
3833 } else {
3834 return 0;
3835 }
3836
3837 1
3838 };
3839
3840 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3841
3842 #TODO: add path info to tooltip
3843 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3844
3845 $self->add (0, $row, new CFPlus::UI::Face
3846 face => $spell->{face},
3847 can_hover => 1,
3848 can_events => 1,
3849 tooltip => $tooltip,
3850 on_button_down => $spell_cb,
3851 );
3852
3853 $self->add (1, $row, new CFPlus::UI::Label
3854 expand => 1,
3855 text => $spell->{name},
3856 can_hover => 1,
3857 can_events => 1,
3858 tooltip => $tooltip,
3859 on_button_down => $spell_cb,
3860 );
3861
3862 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3863 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3864 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3865 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3866 }
3867 });
3868}
3869
3870sub add_spell {
3871 my ($self, $spell) = @_;
3872
3873 $self->{spell}->{$spell->{name}} = $spell;
3874 $self->rebuild_spell_list;
3875}
3876
3877sub remove_spell {
3878 my ($self, $spell) = @_;
3879
3880 delete $self->{spell}->{$spell->{name}};
3881 $self->rebuild_spell_list;
3882}
3883
3884sub clear_spells {
3885 my ($self) = @_;
3886
3887 $self->{spell} = {};
3888 $self->rebuild_spell_list;
3889}
3890
3891#############################################################################
3892
3893package CFPlus::UI::Root; 4060package CFPlus::UI::Root;
3894 4061
3895our @ISA = CFPlus::UI::Container::; 4062our @ISA = CFPlus::UI::Container::;
3896 4063
3897use List::Util qw(min max); 4064use List::Util qw(min max);
… …
3904 my $self = $class->SUPER::new ( 4071 my $self = $class->SUPER::new (
3905 visible => 1, 4072 visible => 1,
3906 @_, 4073 @_,
3907 ); 4074 );
3908 4075
3909 Scalar::Util::weaken ($self->{root} = $self); 4076 CFPlus::weaken ($self->{root} = $self);
3910 4077
3911 $self 4078 $self
3912} 4079}
3913 4080
3914sub size_request { 4081sub size_request {
… …
4109 while ($self->{post_alloc_hook}) { 4276 while ($self->{post_alloc_hook}) {
4110 $_->() 4277 $_->()
4111 for values %{delete $self->{post_alloc_hook}}; 4278 for values %{delete $self->{post_alloc_hook}};
4112 } 4279 }
4113 4280
4114
4115 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4281 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4116 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4282 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4117 glClear GL_COLOR_BUFFER_BIT; 4283 glClear GL_COLOR_BUFFER_BIT;
4118 4284
4119 glMatrixMode GL_PROJECTION; 4285 glMatrixMode GL_PROJECTION;
… …
4123 glLoadIdentity; 4289 glLoadIdentity;
4124 4290
4125 { 4291 {
4126 package CFPlus::UI::Base; 4292 package CFPlus::UI::Base;
4127 4293
4128 ($draw_x, $draw_y, $draw_w, $draw_h) = 4294 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4129 (0, 0, $self->{w}, $self->{h}); 4295 (0, 0, $self->{w}, $self->{h});
4130 }
4131 4296
4132 $self->_draw; 4297 $self->_draw;
4298 }
4133} 4299}
4134 4300
4135############################################################################# 4301#############################################################################
4136 4302
4137package CFPlus::UI; 4303package CFPlus::UI;

Diff Legend

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