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.344 by root, Sun Aug 13 16:29:36 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 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 ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1070 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1071} 1112}
1072 1113
1073sub update { 1114sub update {
1074 my ($self) = @_; 1115 my ($self) = @_;
1075 1116
1076 $self->SUPER::update; 1117 $self->SUPER::update;
1077
1078 $self->update_slider; 1118 $self->update_slider;
1079} 1119}
1080 1120
1081sub invoke_size_allocate { 1121sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1083 1123
1084 $self->update_slider; 1124 $self->update_slider;
1085
1086 $self->SUPER::invoke_size_allocate ($w, $h) 1125 $self->SUPER::invoke_size_allocate ($w, $h)
1087} 1126}
1088 1127
1089############################################################################# 1128#############################################################################
1090 1129
… …
1127} 1166}
1128 1167
1129############################################################################# 1168#############################################################################
1130 1169
1131package CFPlus::UI::FancyFrame; 1170package CFPlus::UI::FancyFrame;
1171
1172our @ISA = CFPlus::UI::Bin::;
1173
1174use CFPlus::OpenGL;
1175
1176sub new {
1177 my ($class, %arg) = @_;
1178
1179 if ((exists $arg{label}) && !ref $arg{label}) {
1180 $arg{label} = new CFPlus::UI::Label
1181 align => 1,
1182 valign => 0,
1183 text => $arg{label},
1184 fontsize => ($arg{border} || 0.8) * 0.75;
1185 }
1186
1187 my $self = $class->SUPER::new (
1188 # label => "",
1189 fg => [0.6, 0.3, 0.1],
1190 border => 0.8,
1191 style => 'single',
1192 %arg,
1193 );
1194
1195 $self
1196}
1197
1198sub add {
1199 my ($self, @widgets) = @_;
1200
1201 $self->SUPER::add (@widgets);
1202 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1203}
1204
1205sub border {
1206 int $_[0]{border} * $::FONTSIZE
1207}
1208
1209sub size_request {
1210 my ($self) = @_;
1211
1212 ($self->{label_w}, undef) = $self->{label}->size_request
1213 if $self->{label};
1214
1215 my ($w, $h) = $self->SUPER::size_request;
1216
1217 (
1218 $w + $self->border * 2,
1219 $h + $self->border * 2,
1220 )
1221}
1222
1223sub invoke_size_allocate {
1224 my ($self, $w, $h) = @_;
1225
1226 my $border = $self->border;
1227
1228 $w -= List::Util::max 0, $border * 2;
1229 $h -= List::Util::max 0, $border * 2;
1230
1231 if (my $label = $self->{label}) {
1232 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1233 $label->{h} = List::Util::min $h, $border;
1234 $label->invoke_size_allocate ($label->{w}, $label->{h});
1235 }
1236
1237 $self->child->configure ($border, $border, $w, $h);
1238
1239 1
1240}
1241
1242sub _draw {
1243 my ($self) = @_;
1244
1245 my $child = $self->{children}[0];
1246
1247 my $border = $self->border;
1248 my ($w, $h) = ($self->{w}, $self->{h});
1249
1250 $child->draw;
1251
1252 glColor @{$self->{fg}};
1253 glBegin GL_LINE_STRIP;
1254 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1255 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1256 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1257 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1258 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1259 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1260 glEnd;
1261
1262 if ($self->{label}) {
1263 glTranslate $border * 2, 0;
1264 $self->{label}->_draw;
1265 }
1266}
1267
1268#############################################################################
1269
1270package CFPlus::UI::Toplevel;
1132 1271
1133our @ISA = CFPlus::UI::Bin::; 1272our @ISA = CFPlus::UI::Bin::;
1134 1273
1135use CFPlus::OpenGL; 1274use CFPlus::OpenGL;
1136 1275
… …
1362sub new { 1501sub new {
1363 my $class = shift; 1502 my $class = shift;
1364 1503
1365 $class->SUPER::new ( 1504 $class->SUPER::new (
1366 col_expand => [], 1505 col_expand => [],
1506 row_expand => [],
1367 @_, 1507 @_,
1368 ) 1508 )
1369} 1509}
1370 1510
1371sub children { 1511sub children {
… …
1446 my ($ws, $hs) = $self->get_wh; 1586 my ($ws, $hs) = $self->get_wh;
1447 1587
1448 my $req_w = (sum @$ws) || 1; 1588 my $req_w = (sum @$ws) || 1;
1449 my $req_h = (sum @$hs) || 1; 1589 my $req_h = (sum @$hs) || 1;
1450 1590
1451 # TODO: nicer code && do row_expand 1591 # TODO: nicer code
1452 my @col_expand = @{$self->{col_expand}}; 1592 my @col_expand = @{$self->{col_expand}};
1453 @col_expand = (1) x @$ws unless @col_expand; 1593 @col_expand = (1) x @$ws unless @col_expand;
1454 my $col_expand = (sum @col_expand) || 1; 1594 my $col_expand = (sum @col_expand) || 1;
1455 1595
1456 # linearly scale sizes
1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459 1597
1460 CFPlus::UI::harmonize $ws; 1598 CFPlus::UI::harmonize $ws;
1599
1600 my @row_expand = @{$self->{row_expand}};
1601 @row_expand = (1) x @$ws unless @row_expand;
1602 my $row_expand = (sum @row_expand) || 1;
1603
1604 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605
1461 CFPlus::UI::harmonize $hs; 1606 CFPlus::UI::harmonize $hs;
1462 1607
1463 my $y; 1608 my $y;
1464 1609
1465 for my $r (0 .. $#{$self->{children}}) { 1610 for my $r (0 .. $#{$self->{children}}) {
… …
1800 active_fg => [0, 0, 0], 1945 active_fg => [0, 0, 0],
1801 can_hover => 1, 1946 can_hover => 1,
1802 can_focus => 1, 1947 can_focus => 1,
1803 valign => 0, 1948 valign => 0,
1804 can_events => 1, 1949 can_events => 1,
1950 ellipsise => 0,
1805 #text => ... 1951 #text => ...
1806 #hidden => "*", 1952 #hidden => "*",
1807 @_ 1953 @_
1808 ) 1954 )
1809} 1955}
… …
1853 my $mod = $ev->{mod}; 1999 my $mod = $ev->{mod};
1854 my $sym = $ev->{sym}; 2000 my $sym = $ev->{sym};
1855 my $uni = $ev->{unicode}; 2001 my $uni = $ev->{unicode};
1856 2002
1857 my $text = $self->get_text; 2003 my $text = $self->get_text;
2004
2005 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1858 2006
1859 if ($uni == 8) { 2007 if ($uni == 8) {
1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861 } elsif ($uni == 127) { 2009 } elsif ($uni == 127) {
1862 substr $text, $self->{cursor}, 1, ""; 2010 substr $text, $self->{cursor}, 1, "";
1863 } elsif ($sym == CFPlus::SDLK_LEFT) { 2011 } elsif ($sym == CFPlus::SDLK_LEFT) {
1864 --$self->{cursor} if $self->{cursor}; 2012 --$self->{cursor} if $self->{cursor};
1865 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2013 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2014 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 2015 } elsif ($sym == CFPlus::SDLK_HOME) {
2016 # what a hack
2017 $self->{cursor} =
2018 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2019 ? length $1
2020 : 0;
2021 } elsif ($sym == CFPlus::SDLK_END) {
2022 # uh, again
2023 $self->{cursor} =
2024 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2025 ? $self->{cursor} + length $1
2026 : length $self->{text};
2027 } elsif ($uni == 21) { # ctrl-u
2028 $text = "";
1868 $self->{cursor} = 0; 2029 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text;
1871 } elsif ($uni == 27) { 2030 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 2031 $self->emit ('escape');
1873 } elsif ($uni) { 2032 } elsif ($uni == 0x0d) {
2033 substr $text, $self->{cursor}++, 0, "\012";
2034 } elsif ($uni >= 0x20) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 2035 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 2036 } else {
1876 return 0; 2037 return 0;
1877 } 2038 }
1878 2039
1879 $self->_set_text ($text); 2040 $self->_set_text ($text);
1880 2041
1881 $self->realloc; 2042 $self->realloc;
2043 $self->update;
1882 2044
1883 1 2045 1
1884} 2046}
1885 2047
1886sub invoke_focus_in { 2048sub invoke_focus_in {
… …
1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2117 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1956 glEnd; 2118 glEnd;
1957 } 2119 }
1958} 2120}
1959 2121
2122#############################################################################
2123
1960package CFPlus::UI::Entry; 2124package CFPlus::UI::Entry;
1961 2125
1962our @ISA = CFPlus::UI::EntryBase::; 2126our @ISA = CFPlus::UI::EntryBase::;
1963 2127
1964use CFPlus::OpenGL; 2128use CFPlus::OpenGL;
… …
1966sub invoke_key_down { 2130sub invoke_key_down {
1967 my ($self, $ev) = @_; 2131 my ($self, $ev) = @_;
1968 2132
1969 my $sym = $ev->{sym}; 2133 my $sym = $ev->{sym};
1970 2134
1971 if ($sym == 13) { 2135 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2136 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2137 my $txt = $self->get_text;
1974 2138
1975 $self->{history_pointer} = -1; 2139 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2140 $self->{history_saveback} = '';
… …
2006 1 2170 1
2007} 2171}
2008 2172
2009############################################################################# 2173#############################################################################
2010 2174
2175package CFPlus::UI::TextEdit;
2176
2177our @ISA = CFPlus::UI::EntryBase::;
2178
2179use CFPlus::OpenGL;
2180
2181sub move_cursor_ver {
2182 my ($self, $dy) = @_;
2183
2184 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2185
2186 $y += $dy;
2187
2188 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2189 $self->{cursor} = $index;
2190 delete $self->{cur_h};
2191 $self->update;
2192 return;
2193 }
2194}
2195
2196sub invoke_key_down {
2197 my ($self, $ev) = @_;
2198
2199 my $sym = $ev->{sym};
2200
2201 if ($sym == CFPlus::SDLK_UP) {
2202 $self->move_cursor_ver (-1);
2203 } elsif ($sym == CFPlus::SDLK_DOWN) {
2204 $self->move_cursor_ver (+1);
2205 } else {
2206 return $self->SUPER::invoke_key_down ($ev)
2207 }
2208
2209 1
2210}
2211
2212#############################################################################
2213
2011package CFPlus::UI::Button; 2214package CFPlus::UI::Button;
2012 2215
2013our @ISA = CFPlus::UI::Label::; 2216our @ISA = CFPlus::UI::Label::;
2014 2217
2015use CFPlus::OpenGL; 2218use CFPlus::OpenGL;
… …
2157 or Carp::croak "'path' or 'tex' attributes required"; 2360 or Carp::croak "'path' or 'tex' attributes required";
2158 2361
2159 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2362 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2363 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2161 2364
2162 Scalar::Util::weaken $texture_cache{$self->{path}}; 2365 CFPlus::weaken $texture_cache{$self->{path}};
2163 2366
2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165 2368
2166 $self 2369 $self
2167} 2370}
… …
2540sub invoke_mouse_wheel { 2743sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_; 2744 my ($self, $ev) = @_;
2542 2745
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2746 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544 2747
2748 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2749
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2750 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546 2751
2547 ! ! $delta 2752 ! ! $delta
2548} 2753}
2549 2754
2550sub update { 2755sub update {
… …
2660 #font => default_font 2865 #font => default_font
2661 @_, 2866 @_,
2662 2867
2663 layout => (new CFPlus::Layout), 2868 layout => (new CFPlus::Layout),
2664 par => [], 2869 par => [],
2870 max_par => 0,
2665 height => 0, 2871 height => 0,
2666 children => [ 2872 children => [
2667 (new CFPlus::UI::Empty expand => 1), 2873 (new CFPlus::UI::Empty expand => 1),
2668 (new CFPlus::UI::Slider vertical => 1), 2874 (new CFPlus::UI::Slider vertical => 1),
2669 ], 2875 ],
… …
2748sub set_offset { 2954sub set_offset {
2749 my ($self, $offset) = @_; 2955 my ($self, $offset) = @_;
2750 2956
2751 # todo: base offset on lines or so, not on pixels 2957 # todo: base offset on lines or so, not on pixels
2752 $self->{children}[1]->set_value ($offset); 2958 $self->{children}[1]->set_value ($offset);
2959}
2960
2961sub current_paragraph {
2962 my ($self) = @_;
2963
2964 $self->{top_paragraph} - 1
2965}
2966
2967sub scroll_to {
2968 my ($self, $para) = @_;
2969
2970 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2971
2972 $self->{scroll_to} = $para;
2973 $self->update;
2753} 2974}
2754 2975
2755sub clear { 2976sub clear {
2756 my ($self) = @_; 2977 my ($self) = @_;
2757 2978
… …
2779 3000
2780 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3001 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2781 push @{$self->{par}}, $para; 3002 push @{$self->{par}}, $para;
2782 } 3003 }
2783 3004
3005 if (my $max = $self->{max_par}) {
3006 shift @{$self->{par}} while @{$self->{par}} > $max;
3007 }
3008
2784 $self->{need_reflow}++; 3009 $self->{need_reflow}++;
2785 $self->update; 3010 $self->update;
2786} 3011}
2787 3012
2788sub scroll_to_bottom { 3013sub scroll_to_bottom {
2789 my ($self) = @_; 3014 my ($self) = @_;
2790 3015
2791 $self->{scroll_to_bottom} = 1; 3016 $self->{scroll_to} = $#{$self->{par}};
2792 $self->update; 3017 $self->update;
2793} 3018}
2794 3019
3020sub force_uptodate {
3021 my ($self) = @_;
3022
3023 if (delete $self->{need_reflow}) {
3024 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3025
3026 my $height = 0;
3027
3028 for my $para (@{$self->{par}}) {
3029 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3030 my $layout = $self->get_layout ($para);
3031 my ($w, $h) = $layout->size;
3032
3033 $para->{w} = $w + $para->{indent};
3034 $para->{h} = $h;
3035 $para->{wrapped} = $layout->has_wrapped;
3036 }
3037
3038 $para->{y} = $height;
3039 $height += $para->{h};
3040 }
3041
3042 $self->{height} = $height;
3043 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3044
3045 delete $self->{texture};
3046 }
3047
3048 if (my $paridx = delete $self->{scroll_to}) {
3049 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3050 }
3051}
3052
2795sub update { 3053sub update {
2796 my ($self) = @_; 3054 my ($self) = @_;
2797 3055
2798 $self->SUPER::update; 3056 $self->SUPER::update;
2799 3057
2800 return unless $self->{h} > 0; 3058 return unless $self->{h} > 0;
2801 3059
2802 delete $self->{texture}; 3060 delete $self->{texture};
2803 3061
2804 $ROOT->on_post_alloc ($self => sub { 3062 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate;
3064
2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2806
2807 if (delete $self->{need_reflow}) {
2808 my $height = 0;
2809
2810 for my $para (@{$self->{par}}) {
2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2812 my $layout = $self->get_layout ($para);
2813 my ($w, $h) = $layout->size;
2814
2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2818 }
2819
2820 $height += $para->{h};
2821 }
2822
2823 $self->{height} = $height;
2824
2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2826
2827 delete $self->{texture};
2828 }
2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833 3066
2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2835 glClearColor 0, 0, 0, 0; 3068 glClearColor 0, 0, 0, 0;
2836 glClear GL_COLOR_BUFFER_BIT; 3069 glClear GL_COLOR_BUFFER_BIT;
2837 3070
3071 package CFPlus::UI::Base;
3072 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3073 (0, 0, $self->{w}, $self->{h});
3074
3075 my $top = int $self->{children}[1]{range}[0];
3076
3077 my $paridx = 0;
3078 my $top_paragraph;
2838 my $top = int $self->{children}[1]{range}[0]; 3079 my $top = int $self->{children}[1]{range}[0];
2839 3080
2840 my $y0 = $top; 3081 my $y0 = $top;
2841 my $y1 = $top + $H; 3082 my $y1 = $top + $H;
2842 3083
2843 my $y = 0;
2844
2845 for my $para (@{$self->{par}}) { 3084 for my $para (@{$self->{par}}) {
2846 my $h = $para->{h}; 3085 my $h = $para->{h};
3086 my $y = $para->{y};
2847 3087
2848 if ($y0 < $y + $h && $y < $y1) { 3088 if ($y0 < $y + $h && $y < $y1) {
2849
2850 my $layout = $self->get_layout ($para); 3089 my $layout = $self->get_layout ($para);
2851 3090
2852 $layout->render ($para->{indent}, $y - $y0); 3091 $layout->render ($para->{indent}, $y - $y0);
2853 3092
2854 if (my @w = @{ $para->{widget} }) { 3093 if (my @w = @{ $para->{widget} }) {
… …
2863 $_->draw; 3102 $_->draw;
2864 } 3103 }
2865 } 3104 }
2866 } 3105 }
2867 3106
2868 $y += $h; 3107 $paridx++;
3108 $top_paragraph ||= $paridx if $y >= $top;
2869 } 3109 }
3110
3111 $self->{top_paragraph} = $top_paragraph;
2870 }; 3112 };
2871 }); 3113 });
2872} 3114}
2873 3115
2874sub reconfigure { 3116sub reconfigure {
… …
3083 can_events => 0, 3325 can_events => 0,
3084 @_, 3326 @_,
3085 ); 3327 );
3086 3328
3087 if ($self->{anim} && $self->{animspeed}) { 3329 if ($self->{anim} && $self->{animspeed}) {
3088 Scalar::Util::weaken (my $widget = $self); 3330 CFPlus::weaken (my $widget = $self);
3089 3331
3090 $self->{timer} = Event->timer ( 3332 $self->{timer} = Event->timer (
3091 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3092 hard => 1, 3334 hard => 1,
3093 interval => $self->{animspeed}, 3335 interval => $self->{animspeed},
… …
3153 3395
3154package CFPlus::UI::Buttonbar; 3396package CFPlus::UI::Buttonbar;
3155 3397
3156our @ISA = CFPlus::UI::HBox::; 3398our @ISA = CFPlus::UI::HBox::;
3157 3399
3158# TODO: should actualyl wrap buttons and other goodies. 3400# TODO: should actually wrap buttons and other goodies.
3159 3401
3160############################################################################# 3402#############################################################################
3161 3403
3162package CFPlus::UI::Menu; 3404package CFPlus::UI::Menu;
3163 3405
3164our @ISA = CFPlus::UI::FancyFrame::; 3406our @ISA = CFPlus::UI::Toplevel::;
3165 3407
3166use CFPlus::OpenGL; 3408use CFPlus::OpenGL;
3167 3409
3168sub new { 3410sub new {
3169 my $class = shift; 3411 my $class = shift;
… …
3347} 3589}
3348 3590
3349sub add { 3591sub add {
3350 my ($self, $title, $widget, $tooltip) = @_; 3592 my ($self, $title, $widget, $tooltip) = @_;
3351 3593
3352 Scalar::Util::weaken $self; 3594 CFPlus::weaken $self;
3353 3595
3354 $self->{buttonbar}->add (new CFPlus::UI::Button 3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3355 markup => $title, 3597 markup => $title,
3356 tooltip => $tooltip, 3598 tooltip => $tooltip,
3357 on_activate => sub { $self->set_current_page ($widget) }, 3599 on_activate => sub { $self->set_current_page ($widget) },
… …
3441 my $self = $class->SUPER::new ( 3683 my $self = $class->SUPER::new (
3442 fontsize => 0.8, 3684 fontsize => 0.8,
3443 @_, 3685 @_,
3444 ); 3686 );
3445 3687
3446 Scalar::Util::weaken (my $this = $self); 3688 CFPlus::weaken (my $this = $self);
3447 3689
3448 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3449 3691
3450 $self 3692 $self
3451} 3693}
… …
3574 $self->SUPER::destroy; 3816 $self->SUPER::destroy;
3575} 3817}
3576 3818
3577############################################################################# 3819#############################################################################
3578 3820
3579package CFPlus::UI::Inventory;
3580
3581our @ISA = CFPlus::UI::Table::;
3582
3583sub new {
3584 my $class = shift;
3585
3586 my $self = $class->SUPER::new (
3587 col_expand => [0, 1, 0],
3588 items => [],
3589 @_,
3590 );
3591
3592 $self->set_sort_order (undef);
3593
3594 $self
3595}
3596
3597sub update_items {
3598 my ($self) = @_;
3599
3600 $self->clear;
3601
3602 my @item = $self->{sort}->(@{ $self->{items} });
3603
3604 my @adds;
3605 my $row = 0;
3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3607 CFPlus::Item::update_widgets $item;
3608
3609 push @adds, 0, $row, $item->{face_widget};
3610 push @adds, 1, $row, $item->{desc_widget};
3611 push @adds, 2, $row, $item->{weight_widget};
3612
3613 $row++;
3614 }
3615
3616 $self->add (@adds);
3617}
3618
3619sub set_sort_order {
3620 my ($self, $order) = @_;
3621
3622 $self->{sort} = $order ||= sub {
3623 sort {
3624 $a->{type} <=> $b->{type}
3625 or $a->{name} cmp $b->{name}
3626 } @_
3627 };
3628
3629 $self->update_items;
3630}
3631
3632sub set_items {
3633 my ($self, $items) = @_;
3634
3635 $self->{items} = [$items ? values %$items : ()];
3636 $self->update_items;
3637}
3638
3639#############################################################################
3640
3641package CFPlus::UI::SpellList;
3642
3643our @ISA = CFPlus::UI::Table::;
3644
3645sub new {
3646 my $class = shift;
3647
3648 my $self = $class->SUPER::new (
3649 binding => [],
3650 commands => [],
3651 @_,
3652 )
3653}
3654
3655my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3656
3657my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3659my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3665my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3667
3668sub rebuild_spell_list {
3669 my ($self) = @_;
3670
3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3672 $self->clear;
3673
3674 return unless $::CONN;
3675
3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3681
3682 my $row = 0;
3683
3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3685 my $spell = $self->{spell}{$_};
3686
3687 $row++;
3688
3689 my $spell_cb = sub {
3690 my ($widget, $ev) = @_;
3691
3692 if ($ev->{button} == 1) {
3693 $::CONN->user_send ("cast $spell->{name}");
3694 } elsif ($ev->{button} == 2) {
3695 $::CONN->user_send ("invoke $spell->{name}");
3696 } elsif ($ev->{button} == 3) {
3697 (new CFPlus::UI::Menu
3698 items => [
3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3701 ],
3702 )->popup ($ev);
3703 } else {
3704 return 0;
3705 }
3706
3707 1
3708 };
3709
3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3711
3712 #TODO: add path info to tooltip
3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3714
3715 $self->add (0, $row, new CFPlus::UI::Face
3716 face => $spell->{face},
3717 can_hover => 1,
3718 can_events => 1,
3719 tooltip => $tooltip,
3720 on_button_down => $spell_cb,
3721 );
3722
3723 $self->add (1, $row, new CFPlus::UI::Label
3724 expand => 1,
3725 text => $spell->{name},
3726 can_hover => 1,
3727 can_events => 1,
3728 tooltip => $tooltip,
3729 on_button_down => $spell_cb,
3730 );
3731
3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3736 }
3737 });
3738}
3739
3740sub add_spell {
3741 my ($self, $spell) = @_;
3742
3743 $self->{spell}->{$spell->{name}} = $spell;
3744 $self->rebuild_spell_list;
3745}
3746
3747sub remove_spell {
3748 my ($self, $spell) = @_;
3749
3750 delete $self->{spell}->{$spell->{name}};
3751 $self->rebuild_spell_list;
3752}
3753
3754sub clear_spells {
3755 my ($self) = @_;
3756
3757 $self->{spell} = {};
3758 $self->rebuild_spell_list;
3759}
3760
3761#############################################################################
3762
3763package CFPlus::UI::Root; 3821package CFPlus::UI::Root;
3764 3822
3765our @ISA = CFPlus::UI::Container::; 3823our @ISA = CFPlus::UI::Container::;
3766 3824
3767use List::Util qw(min max); 3825use List::Util qw(min max);
… …
3774 my $self = $class->SUPER::new ( 3832 my $self = $class->SUPER::new (
3775 visible => 1, 3833 visible => 1,
3776 @_, 3834 @_,
3777 ); 3835 );
3778 3836
3779 Scalar::Util::weaken ($self->{root} = $self); 3837 CFPlus::weaken ($self->{root} = $self);
3780 3838
3781 $self 3839 $self
3782} 3840}
3783 3841
3784sub size_request { 3842sub size_request {
… …
3993 glLoadIdentity; 4051 glLoadIdentity;
3994 4052
3995 { 4053 {
3996 package CFPlus::UI::Base; 4054 package CFPlus::UI::Base;
3997 4055
3998 ($draw_x, $draw_y, $draw_w, $draw_h) = 4056 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3999 (0, 0, $self->{w}, $self->{h}); 4057 (0, 0, $self->{w}, $self->{h});
4000 }
4001 4058
4002 $self->_draw; 4059 $self->_draw;
4060 }
4003} 4061}
4004 4062
4005############################################################################# 4063#############################################################################
4006 4064
4007package CFPlus::UI; 4065package CFPlus::UI;

Diff Legend

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