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.343 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 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
1082 $self->SUPER::add (0, 0, $self->{vp});
1045 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
1046 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
1047 1087
1048 $self 1088 $self
1049} 1089}
1050 1090
… …
1059sub invoke_mouse_wheel { 1099sub invoke_mouse_wheel {
1060 my ($self, $ev) = @_; 1100 my ($self, $ev) = @_;
1061 1101
1062 return 0 unless $ev->{dy}; # only vertical movements 1102 return 0 unless $ev->{dy}; # only vertical movements
1063 1103
1064 $self->{slider}->emit (mouse_wheel => $ev); 1104 $self->{vslider}->emit (mouse_wheel => $ev);
1065 1105
1066 1 1106 1
1067} 1107}
1068 1108
1069sub update_slider { 1109sub update_slider {
1070 my ($self) = @_; 1110 my ($self) = @_;
1071 1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 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]); 1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1073} 1121}
1074 1122
1075sub update { 1123sub update {
1076 my ($self) = @_; 1124 my ($self) = @_;
1077 1125
1078 $self->SUPER::update; 1126 $self->SUPER::update;
1079
1080 $self->update_slider; 1127 $self->update_slider;
1081} 1128}
1082 1129
1083sub invoke_size_allocate { 1130sub invoke_size_allocate {
1084 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1085 1132
1086 $self->update_slider; 1133 $self->update_slider;
1087
1088 $self->SUPER::invoke_size_allocate ($w, $h) 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1089} 1135}
1090 1136
1091############################################################################# 1137#############################################################################
1092 1138
… …
1129} 1175}
1130 1176
1131############################################################################# 1177#############################################################################
1132 1178
1133package CFPlus::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1180
1181our @ISA = CFPlus::UI::Bin::;
1182
1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1134 1280
1135our @ISA = CFPlus::UI::Bin::; 1281our @ISA = CFPlus::UI::Bin::;
1136 1282
1137use CFPlus::OpenGL; 1283use CFPlus::OpenGL;
1138 1284
… …
1364sub new { 1510sub new {
1365 my $class = shift; 1511 my $class = shift;
1366 1512
1367 $class->SUPER::new ( 1513 $class->SUPER::new (
1368 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1369 @_, 1516 @_,
1370 ) 1517 )
1371} 1518}
1372 1519
1373sub children { 1520sub children {
… …
1448 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1449 1596
1450 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1451 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1452 1599
1453 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1454 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1455 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1456 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1457 1604
1458 # linearly scale sizes
1459 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1460 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1461 1606
1462 CFPlus::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1463 CFPlus::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1464 1616
1465 my $y; 1617 my $y;
1466 1618
1467 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
… …
1802 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1803 can_hover => 1, 1955 can_hover => 1,
1804 can_focus => 1, 1956 can_focus => 1,
1805 valign => 0, 1957 valign => 0,
1806 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1807 #text => ... 1960 #text => ...
1808 #hidden => "*", 1961 #hidden => "*",
1809 @_ 1962 @_
1810 ) 1963 )
1811} 1964}
… …
1855 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1856 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1857 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1858 2011
1859 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1860 2015
1861 if ($uni == 8) { 2016 if ($uni == 8) {
1862 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1864 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1865 } elsif ($sym == CFPlus::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1866 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1867 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1868 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1869 } elsif ($sym == CFPlus::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1870 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1871 } elsif ($sym == CFPlus::SDLK_END) {
1872 $self->{cursor} = length $text;
1873 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1874 $self->emit ('escape'); 2040 $self->emit ('escape');
1875 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1876 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1877 } else { 2045 } else {
1878 return 0; 2046 return 0;
1879 } 2047 }
1880 2048
1881 $self->_set_text ($text); 2049 $self->_set_text ($text);
1882 2050
1883 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1884 2053
1885 1 2054 1
1886} 2055}
1887 2056
1888sub invoke_focus_in { 2057sub invoke_focus_in {
… …
1950 utf8::encode $text; 2119 utf8::encode $text;
1951 2120
1952 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953 } 2122 }
1954 2123
1955 glColor @{$self->{fg}};
1956 glBegin GL_LINES; 2124 glBegin GL_LINES;
1957 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1958 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959 glEnd; 2127 glEnd;
1960 } 2128 }
1961} 2129}
2130
2131#############################################################################
1962 2132
1963package CFPlus::UI::Entry; 2133package CFPlus::UI::Entry;
1964 2134
1965our @ISA = CFPlus::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1966 2136
… …
1969sub invoke_key_down { 2139sub invoke_key_down {
1970 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1971 2141
1972 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1973 2143
1974 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1975 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1976 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
1977 2147
1978 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1979 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
… …
2009 1 2179 1
2010} 2180}
2011 2181
2012############################################################################# 2182#############################################################################
2013 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
2014package CFPlus::UI::Button; 2223package CFPlus::UI::Button;
2015 2224
2016our @ISA = CFPlus::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
2017 2226
2018use CFPlus::OpenGL; 2227use CFPlus::OpenGL;
… …
2160 or Carp::croak "'path' or 'tex' attributes required"; 2369 or Carp::croak "'path' or 'tex' attributes required";
2161 2370
2162 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2163 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2164 2373
2165 Scalar::Util::weaken $texture_cache{$self->{path}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
2166 2375
2167 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2168 2377
2169 $self 2378 $self
2170} 2379}
… …
2543sub invoke_mouse_wheel { 2752sub invoke_mouse_wheel {
2544 my ($self, $ev) = @_; 2753 my ($self, $ev) = @_;
2545 2754
2546 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2547 2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2548 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2549 2760
2550 ! ! $delta 2761 ! ! $delta
2551} 2762}
2552 2763
2553sub update { 2764sub update {
… …
2663 #font => default_font 2874 #font => default_font
2664 @_, 2875 @_,
2665 2876
2666 layout => (new CFPlus::Layout), 2877 layout => (new CFPlus::Layout),
2667 par => [], 2878 par => [],
2879 max_par => 0,
2668 height => 0, 2880 height => 0,
2669 children => [ 2881 children => [
2670 (new CFPlus::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2671 (new CFPlus::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2672 ], 2884 ],
… …
2751sub set_offset { 2963sub set_offset {
2752 my ($self, $offset) = @_; 2964 my ($self, $offset) = @_;
2753 2965
2754 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2755 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2968}
2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2756} 2983}
2757 2984
2758sub clear { 2985sub clear {
2759 my ($self) = @_; 2986 my ($self) = @_;
2760 2987
… …
2782 3009
2783 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2784 push @{$self->{par}}, $para; 3011 push @{$self->{par}}, $para;
2785 } 3012 }
2786 3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
2787 $self->{need_reflow}++; 3018 $self->{need_reflow}++;
2788 $self->update; 3019 $self->update;
2789} 3020}
2790 3021
2791sub scroll_to_bottom { 3022sub scroll_to_bottom {
2792 my ($self) = @_; 3023 my ($self) = @_;
2793 3024
2794 $self->{scroll_to_bottom} = 1; 3025 $self->{scroll_to} = $#{$self->{par}};
2795 $self->update; 3026 $self->update;
2796} 3027}
2797 3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
3051 $self->{height} = $height;
3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3053
3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
3060}
3061
2798sub update { 3062sub update {
2799 my ($self) = @_; 3063 my ($self) = @_;
2800 3064
2801 $self->SUPER::update; 3065 $self->SUPER::update;
2802 3066
2803 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2804 3068
2805 delete $self->{texture}; 3069 delete $self->{texture};
2806 3070
2807 $ROOT->on_post_alloc ($self => sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2808 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2809
2810 if (delete $self->{need_reflow}) {
2811 my $height = 0;
2812
2813 for my $para (@{$self->{par}}) {
2814 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2815 my $layout = $self->get_layout ($para);
2816 my ($w, $h) = $layout->size;
2817
2818 $para->{w} = $w + $para->{indent};
2819 $para->{h} = $h;
2820 $para->{wrapped} = $layout->has_wrapped;
2821 }
2822
2823 $height += $para->{h};
2824 }
2825
2826 $self->{height} = $height;
2827
2828 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2829
2830 delete $self->{texture};
2831 }
2832
2833 if (delete $self->{scroll_to_bottom}) {
2834 $self->{children}[1]->set_value (1e10);
2835 }
2836 3075
2837 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2838 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2839 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2840 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2841 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2842 3089
2843 my $y0 = $top; 3090 my $y0 = $top;
2844 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2845 3092
2846 my $y = 0;
2847
2848 for my $para (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2849 my $h = $para->{h}; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2850 3096
2851 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2852
2853 my $layout = $self->get_layout ($para); 3098 my $layout = $self->get_layout ($para);
2854 3099
2855 $layout->render ($para->{indent}, $y - $y0); 3100 $layout->render ($para->{indent}, $y - $y0);
2856 3101
2857 if (my @w = @{ $para->{widget} }) { 3102 if (my @w = @{ $para->{widget} }) {
… …
2866 $_->draw; 3111 $_->draw;
2867 } 3112 }
2868 } 3113 }
2869 } 3114 }
2870 3115
2871 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2872 } 3118 }
3119
3120 $self->{top_paragraph} = $top_paragraph;
2873 }; 3121 };
2874 }); 3122 });
2875} 3123}
2876 3124
2877sub reconfigure { 3125sub reconfigure {
… …
3086 can_events => 0, 3334 can_events => 0,
3087 @_, 3335 @_,
3088 ); 3336 );
3089 3337
3090 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
3091 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
3092 3340
3093 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
3094 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3095 hard => 1, 3343 hard => 1,
3096 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
3097 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
3098 ++$widget->{frame}; 3347 ++$widget->{frame};
3099 $widget->update; 3348 $widget->update;
3100 }, 3349 },
3101 ); 3350 );
3102 } 3351 }
… …
3129 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
3130 3379
3131 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
3132 if $anim && @$anim; 3381 if $anim && @$anim;
3133 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
3134 3386
3135 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
3136 3388
3137 if ($tex) { 3389 if ($tex) {
3138 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
3139 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3140 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
3141 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3142 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
3143 } 3399 }
3144} 3400}
3145 3401
3146sub destroy { 3402sub destroy {
3147 my ($self) = @_; 3403 my ($self) = @_;
… …
3156 3412
3157package CFPlus::UI::Buttonbar; 3413package CFPlus::UI::Buttonbar;
3158 3414
3159our @ISA = CFPlus::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
3160 3416
3161# TODO: should actualyl wrap buttons and other goodies. 3417# TODO: should actually wrap buttons and other goodies.
3162 3418
3163############################################################################# 3419#############################################################################
3164 3420
3165package CFPlus::UI::Menu; 3421package CFPlus::UI::Menu;
3166 3422
3167our @ISA = CFPlus::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
3168 3424
3169use CFPlus::OpenGL; 3425use CFPlus::OpenGL;
3170 3426
3171sub new { 3427sub new {
3172 my $class = shift; 3428 my $class = shift;
… …
3350} 3606}
3351 3607
3352sub add { 3608sub add {
3353 my ($self, $title, $widget, $tooltip) = @_; 3609 my ($self, $title, $widget, $tooltip) = @_;
3354 3610
3355 Scalar::Util::weaken $self; 3611 CFPlus::weaken $self;
3356 3612
3357 $self->{buttonbar}->add (new CFPlus::UI::Button 3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3358 markup => $title, 3614 markup => $title,
3359 tooltip => $tooltip, 3615 tooltip => $tooltip,
3360 on_activate => sub { $self->set_current_page ($widget) }, 3616 on_activate => sub { $self->set_current_page ($widget) },
… …
3444 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3445 fontsize => 0.8, 3701 fontsize => 0.8,
3446 @_, 3702 @_,
3447 ); 3703 );
3448 3704
3449 Scalar::Util::weaken (my $this = $self); 3705 CFPlus::weaken (my $this = $self);
3450 3706
3451 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3452 3708
3453 $self 3709 $self
3454} 3710}
… …
3577 $self->SUPER::destroy; 3833 $self->SUPER::destroy;
3578} 3834}
3579 3835
3580############################################################################# 3836#############################################################################
3581 3837
3582package CFPlus::UI::Inventory;
3583
3584our @ISA = CFPlus::UI::Table::;
3585
3586sub new {
3587 my $class = shift;
3588
3589 my $self = $class->SUPER::new (
3590 col_expand => [0, 1, 0],
3591 items => [],
3592 @_,
3593 );
3594
3595 $self->set_sort_order (undef);
3596
3597 $self
3598}
3599
3600sub update_items {
3601 my ($self) = @_;
3602
3603 $self->clear;
3604
3605 my @item = $self->{sort}->(@{ $self->{items} });
3606
3607 my @adds;
3608 my $row = 0;
3609 for my $item ($self->{sort}->(@{ $self->{items} })) {
3610 CFPlus::Item::update_widgets $item;
3611
3612 push @adds, 0, $row, $item->{face_widget};
3613 push @adds, 1, $row, $item->{desc_widget};
3614 push @adds, 2, $row, $item->{weight_widget};
3615
3616 $row++;
3617 }
3618
3619 $self->add (@adds);
3620}
3621
3622sub set_sort_order {
3623 my ($self, $order) = @_;
3624
3625 $self->{sort} = $order ||= sub {
3626 sort {
3627 $a->{type} <=> $b->{type}
3628 or $a->{name} cmp $b->{name}
3629 } @_
3630 };
3631
3632 $self->update_items;
3633}
3634
3635sub set_items {
3636 my ($self, $items) = @_;
3637
3638 $self->{items} = [$items ? values %$items : ()];
3639 $self->update_items;
3640}
3641
3642#############################################################################
3643
3644package CFPlus::UI::SpellList;
3645
3646our @ISA = CFPlus::UI::Table::;
3647
3648sub new {
3649 my $class = shift;
3650
3651 my $self = $class->SUPER::new (
3652 binding => [],
3653 commands => [],
3654 @_,
3655 )
3656}
3657
3658my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3659
3660my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3661 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3662my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3663 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3664my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3665 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3666my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3667 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3668my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3669 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3670
3671sub rebuild_spell_list {
3672 my ($self) = @_;
3673
3674 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3675 $self->clear;
3676
3677 return unless $::CONN;
3678
3679 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3680 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3681 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3682 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3683 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3684
3685 my $row = 0;
3686
3687 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3688 my $spell = $self->{spell}{$_};
3689
3690 $row++;
3691
3692 my $spell_cb = sub {
3693 my ($widget, $ev) = @_;
3694
3695 if ($ev->{button} == 1) {
3696 $::CONN->user_send ("cast $spell->{name}");
3697 } elsif ($ev->{button} == 2) {
3698 $::CONN->user_send ("invoke $spell->{name}");
3699 } elsif ($ev->{button} == 3) {
3700 (new CFPlus::UI::Menu
3701 items => [
3702 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3703 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3704 ],
3705 )->popup ($ev);
3706 } else {
3707 return 0;
3708 }
3709
3710 1
3711 };
3712
3713 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3714
3715 #TODO: add path info to tooltip
3716 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3717
3718 $self->add (0, $row, new CFPlus::UI::Face
3719 face => $spell->{face},
3720 can_hover => 1,
3721 can_events => 1,
3722 tooltip => $tooltip,
3723 on_button_down => $spell_cb,
3724 );
3725
3726 $self->add (1, $row, new CFPlus::UI::Label
3727 expand => 1,
3728 text => $spell->{name},
3729 can_hover => 1,
3730 can_events => 1,
3731 tooltip => $tooltip,
3732 on_button_down => $spell_cb,
3733 );
3734
3735 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3736 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3737 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3738 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3739 }
3740 });
3741}
3742
3743sub add_spell {
3744 my ($self, $spell) = @_;
3745
3746 $self->{spell}->{$spell->{name}} = $spell;
3747 $self->rebuild_spell_list;
3748}
3749
3750sub remove_spell {
3751 my ($self, $spell) = @_;
3752
3753 delete $self->{spell}->{$spell->{name}};
3754 $self->rebuild_spell_list;
3755}
3756
3757sub clear_spells {
3758 my ($self) = @_;
3759
3760 $self->{spell} = {};
3761 $self->rebuild_spell_list;
3762}
3763
3764#############################################################################
3765
3766package CFPlus::UI::Root; 3838package CFPlus::UI::Root;
3767 3839
3768our @ISA = CFPlus::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3769 3841
3770use List::Util qw(min max); 3842use List::Util qw(min max);
… …
3777 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3778 visible => 1, 3850 visible => 1,
3779 @_, 3851 @_,
3780 ); 3852 );
3781 3853
3782 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3783 3855
3784 $self 3856 $self
3785} 3857}
3786 3858
3787sub size_request { 3859sub size_request {
… …
3996 glLoadIdentity; 4068 glLoadIdentity;
3997 4069
3998 { 4070 {
3999 package CFPlus::UI::Base; 4071 package CFPlus::UI::Base;
4000 4072
4001 ($draw_x, $draw_y, $draw_w, $draw_h) = 4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4002 (0, 0, $self->{w}, $self->{h}); 4074 (0, 0, $self->{w}, $self->{h});
4003 }
4004 4075
4005 $self->_draw; 4076 $self->_draw;
4077 }
4006} 4078}
4007 4079
4008############################################################################# 4080#############################################################################
4009 4081
4010package CFPlus::UI; 4082package CFPlus::UI;

Diff Legend

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