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.340 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07: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;
10use CFPlus::Pod;
11use CFPlus::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
234 h => undef, 237 h => undef,
235 can_events => 1, 238 can_events => 1,
236 @_ 239 @_
237 }, $class; 240 }, $class;
238 241
239 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240 243
241 for (keys %$self) { 244 for (keys %$self) {
242 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
243 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
244 } 247 }
… …
261 264
262sub destroy { 265sub destroy {
263 my ($self) = @_; 266 my ($self) = @_;
264 267
265 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
266 %$self = (); 270 %$self = ();
271}
272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
267} 275}
268 276
269sub show { 277sub show {
270 my ($self) = @_; 278 my ($self) = @_;
271 279
… …
312sub set_visibility { 320sub set_visibility {
313 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
314 322
315 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
316 324
317 $visible ? $self->hide 325 $visible ? $self->show
318 : $self->show; 326 : $self->hide;
319} 327}
320 328
321sub toggle_visibility { 329sub toggle_visibility {
322 my ($self) = @_; 330 my ($self) = @_;
323 331
… …
501 509
502 defined wantarray and CFPlus::guard { 510 defined wantarray and CFPlus::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} }; 512 @{ $self->{signal_cb}{$signal} };
505 } 513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
506} 520}
507 521
508my %has_coords = ( 522my %has_coords = (
509 button_down => 1, 523 button_down => 1,
510 button_up => 1, 524 button_up => 1,
… …
513); 527);
514 528
515sub emit { 529sub emit {
516 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
517 531
518 # 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
519 # and needlessly verbose code, too. 533 # and needlessly verbose code, either.
520 my @append 534 my @append
521 = $has_coords{$signal} 535 = $has_coords{$signal}
522 ? $args[0]->xy ($self) 536 ? $args[0]->xy ($self)
523 : (); 537 : ();
524 538
525 #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#
526 540
527 #d##TODO# stop propagating at first true, do not use sum 541 for my $cb (
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 542 @{$self->{signal_cb}{$signal} || []}, # before
529 || ($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
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
531} 550}
532 551
533sub find_widget { 552sub find_widget {
534 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
535 554
… …
543} 562}
544 563
545sub set_parent { 564sub set_parent {
546 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
547 566
548 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
549 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
550} 569}
551 570
552sub realloc { 571sub realloc {
553 my ($self) = @_; 572 my ($self) = @_;
… …
632 my ($self) = @_; 651 my ($self) = @_;
633 652
634 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
635} 654}
636 655
656my $cntx;#d#
637sub DESTROY { 657sub DESTROY {
638 my ($self) = @_; 658 my ($self) = @_;
639 659
640 return if CFPlus::in_destruct; 660 return if CFPlus::in_destruct;
641
642 delete $WIDGET{$self+0};
643 661
644 eval { $self->destroy }; 662 eval { $self->destroy };
645 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};
646} 666}
647 667
648############################################################################# 668#############################################################################
649 669
650package CFPlus::UI::DrawBG; 670package CFPlus::UI::DrawBG;
… …
897 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
898 918
899 { 919 {
900 package CFPlus::UI::Base; 920 package CFPlus::UI::Base;
901 921
902 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
903 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
904 } 926 }
905
906 $self->_render;
907 }; 927 };
908} 928}
909 929
910sub _draw { 930sub _draw {
911 my ($self) = @_; 931 my ($self) = @_;
912
913 my ($w, $h) = @$self{qw(w h)};
914 932
915 my $tex = $self->{texture} 933 my $tex = $self->{texture}
916 or return; 934 or return;
917 935
918 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
921 939
922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
923 941
924 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
925} 943}
926 944
927############################################################################# 945#############################################################################
… …
1015 1033
1016############################################################################# 1034#############################################################################
1017 1035
1018package CFPlus::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1019 1037
1020our @ISA = CFPlus::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1021 1039
1022sub new { 1040sub new {
1023 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1024 1042
1025 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1026 1044
1027 my $self; 1045 my $self;
1028 1046
1029 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
1030 vertical => 1, 1057 vertical => 1,
1031 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1032 on_changed => sub { 1059 on_changed => sub {
1033 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034 }, 1062 },
1035 ; 1063 ;
1036 1064
1037 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1038 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1039 can_events => 1, 1067 can_events => 1,
1040 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1041 %arg, 1072 %arg,
1042 ); 1073 );
1043 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
1044 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
1045 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1046 1080
1047 $self 1081 $self
1048} 1082}
1049 1083
… …
1058sub invoke_mouse_wheel { 1092sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_; 1093 my ($self, $ev) = @_;
1060 1094
1061 return 0 unless $ev->{dy}; # only vertical movements 1095 return 0 unless $ev->{dy}; # only vertical movements
1062 1096
1063 $self->{slider}->emit (mouse_wheel => $ev); 1097 $self->{vslider}->emit (mouse_wheel => $ev);
1064 1098
1065 1 1099 1
1066} 1100}
1067 1101
1068sub update_slider { 1102sub update_slider {
1069 my ($self) = @_; 1103 my ($self) = @_;
1070 1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1072} 1114}
1073 1115
1074sub update { 1116sub update {
1075 my ($self) = @_; 1117 my ($self) = @_;
1076 1118
1077 $self->SUPER::update; 1119 $self->SUPER::update;
1078
1079 $self->update_slider; 1120 $self->update_slider;
1080} 1121}
1081 1122
1082sub invoke_size_allocate { 1123sub invoke_size_allocate {
1083 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1084 1125
1085 $self->update_slider; 1126 $self->update_slider;
1086
1087 $self->SUPER::invoke_size_allocate ($w, $h) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1088} 1128}
1089 1129
1090############################################################################# 1130#############################################################################
1091 1131
… …
1128} 1168}
1129 1169
1130############################################################################# 1170#############################################################################
1131 1171
1132package CFPlus::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1173
1174our @ISA = CFPlus::UI::Bin::;
1175
1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1133 1273
1134our @ISA = CFPlus::UI::Bin::; 1274our @ISA = CFPlus::UI::Bin::;
1135 1275
1136use CFPlus::OpenGL; 1276use CFPlus::OpenGL;
1137 1277
… …
1363sub new { 1503sub new {
1364 my $class = shift; 1504 my $class = shift;
1365 1505
1366 $class->SUPER::new ( 1506 $class->SUPER::new (
1367 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1368 @_, 1509 @_,
1369 ) 1510 )
1370} 1511}
1371 1512
1372sub children { 1513sub children {
… …
1447 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1448 1589
1449 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1450 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1451 1592
1452 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1453 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1454 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1455 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1456 1597
1457 # linearly scale sizes
1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460 1599
1461 CFPlus::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1462 CFPlus::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1463 1609
1464 my $y; 1610 my $y;
1465 1611
1466 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
… …
1617 #active_bg => none 1763 #active_bg => none
1618 #font => default_font 1764 #font => default_font
1619 #text => initial text 1765 #text => initial text
1620 #markup => initial narkup 1766 #markup => initial narkup
1621 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1622 ellipsise => 3, # end 1769 ellipsise => 3, # end
1623 layout => (new CFPlus::Layout), 1770 layout => (new CFPlus::Layout),
1624 fontsize => 1, 1771 fontsize => 1,
1625 align => -1, 1772 align => -1,
1626 valign => -1, 1773 valign => -1,
… …
1777 }; 1924 };
1778 1925
1779 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1781 1928
1782 $self->{layout}->render ($self->{ox}, $self->{oy}); 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783} 1930}
1784 1931
1785############################################################################# 1932#############################################################################
1786 1933
1787package CFPlus::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
… …
1800 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1801 can_hover => 1, 1948 can_hover => 1,
1802 can_focus => 1, 1949 can_focus => 1,
1803 valign => 0, 1950 valign => 0,
1804 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1805 #text => ... 1953 #text => ...
1806 #hidden => "*", 1954 #hidden => "*",
1807 @_ 1955 @_
1808 ) 1956 )
1809} 1957}
… …
1853 my $mod = $ev->{mod}; 2001 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1856 2004
1857 my $text = $self->get_text; 2005 my $text = $self->get_text;
2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1858 2008
1859 if ($uni == 8) { 2009 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1868 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2033 $self->emit ('escape');
1873 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2038 } else {
1876 return 0; 2039 return 0;
1877 } 2040 }
1878 2041
1879 $self->_set_text ($text); 2042 $self->_set_text ($text);
1880 2043
1881 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1882 2046
1883 1 2047 1
1884} 2048}
1885 2049
1886sub invoke_focus_in { 2050sub invoke_focus_in {
… …
1948 utf8::encode $text; 2112 utf8::encode $text;
1949 2113
1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951 } 2115 }
1952 2116
1953 glColor @{$self->{fg}};
1954 glBegin GL_LINES; 2117 glBegin GL_LINES;
1955 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957 glEnd; 2120 glEnd;
1958 } 2121 }
1959} 2122}
2123
2124#############################################################################
1960 2125
1961package CFPlus::UI::Entry; 2126package CFPlus::UI::Entry;
1962 2127
1963our @ISA = CFPlus::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1964 2129
… …
1967sub invoke_key_down { 2132sub invoke_key_down {
1968 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1969 2134
1970 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1971 2136
1972 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1973 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1974 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
1975 2140
1976 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1977 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
… …
2007 1 2172 1
2008} 2173}
2009 2174
2010############################################################################# 2175#############################################################################
2011 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
2012package CFPlus::UI::Button; 2216package CFPlus::UI::Button;
2013 2217
2014our @ISA = CFPlus::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
2015 2219
2016use CFPlus::OpenGL; 2220use CFPlus::OpenGL;
… …
2158 or Carp::croak "'path' or 'tex' attributes required"; 2362 or Carp::croak "'path' or 'tex' attributes required";
2159 2363
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162 2366
2163 Scalar::Util::weaken $texture_cache{$self->{path}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
2164 2368
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166 2370
2167 $self 2371 $self
2168} 2372}
… …
2541sub invoke_mouse_wheel { 2745sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_; 2746 my ($self, $ev) = @_;
2543 2747
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545 2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547 2753
2548 ! ! $delta 2754 ! ! $delta
2549} 2755}
2550 2756
2551sub update { 2757sub update {
… …
2661 #font => default_font 2867 #font => default_font
2662 @_, 2868 @_,
2663 2869
2664 layout => (new CFPlus::Layout), 2870 layout => (new CFPlus::Layout),
2665 par => [], 2871 par => [],
2872 max_par => 0,
2666 height => 0, 2873 height => 0,
2667 children => [ 2874 children => [
2668 (new CFPlus::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2669 (new CFPlus::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2670 ], 2877 ],
… …
2749sub set_offset { 2956sub set_offset {
2750 my ($self, $offset) = @_; 2957 my ($self, $offset) = @_;
2751 2958
2752 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2753 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2961}
2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2754} 2976}
2755 2977
2756sub clear { 2978sub clear {
2757 my ($self) = @_; 2979 my ($self) = @_;
2758 2980
… …
2780 3002
2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782 push @{$self->{par}}, $para; 3004 push @{$self->{par}}, $para;
2783 } 3005 }
2784 3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
3010
2785 $self->{need_reflow}++; 3011 $self->{need_reflow}++;
2786 $self->update; 3012 $self->update;
2787} 3013}
2788 3014
2789sub scroll_to_bottom { 3015sub scroll_to_bottom {
2790 my ($self) = @_; 3016 my ($self) = @_;
2791 3017
2792 $self->{scroll_to_bottom} = 1; 3018 $self->{scroll_to} = $#{$self->{par}};
2793 $self->update; 3019 $self->update;
2794} 3020}
2795 3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
3044 $self->{height} = $height;
3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3046
3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
3053}
3054
2796sub update { 3055sub update {
2797 my ($self) = @_; 3056 my ($self) = @_;
2798 3057
2799 $self->SUPER::update; 3058 $self->SUPER::update;
2800 3059
2801 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2802 3061
2803 delete $self->{texture}; 3062 delete $self->{texture};
2804 3063
2805 $ROOT->on_post_alloc ($self => sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807
2808 if (delete $self->{need_reflow}) {
2809 my $height = 0;
2810
2811 for my $para (@{$self->{par}}) {
2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813 my $layout = $self->get_layout ($para);
2814 my ($w, $h) = $layout->size;
2815
2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2819 }
2820
2821 $height += $para->{h};
2822 }
2823
2824 $self->{height} = $height;
2825
2826 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828 delete $self->{texture};
2829 }
2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834 3068
2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2837 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2838 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2839 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2840 3082
2841 my $y0 = $top; 3083 my $y0 = $top;
2842 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2843 3085
2844 my $y = 0;
2845
2846 for my $para (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2847 my $h = $para->{h}; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2848 3089
2849 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2850
2851 my $layout = $self->get_layout ($para); 3091 my $layout = $self->get_layout ($para);
2852 3092
2853 $layout->render ($para->{indent}, $y - $y0); 3093 $layout->render ($para->{indent}, $y - $y0);
2854 3094
2855 if (my @w = @{ $para->{widget} }) { 3095 if (my @w = @{ $para->{widget} }) {
… …
2864 $_->draw; 3104 $_->draw;
2865 } 3105 }
2866 } 3106 }
2867 } 3107 }
2868 3108
2869 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2870 } 3111 }
3112
3113 $self->{top_paragraph} = $top_paragraph;
2871 }; 3114 };
2872 }); 3115 });
2873} 3116}
2874 3117
2875sub reconfigure { 3118sub reconfigure {
… …
2977} 3220}
2978 3221
2979sub set_tooltip_from { 3222sub set_tooltip_from {
2980 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
2981 3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
3227
2982 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2983 3229
2984 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2985 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
… …
2993 3239
2994 $self->add (new CFPlus::UI::Label 3240 $self->add (new CFPlus::UI::Label
2995 markup => $tooltip, 3241 markup => $tooltip,
2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997 fontsize => 0.8, 3243 fontsize => 0.8,
2998 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2999 ellipsise => 0, 3245 ellipsise => 0,
3000 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
3001 ); 3247 );
3002} 3248}
3003 3249
… …
3081 can_events => 0, 3327 can_events => 0,
3082 @_, 3328 @_,
3083 ); 3329 );
3084 3330
3085 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
3086 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
3087 3333
3088 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
3089 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090 hard => 1, 3336 hard => 1,
3091 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
3092 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
3093 ++$widget->{frame}; 3340 ++$widget->{frame};
3094 $widget->update; 3341 $widget->update;
3095 }, 3342 },
3096 ); 3343 );
3097 } 3344 }
… …
3124 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
3125 3372
3126 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
3127 if $anim && @$anim; 3374 if $anim && @$anim;
3128 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3129 3379
3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
3131 3381
3132 if ($tex) { 3382 if ($tex) {
3133 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3137 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3138 } 3392 }
3139} 3393}
3140 3394
3141sub destroy { 3395sub destroy {
3142 my ($self) = @_; 3396 my ($self) = @_;
… …
3151 3405
3152package CFPlus::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
3153 3407
3154our @ISA = CFPlus::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
3155 3409
3156# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
3157 3411
3158############################################################################# 3412#############################################################################
3159 3413
3160package CFPlus::UI::Menu; 3414package CFPlus::UI::Menu;
3161 3415
3162our @ISA = CFPlus::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
3163 3417
3164use CFPlus::OpenGL; 3418use CFPlus::OpenGL;
3165 3419
3166sub new { 3420sub new {
3167 my $class = shift; 3421 my $class = shift;
… …
3345} 3599}
3346 3600
3347sub add { 3601sub add {
3348 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3349 3603
3350 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3351 3605
3352 $self->{buttonbar}->add (new CFPlus::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3353 markup => $title, 3607 markup => $title,
3354 tooltip => $tooltip, 3608 tooltip => $tooltip,
3355 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
… …
3439 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3440 fontsize => 0.8, 3694 fontsize => 0.8,
3441 @_, 3695 @_,
3442 ); 3696 );
3443 3697
3444 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3445 3699
3446 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447 3701
3448 $self 3702 $self
3449} 3703}
… …
3572 $self->SUPER::destroy; 3826 $self->SUPER::destroy;
3573} 3827}
3574 3828
3575############################################################################# 3829#############################################################################
3576 3830
3577package CFPlus::UI::Inventory;
3578
3579our @ISA = CFPlus::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 col_expand => [0, 1, 0],
3586 items => [],
3587 @_,
3588 );
3589
3590 $self->set_sort_order (undef);
3591
3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFPlus::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3628}
3629
3630sub set_items {
3631 my ($self, $items) = @_;
3632
3633 $self->{items} = [$items ? values %$items : ()];
3634 $self->update_items;
3635}
3636
3637#############################################################################
3638
3639package CFPlus::UI::SpellList;
3640
3641our @ISA = CFPlus::UI::Table::;
3642
3643sub new {
3644 my $class = shift;
3645
3646 my $self = $class->SUPER::new (
3647 binding => [],
3648 commands => [],
3649 @_,
3650 )
3651}
3652
3653my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666sub rebuild_spell_list {
3667 my ($self) = @_;
3668
3669 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3670 $self->clear;
3671
3672 return unless $::CONN;
3673
3674 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680 my $row = 0;
3681
3682 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683 my $spell = $self->{spell}{$_};
3684
3685 $row++;
3686
3687 my $spell_cb = sub {
3688 my ($widget, $ev) = @_;
3689
3690 if ($ev->{button} == 1) {
3691 $::CONN->user_send ("cast $spell->{name}");
3692 } elsif ($ev->{button} == 2) {
3693 $::CONN->user_send ("invoke $spell->{name}");
3694 } elsif ($ev->{button} == 3) {
3695 (new CFPlus::UI::Menu
3696 items => [
3697 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699 ],
3700 )->popup ($ev);
3701 } else {
3702 return 0;
3703 }
3704
3705 1
3706 };
3707
3708 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710 #TODO: add path info to tooltip
3711 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3712
3713 $self->add (0, $row, new CFPlus::UI::Face
3714 face => $spell->{face},
3715 can_hover => 1,
3716 can_events => 1,
3717 tooltip => $tooltip,
3718 on_button_down => $spell_cb,
3719 );
3720
3721 $self->add (1, $row, new CFPlus::UI::Label
3722 expand => 1,
3723 text => $spell->{name},
3724 can_hover => 1,
3725 can_events => 1,
3726 tooltip => $tooltip,
3727 on_button_down => $spell_cb,
3728 );
3729
3730 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734 }
3735 });
3736}
3737
3738sub add_spell {
3739 my ($self, $spell) = @_;
3740
3741 $self->{spell}->{$spell->{name}} = $spell;
3742 $self->rebuild_spell_list;
3743}
3744
3745sub remove_spell {
3746 my ($self, $spell) = @_;
3747
3748 delete $self->{spell}->{$spell->{name}};
3749 $self->rebuild_spell_list;
3750}
3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3759#############################################################################
3760
3761package CFPlus::UI::Root; 3831package CFPlus::UI::Root;
3762 3832
3763our @ISA = CFPlus::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3764 3834
3765use List::Util qw(min max); 3835use List::Util qw(min max);
… …
3772 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3773 visible => 1, 3843 visible => 1,
3774 @_, 3844 @_,
3775 ); 3845 );
3776 3846
3777 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3778 3848
3779 $self 3849 $self
3780} 3850}
3781 3851
3782sub size_request { 3852sub size_request {
… …
3991 glLoadIdentity; 4061 glLoadIdentity;
3992 4062
3993 { 4063 {
3994 package CFPlus::UI::Base; 4064 package CFPlus::UI::Base;
3995 4065
3996 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
3998 }
3999 4068
4000 $self->_draw; 4069 $self->_draw;
4070 }
4001} 4071}
4002 4072
4003############################################################################# 4073#############################################################################
4004 4074
4005package CFPlus::UI; 4075package CFPlus::UI;

Diff Legend

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