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.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

… …
26 26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
31 } 33 }
32 34
33 $layout 35 $layout
34} 36}
35 37
36sub set_layout { 38sub set_layout {
37 my ($layout) = @_; 39 my ($layout) = @_;
40
38 $LAYOUT = $layout; 41 $LAYOUT = $layout;
39} 42}
40 43
41sub check_tooltip { 44sub check_tooltip {
42 if (!$GRAB) { 45 if (!$GRAB) {
… …
207 h => undef, 210 h => undef,
208 can_events => 1, 211 can_events => 1,
209 @_ 212 @_
210 }, $class; 213 }, $class;
211 214
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223 216
224 for (keys %$self) { 217 for (keys %$self) {
225 if (/^on_(.*)$/) { 218 if (/^on_(.*)$/) {
226 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
227 } 220 }
228 } 221 }
229 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
230 $self 235 $self
231} 236}
232 237
233sub destroy { 238sub destroy {
234 my ($self) = @_; 239 my ($self) = @_;
… …
350 $self->{x} = $x; 355 $self->{x} = $x;
351 $self->{y} = $y; 356 $self->{y} = $y;
352 $self->update; 357 $self->update;
353 } 358 }
354 359
355 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356 return unless $self->{visible}; 361 return unless $self->{visible};
357 362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 366 $self->{root}{size_alloc}{$self+0} = $self;
359 } 367 }
360} 368}
361 369
362sub size_allocate { 370sub size_allocate {
363 # nothing to be done 371 # nothing to be done
… …
463 471
464sub set_parent { 472sub set_parent {
465 my ($self, $parent) = @_; 473 my ($self, $parent) = @_;
466 474
467 Scalar::Util::weaken ($self->{parent} = $parent); 475 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 476 $self->set_visible if $parent->{visible};
470} 477}
471 478
472sub connect { 479sub connect {
473 my ($self, $signal, $cb) = @_; 480 my ($self, $signal, $cb) = @_;
… …
494 501
495sub realloc { 502sub realloc {
496 my ($self) = @_; 503 my ($self) = @_;
497 504
498 if ($self->{visible}) { 505 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 506 return if $self->{root}{realloc}{$self+0};
500 507
501 $self->{root}{realloc}{$self} = $self; 508 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 509 $self->{root}->update;
503 } else { 510 } else {
504 delete $self->{req_w}; 511 delete $self->{req_w};
512 delete $self->{req_h};
505 } 513 }
506} 514}
507 515
508sub update { 516sub update {
509 my ($self) = @_; 517 my ($self) = @_;
… …
542 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
543 glEnd; 551 glEnd;
544 glDisable GL_BLEND; 552 glDisable GL_BLEND;
545 } 553 }
546 554
547 if ($ENV{CFPLUS_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 556 glPushMatrix;
549 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
551 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
761sub size_request { 769sub size_request {
762 $_[0]{children}[0]->size_request 770 $_[0]{children}[0]->size_request
763} 771}
764 772
765sub size_allocate { 773sub size_allocate {
766 my ($self, $w, $h, $changed) = @_; 774 my ($self, $w, $h) = @_;
767 775
768 $self->{children}[0]->configure (0, 0, $w, $h); 776 $self->{children}[0]->configure (0, 0, $w, $h);
769} 777}
770 778
771############################################################################# 779#############################################################################
… …
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 797 $self->SUPER::update;
790} 798}
791 799
792sub size_allocate { 800sub size_allocate {
793 my ($self, $w, $h, $changed) = @_; 801 my ($self, $w, $h) = @_;
794 802
795 $self->SUPER::size_allocate ($w, $h, $changed); 803 $self->SUPER::size_allocate ($w, $h);
796 $self->update 804 $self->update;
797 if $changed;
798} 805}
799 806
800sub _render { 807sub _render {
801 $_[0]{children}[0]->draw; 808 $_[0]{children}[0]->draw;
802} 809}
… …
846} 853}
847 854
848sub size_request { 855sub size_request {
849 my ($self) = @_; 856 my ($self) = @_;
850 857
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 859
853 $w = 10 if $self->{scroll_x}; 860 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 861 $h = 10 if $self->{scroll_y};
855 862
856 ($w, $h) 863 ($w, $h)
857} 864}
858 865
859sub size_allocate { 866sub size_allocate {
860 my ($self, $w, $h, $changed) = @_; 867 my ($self, $w, $h) = @_;
861 868
869 my $child = $self->child;
870
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 873
865 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
866 $self->update; 875 $self->update;
867} 876}
868 877
… …
952 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954} 963}
955 964
956sub size_allocate { 965sub size_allocate {
957 my ($self, $w, $h, $changed) = @_; 966 my ($self, $w, $h) = @_;
958 967
959 $self->SUPER::size_allocate ($w, $h, $changed); 968 $self->SUPER::size_allocate ($w, $h);
960 969
961 my $child = $self->{vp}->child; 970 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 972}
964 973
… …
1027 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1039 border => 0.6,
1031 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1032 @_ 1043 @_
1033 ); 1044 );
1034 1045
1035 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
1036 align => 0, 1047 align => 0,
… …
1055 $h + $self->border * 2, 1066 $h + $self->border * 2,
1056 ) 1067 )
1057} 1068}
1058 1069
1059sub size_allocate { 1070sub size_allocate {
1060 my ($self, $w, $h, $changed) = @_; 1071 my ($self, $w, $h) = @_;
1061
1062 return unless $changed;
1063 1072
1064 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
1065 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
1066 1075
1067 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1239 (sum @$hs), 1248 (sum @$hs),
1240 ) 1249 )
1241} 1250}
1242 1251
1243sub size_allocate { 1252sub size_allocate {
1244 my ($self, $w, $h, $changed) = @_; 1253 my ($self, $w, $h) = @_;
1245 1254
1246 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
1247 1256
1248 my $req_w = (sum @$ws) || 1; 1257 my $req_w = (sum @$ws) || 1;
1249 my $req_h = (sum @$hs) || 1; 1258 my $req_h = (sum @$hs) || 1;
… …
1327 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1328 ) 1337 )
1329} 1338}
1330 1339
1331sub size_allocate { 1340sub size_allocate {
1332 my ($self, $w, $h, $changed) = @_; 1341 my ($self, $w, $h) = @_;
1333 1342
1334 my $space = $self->{vertical} ? $h : $w; 1343 my $space = $self->{vertical} ? $h : $w;
1335 my $children = $self->{children}; 1344 my $children = $self->{children};
1336 1345
1337 my @req; 1346 my @req;
… …
1420 ellipsise => 3, # end 1429 ellipsise => 3, # end
1421 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1422 fontsize => 1, 1431 fontsize => 1,
1423 align => -1, 1432 align => -1,
1424 valign => -1, 1433 valign => -1,
1425 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1426 can_events => 0, 1436 can_events => 0,
1427 %arg 1437 %arg
1428 ); 1438 );
1429 1439
1430 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1506 1516
1507 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1509 } 1519 }
1510 1520
1511 ( 1521 ($w, $h)
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1522}
1516 1523
1517sub size_allocate { 1524sub size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1525 my ($self, $w, $h) = @_;
1519 1526
1520 delete $self->{texture} 1527 delete $self->{texture}
1521 if $changed; 1528 ;#d#
1522} 1529}
1523 1530
1524sub set_fontsize { 1531sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1526 1533
… …
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1552
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1547 1554
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1557 : ($self->{w} - $tex->{w}) * 0.5);
1551 1558
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1561 : ($self->{h} - $tex->{h}) * 0.5);
1555 1562
1556 $tex 1563 $tex
1557 }; 1564 };
1558 1565
… …
1797 1804
1798sub new { 1805sub new {
1799 my $class = shift; 1806 my $class = shift;
1800 1807
1801 $class->SUPER::new ( 1808 $class->SUPER::new (
1802 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1803 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1805 can_hover => 1, 1813 can_hover => 1,
1806 align => 0, 1814 align => 0,
1807 valign => 0, 1815 valign => 0,
… …
1854 1862
1855sub new { 1863sub new {
1856 my $class = shift; 1864 my $class = shift;
1857 1865
1858 $class->SUPER::new ( 1866 $class->SUPER::new (
1859 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1860 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 1871 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 1872 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 1873 state => 0,
… …
1868} 1877}
1869 1878
1870sub size_request { 1879sub size_request {
1871 my ($self) = @_; 1880 my ($self) = @_;
1872 1881
1873 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1874} 1883}
1875 1884
1876sub button_down { 1885sub button_down {
1877 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1878 1887
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1883 } 1892 }
1884} 1893}
1885 1894
1886sub _draw { 1895sub _draw {
1887 my ($self) = @_; 1896 my ($self) = @_;
1888 1897
1889 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1890 1899
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 1901
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 1905
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 1907
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 1909
… …
2374 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
2375 $self->reflow; 2386 $self->reflow;
2376} 2387}
2377 2388
2378sub size_allocate { 2389sub size_allocate {
2379 my ($self, $w, $h, $changed) = @_; 2390 my ($self, $w, $h) = @_;
2380 2391
2381 $self->SUPER::size_allocate ($w, $h, $changed); 2392 $self->SUPER::size_allocate ($w, $h);
2382
2383 return unless $changed;
2384 2393
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2394 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
2388 2397
… …
2611} 2620}
2612 2621
2613sub set_tooltip_from { 2622sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2623 my ($self, $widget) = @_;
2615 2624
2625 my $tooltip = $widget->{tooltip};
2626
2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2616 $self->add (new CFClient::UI::Label 2634 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2635 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2637 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2638 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2639 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2630 2648
2631 ($w + 4, $h + 4) 2649 ($w + 4, $h + 4)
2632} 2650}
2633 2651
2634sub size_allocate { 2652sub size_allocate {
2635 my ($self, $w, $h, $changed) = @_; 2653 my ($self, $w, $h) = @_;
2636 2654
2637 return unless $changed;
2638
2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2640} 2656}
2641 2657
2642sub visibility_change { 2658sub visibility_change {
2643 my ($self, $visible) = @_; 2659 my ($self, $visible) = @_;
2644 2660
… …
2765 $self->SUPER::DESTROY; 2781 $self->SUPER::DESTROY;
2766} 2782}
2767 2783
2768############################################################################# 2784#############################################################################
2769 2785
2770package CFClient::UI::Inventory;
2771
2772our @ISA = CFClient::UI::ScrolledWindow::;
2773
2774sub new {
2775 my $class = shift;
2776
2777 my $self = $class->SUPER::new (
2778 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779 @_,
2780 );
2781
2782 $self
2783}
2784
2785sub set_items {
2786 my ($self, $items) = @_;
2787
2788 $self->{scrolled}->clear;
2789 return unless $items;
2790
2791 my @items = sort {
2792 ($a->{type} <=> $b->{type})
2793 or ($a->{name} cmp $b->{name})
2794 } @$items;
2795
2796 $self->{real_items} = \@items;
2797
2798 my $row = 0;
2799 for my $item (@items) {
2800 CFClient::Item::update_widgets $item;
2801
2802 $self->{scrolled}->add (0, $row, $item->{face_widget});
2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806 $row++;
2807 }
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Menu; 2786package CFClient::UI::Menu;
2813 2787
2814our @ISA = CFClient::UI::FancyFrame::; 2788our @ISA = CFClient::UI::FancyFrame::;
2815 2789
2816use CFClient::OpenGL; 2790use CFClient::OpenGL;
… …
2854 # maybe save $GRAB? must be careful about events... 2828 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 2829 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 2830 $self->{button} = $ev->{button};
2857 2831
2858 $self->show; 2832 $self->show;
2859 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860} 2834}
2861 2835
2862sub mouse_motion { 2836sub mouse_motion {
2863 my ($self, $ev, $x, $y) = @_; 2837 my ($self, $ev, $x, $y) = @_;
2864 2838
… …
2989 $self->SUPER::reconfigure; 2963 $self->SUPER::reconfigure;
2990} 2964}
2991 2965
2992############################################################################# 2966#############################################################################
2993 2967
2968package CFClient::UI::Inventory;
2969
2970our @ISA = CFClient::UI::ScrolledWindow::;
2971
2972sub new {
2973 my $class = shift;
2974
2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
2994package CFClient::UI::Root; 3259package CFClient::UI::Root;
2995 3260
2996our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2997 3262
2998use CFClient::OpenGL; 3263use CFClient::OpenGL;
… …
3008 Scalar::Util::weaken ($self->{root} = $self); 3273 Scalar::Util::weaken ($self->{root} = $self);
3009 3274
3010 $self 3275 $self
3011} 3276}
3012 3277
3013sub configure {
3014 my ($self, $x, $y, $w, $h) = @_;
3015
3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
3019
3020sub reconfigure {
3021 my ($self) = @_;
3022
3023 $self->SUPER::reconfigure;
3024
3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
3026 if $self->{w};
3027}
3028
3029sub size_request { 3278sub size_request {
3030 my ($self) = @_; 3279 my ($self) = @_;
3031 3280
3032 ($self->{w}, $self->{h}) 3281 ($self->{w}, $self->{h})
3033} 3282}
… …
3045 3294
3046 int $coord + 0.5 3295 int $coord + 0.5
3047} 3296}
3048 3297
3049sub size_allocate { 3298sub size_allocate {
3050 my ($self, $w, $h, $changed) = @_; 3299 my ($self, $w, $h) = @_;
3051 3300
3052 for my $child ($self->children) { 3301 for my $child ($self->children) {
3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054 3303
3055 $X = $child->{force_x} if exists $child->{force_x}; 3304 $X = $child->{force_x} if exists $child->{force_x};
… …
3129 3378
3130 while () { 3379 while () {
3131 if ($self->{realloc}) { 3380 if ($self->{realloc}) {
3132 #TODO use array-of-depth approach 3381 #TODO use array-of-depth approach
3133 3382
3383 use sort 'stable';
3384
3134 @queue = sort { $a->{visible} <=> $b->{visible} } 3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3135 @queue, values %{delete $self->{realloc}}; 3386 @queue, values %{delete $self->{realloc}};
3136 } 3387 }
3137 3388
3138 my $widget = pop @queue || last; 3389 my $widget = pop @queue || last;
3139 3390
3140 $widget->{visible} or last; # do not resize invisible widgets 3391 $widget->{visible} or last; # do not resize invisible widgets
3141 3392
3142 my ($w, $h) = $widget->size_request; 3393 my ($w, $h) = $widget->size_request;
3143 3394
3144 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3145
3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w; 3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h; 3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3148 3397
3149 $w = $widget->{force_w} if exists $widget->{force_w}; 3398 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h}; 3399 $h = $widget->{force_h} if exists $widget->{force_h};
3151 3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3402 || delete $widget->{force_realloc}) {
3152 $widget->{req_w} = $w; 3403 $widget->{req_w} = $w;
3153 $widget->{req_h} = $h; 3404 $widget->{req_h} = $h;
3154 3405
3155 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3406 $self->{size_alloc}{$widget+0} = $widget;
3156 3407
3157 push @queue, $widget->{parent} 3408 if (my $parent = $widget->{parent}) {
3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
3414 }
3415
3416 delete $self->{realloc}{$widget+0};
3159 } 3417 }
3160 } 3418 }
3161 3419
3162 while (my $size_alloc = delete $self->{size_alloc}) { 3420 while (my $size_alloc = delete $self->{size_alloc}) {
3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3164 values %$size_alloc; 3422 values %$size_alloc;
3165 3423
3166 while () { 3424 while () {
3167 my ($widget, $w, $h) = @{ pop @queue or last }; 3425 my $widget = pop @queue || last;
3168 3426
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3171 3428
3172 $w = 0 if $w < 0; 3429 $w = 0 if $w < 0;
3173 $h = 0 if $h < 0; 3430 $h = 0 if $h < 0;
3174 3431
3175 $w = int $w + 0.5; 3432 $w = int $w + 0.5;
3176 $h = int $h + 0.5; 3433 $h = int $h + 0.5;
3177 3434
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3179
3180 $widget->{w} = $w; 3436 $widget->{w} = $w;
3181 $widget->{h} = $h; 3437 $widget->{h} = $h;
3182 3438
3183 $widget->emit (size_allocate => $w, $h, $changed); 3439 $widget->emit (size_allocate => $w, $h);
3440 }
3184 } 3441 }
3185 } 3442 }
3186 3443
3187 while ($self->{post_alloc_hook}) { 3444 while ($self->{post_alloc_hook}) {
3188 $_->() 3445 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3446 for values %{delete $self->{post_alloc_hook}};
3190 } 3447 }
3448
3191 3449
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
3195 3453

Diff Legend

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