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.345 by root, Sun Aug 13 21:46:10 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;
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) = @_;
… …
1014 1033
1015############################################################################# 1034#############################################################################
1016 1035
1017package CFPlus::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1018 1037
1019our @ISA = CFPlus::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1020 1039
1021sub new { 1040sub new {
1022 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1023 1042
1024 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1025 1044
1026 my $self; 1045 my $self;
1027 1046
1028 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
1029 vertical => 1, 1057 vertical => 1,
1030 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1031 on_changed => sub { 1059 on_changed => sub {
1032 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033 }, 1062 },
1034 ; 1063 ;
1035 1064
1036 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1037 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1038 can_events => 1, 1067 can_events => 1,
1039 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1040 %arg, 1072 %arg,
1041 ); 1073 );
1042 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
1043 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
1044 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1045 1080
1046 $self 1081 $self
1047} 1082}
1048 1083
… …
1057sub invoke_mouse_wheel { 1092sub invoke_mouse_wheel {
1058 my ($self, $ev) = @_; 1093 my ($self, $ev) = @_;
1059 1094
1060 return 0 unless $ev->{dy}; # only vertical movements 1095 return 0 unless $ev->{dy}; # only vertical movements
1061 1096
1062 $self->{slider}->emit (mouse_wheel => $ev); 1097 $self->{vslider}->emit (mouse_wheel => $ev);
1063 1098
1064 1 1099 1
1065} 1100}
1066 1101
1067sub update_slider { 1102sub update_slider {
1068 my ($self) = @_; 1103 my ($self) = @_;
1069 1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1070 $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);
1071} 1114}
1072 1115
1073sub update { 1116sub update {
1074 my ($self) = @_; 1117 my ($self) = @_;
1075 1118
1076 $self->SUPER::update; 1119 $self->SUPER::update;
1077
1078 $self->update_slider; 1120 $self->update_slider;
1079} 1121}
1080 1122
1081sub invoke_size_allocate { 1123sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1083 1125
1084 $self->update_slider; 1126 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1128}
1088 1129
1089############################################################################# 1130#############################################################################
1090 1131
… …
1127} 1168}
1128 1169
1129############################################################################# 1170#############################################################################
1130 1171
1131package 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;
1132 1273
1133our @ISA = CFPlus::UI::Bin::; 1274our @ISA = CFPlus::UI::Bin::;
1134 1275
1135use CFPlus::OpenGL; 1276use CFPlus::OpenGL;
1136 1277
… …
1362sub new { 1503sub new {
1363 my $class = shift; 1504 my $class = shift;
1364 1505
1365 $class->SUPER::new ( 1506 $class->SUPER::new (
1366 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1367 @_, 1509 @_,
1368 ) 1510 )
1369} 1511}
1370 1512
1371sub children { 1513sub children {
… …
1446 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1447 1589
1448 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1449 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1450 1592
1451 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1452 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1453 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1454 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1455 1597
1456 # linearly scale sizes
1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459 1599
1460 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
1461 CFPlus::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1462 1609
1463 my $y; 1610 my $y;
1464 1611
1465 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
… …
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 {
… …
1955 glVertex 0.5 + $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};
1956 glEnd; 2120 glEnd;
1957 } 2121 }
1958} 2122}
1959 2123
2124#############################################################################
2125
1960package CFPlus::UI::Entry; 2126package CFPlus::UI::Entry;
1961 2127
1962our @ISA = CFPlus::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1963 2129
1964use CFPlus::OpenGL; 2130use CFPlus::OpenGL;
… …
1966sub invoke_key_down { 2132sub invoke_key_down {
1967 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1968 2134
1969 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1970 2136
1971 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
1974 2140
1975 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
… …
2006 1 2172 1
2007} 2173}
2008 2174
2009############################################################################# 2175#############################################################################
2010 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
2011package CFPlus::UI::Button; 2216package CFPlus::UI::Button;
2012 2217
2013our @ISA = CFPlus::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
2014 2219
2015use CFPlus::OpenGL; 2220use CFPlus::OpenGL;
… …
2157 or Carp::croak "'path' or 'tex' attributes required"; 2362 or Carp::croak "'path' or 'tex' attributes required";
2158 2363
2159 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2160 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;
2161 2366
2162 Scalar::Util::weaken $texture_cache{$self->{path}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
2163 2368
2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165 2370
2166 $self 2371 $self
2167} 2372}
… …
2540sub invoke_mouse_wheel { 2745sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_; 2746 my ($self, $ev) = @_;
2542 2747
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544 2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546 2753
2547 ! ! $delta 2754 ! ! $delta
2548} 2755}
2549 2756
2550sub update { 2757sub update {
… …
2660 #font => default_font 2867 #font => default_font
2661 @_, 2868 @_,
2662 2869
2663 layout => (new CFPlus::Layout), 2870 layout => (new CFPlus::Layout),
2664 par => [], 2871 par => [],
2872 max_par => 0,
2665 height => 0, 2873 height => 0,
2666 children => [ 2874 children => [
2667 (new CFPlus::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2668 (new CFPlus::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2669 ], 2877 ],
… …
2753} 2961}
2754 2962
2755sub current_paragraph { 2963sub current_paragraph {
2756 my ($self) = @_; 2964 my ($self) = @_;
2757 2965
2758 $self->force_uptodate;
2759 $self->{top_paragraph} - 1 2966 $self->{top_paragraph} - 1
2760} 2967}
2761 2968
2762sub scroll_to { 2969sub scroll_to {
2763 my ($self, $para) = @_; 2970 my ($self, $para) = @_;
2764 2971
2765 $self->force_uptodate;
2766
2767 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; 2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2768 2973
2769 $self->{children}[1]->set_value ($self->{par}[$para]{y}); 2974 $self->{scroll_to} = $para;
2975 $self->update;
2770} 2976}
2771 2977
2772sub clear { 2978sub clear {
2773 my ($self) = @_; 2979 my ($self) = @_;
2774 2980
… …
2796 3002
2797 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2798 push @{$self->{par}}, $para; 3004 push @{$self->{par}}, $para;
2799 } 3005 }
2800 3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
3010
2801 $self->{need_reflow}++; 3011 $self->{need_reflow}++;
2802 $self->update; 3012 $self->update;
2803} 3013}
2804 3014
2805sub scroll_to_bottom { 3015sub scroll_to_bottom {
2806 my ($self) = @_; 3016 my ($self) = @_;
2807 3017
2808 $self->{scroll_to_bottom} = 1; 3018 $self->{scroll_to} = $#{$self->{par}};
2809 $self->update; 3019 $self->update;
2810} 3020}
2811 3021
2812sub force_uptodate { 3022sub force_uptodate {
2813 my ($self) = @_; 3023 my ($self) = @_;
2814 3024
2815 if (delete $self->{need_reflow}) { 3025 if (delete $self->{need_reflow}) {
2816 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2817 3027
2818 my $height = 0; 3028 my $height = 0;
2819 my $paridx;
2820 my $top_paragraph;
2821 my $top = int $self->{children}[1]{range}[0];
2822 3029
2823 for my $para (@{$self->{par}}) { 3030 for my $para (@{$self->{par}}) {
2824 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2825 my $layout = $self->get_layout ($para); 3032 my $layout = $self->get_layout ($para);
2826 my ($w, $h) = $layout->size; 3033 my ($w, $h) = $layout->size;
… …
2829 $para->{h} = $h; 3036 $para->{h} = $h;
2830 $para->{wrapped} = $layout->has_wrapped; 3037 $para->{wrapped} = $layout->has_wrapped;
2831 } 3038 }
2832 3039
2833 $para->{y} = $height; 3040 $para->{y} = $height;
2834
2835 $paridx++;
2836 $top_paragraph ||= $paridx if $height >= $top;
2837
2838 $height += $para->{h}; 3041 $height += $para->{h};
2839 } 3042 }
2840 3043
2841 $self->{top_paragraph} = $top_paragraph;
2842 $self->{height} = $height; 3044 $self->{height} = $height;
2843
2844 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); 3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2845 3046
2846 delete $self->{texture}; 3047 delete $self->{texture};
2847 } 3048 }
2848 3049
2849 if (delete $self->{scroll_to_bottom}) { 3050 if (my $paridx = delete $self->{scroll_to}) {
2850 $self->{children}[1]->set_value (1e10); 3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2851 } 3052 }
2852} 3053}
2853 3054
2854sub update { 3055sub update {
2855 my ($self) = @_; 3056 my ($self) = @_;
… …
2867 3068
2868 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2869 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2870 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2871 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;
2872 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2873 3082
2874 my $y0 = $top; 3083 my $y0 = $top;
2875 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2876 3085
… …
2894 3103
2895 $_->draw; 3104 $_->draw;
2896 } 3105 }
2897 } 3106 }
2898 } 3107 }
3108
3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2899 } 3111 }
3112
3113 $self->{top_paragraph} = $top_paragraph;
2900 }; 3114 };
2901 }); 3115 });
2902} 3116}
2903 3117
2904sub reconfigure { 3118sub reconfigure {
… …
3113 can_events => 0, 3327 can_events => 0,
3114 @_, 3328 @_,
3115 ); 3329 );
3116 3330
3117 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
3118 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
3119 3333
3120 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
3121 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3122 hard => 1, 3336 hard => 1,
3123 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
3124 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
3125 ++$widget->{frame}; 3340 ++$widget->{frame};
3126 $widget->update; 3341 $widget->update;
3127 }, 3342 },
3128 ); 3343 );
3129 } 3344 }
… …
3156 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
3157 3372
3158 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
3159 if $anim && @$anim; 3374 if $anim && @$anim;
3160 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3161 3379
3162 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
3163 3381
3164 if ($tex) { 3382 if ($tex) {
3165 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
3166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3167 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
3168 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3169 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 });
3170 } 3392 }
3171} 3393}
3172 3394
3173sub destroy { 3395sub destroy {
3174 my ($self) = @_; 3396 my ($self) = @_;
… …
3183 3405
3184package CFPlus::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
3185 3407
3186our @ISA = CFPlus::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
3187 3409
3188# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
3189 3411
3190############################################################################# 3412#############################################################################
3191 3413
3192package CFPlus::UI::Menu; 3414package CFPlus::UI::Menu;
3193 3415
3194our @ISA = CFPlus::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
3195 3417
3196use CFPlus::OpenGL; 3418use CFPlus::OpenGL;
3197 3419
3198sub new { 3420sub new {
3199 my $class = shift; 3421 my $class = shift;
… …
3377} 3599}
3378 3600
3379sub add { 3601sub add {
3380 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3381 3603
3382 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3383 3605
3384 $self->{buttonbar}->add (new CFPlus::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3385 markup => $title, 3607 markup => $title,
3386 tooltip => $tooltip, 3608 tooltip => $tooltip,
3387 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
… …
3471 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3472 fontsize => 0.8, 3694 fontsize => 0.8,
3473 @_, 3695 @_,
3474 ); 3696 );
3475 3697
3476 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3477 3699
3478 $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 });
3479 3701
3480 $self 3702 $self
3481} 3703}
… …
3604 $self->SUPER::destroy; 3826 $self->SUPER::destroy;
3605} 3827}
3606 3828
3607############################################################################# 3829#############################################################################
3608 3830
3609package CFPlus::UI::Inventory;
3610
3611our @ISA = CFPlus::UI::Table::;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 col_expand => [0, 1, 0],
3618 items => [],
3619 @_,
3620 );
3621
3622 $self->set_sort_order (undef);
3623
3624 $self
3625}
3626
3627sub update_items {
3628 my ($self) = @_;
3629
3630 $self->clear;
3631
3632 my @item = $self->{sort}->(@{ $self->{items} });
3633
3634 my @adds;
3635 my $row = 0;
3636 for my $item ($self->{sort}->(@{ $self->{items} })) {
3637 CFPlus::Item::update_widgets $item;
3638
3639 push @adds, 0, $row, $item->{face_widget};
3640 push @adds, 1, $row, $item->{desc_widget};
3641 push @adds, 2, $row, $item->{weight_widget};
3642
3643 $row++;
3644 }
3645
3646 $self->add (@adds);
3647}
3648
3649sub set_sort_order {
3650 my ($self, $order) = @_;
3651
3652 $self->{sort} = $order ||= sub {
3653 sort {
3654 $a->{type} <=> $b->{type}
3655 or $a->{name} cmp $b->{name}
3656 } @_
3657 };
3658
3659 $self->update_items;
3660}
3661
3662sub set_items {
3663 my ($self, $items) = @_;
3664
3665 $self->{items} = [$items ? values %$items : ()];
3666 $self->update_items;
3667}
3668
3669#############################################################################
3670
3671package CFPlus::UI::SpellList;
3672
3673our @ISA = CFPlus::UI::Table::;
3674
3675sub new {
3676 my $class = shift;
3677
3678 my $self = $class->SUPER::new (
3679 binding => [],
3680 commands => [],
3681 @_,
3682 )
3683}
3684
3685my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3686
3687my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3691my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3693my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3694 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3695my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3696 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3697
3698sub rebuild_spell_list {
3699 my ($self) = @_;
3700
3701 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3702 $self->clear;
3703
3704 return unless $::CONN;
3705
3706 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3707 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3708 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3709 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3710 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3711
3712 my $row = 0;
3713
3714 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3715 my $spell = $self->{spell}{$_};
3716
3717 $row++;
3718
3719 my $spell_cb = sub {
3720 my ($widget, $ev) = @_;
3721
3722 if ($ev->{button} == 1) {
3723 $::CONN->user_send ("cast $spell->{name}");
3724 } elsif ($ev->{button} == 2) {
3725 $::CONN->user_send ("invoke $spell->{name}");
3726 } elsif ($ev->{button} == 3) {
3727 (new CFPlus::UI::Menu
3728 items => [
3729 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3730 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3731 ],
3732 )->popup ($ev);
3733 } else {
3734 return 0;
3735 }
3736
3737 1
3738 };
3739
3740 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3741
3742 #TODO: add path info to tooltip
3743 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3744
3745 $self->add (0, $row, new CFPlus::UI::Face
3746 face => $spell->{face},
3747 can_hover => 1,
3748 can_events => 1,
3749 tooltip => $tooltip,
3750 on_button_down => $spell_cb,
3751 );
3752
3753 $self->add (1, $row, new CFPlus::UI::Label
3754 expand => 1,
3755 text => $spell->{name},
3756 can_hover => 1,
3757 can_events => 1,
3758 tooltip => $tooltip,
3759 on_button_down => $spell_cb,
3760 );
3761
3762 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3763 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3764 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3765 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3766 }
3767 });
3768}
3769
3770sub add_spell {
3771 my ($self, $spell) = @_;
3772
3773 $self->{spell}->{$spell->{name}} = $spell;
3774 $self->rebuild_spell_list;
3775}
3776
3777sub remove_spell {
3778 my ($self, $spell) = @_;
3779
3780 delete $self->{spell}->{$spell->{name}};
3781 $self->rebuild_spell_list;
3782}
3783
3784sub clear_spells {
3785 my ($self) = @_;
3786
3787 $self->{spell} = {};
3788 $self->rebuild_spell_list;
3789}
3790
3791#############################################################################
3792
3793package CFPlus::UI::Root; 3831package CFPlus::UI::Root;
3794 3832
3795our @ISA = CFPlus::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3796 3834
3797use List::Util qw(min max); 3835use List::Util qw(min max);
… …
3804 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3805 visible => 1, 3843 visible => 1,
3806 @_, 3844 @_,
3807 ); 3845 );
3808 3846
3809 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3810 3848
3811 $self 3849 $self
3812} 3850}
3813 3851
3814sub size_request { 3852sub size_request {
… …
4023 glLoadIdentity; 4061 glLoadIdentity;
4024 4062
4025 { 4063 {
4026 package CFPlus::UI::Base; 4064 package CFPlus::UI::Base;
4027 4065
4028 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4029 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
4030 }
4031 4068
4032 $self->_draw; 4069 $self->_draw;
4070 }
4033} 4071}
4034 4072
4035############################################################################# 4073#############################################################################
4036 4074
4037package CFPlus::UI; 4075package CFPlus::UI;

Diff Legend

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