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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
13our $ROOT; 14our $ROOT;
14our $TOOLTIP; 15our $TOOLTIP;
… …
50 delete $TOOLTIP->{owner}; 51 delete $TOOLTIP->{owner};
51} 52}
52 53
53# class methods for events 54# class methods for events
54sub feed_sdl_key_down_event { 55sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 56 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 57 if $FOCUS;
57} 58}
58 59
59sub feed_sdl_key_up_event { 60sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 61 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 62 if $FOCUS;
62} 63}
63 64
64sub feed_sdl_button_down_event { 65sub feed_sdl_button_down_event {
65 my ($ev) = @_; 66 my ($ev) = @_;
… …
74 check_tooltip; 75 check_tooltip;
75 } 76 }
76 77
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 78 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 79
79 if ($GRAB) { 80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 81 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 82}
84 83
85sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
86 my ($ev) = @_; 85 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
88 87
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 89
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 91
93 if ($GRAB) { 92 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 93 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 94
98 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 97 $grab->update if $grab;
101 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 115
119 check_tooltip; 116 check_tooltip;
120 } 117 }
121 118
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 120 if $HOVER;
126} 121}
127 122
128# convert position array to integers 123# convert position array to integers
129sub harmonize { 124sub harmonize {
130 my ($vals) = @_; 125 my ($vals) = @_;
… …
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 }, 225 },
231 ); 226 );
232} 227}
233 228
234sub hide { 229sub set_invisible {
235 my ($self) = @_; 230 my ($self) = @_;
231
232 # broken show/hide model
233
234 delete $self->{root};
235 delete $self->{visible};
236 236
237 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
239
240 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self;
242
243 $self->focus_out;
244}
245
246sub hide {
247 my ($self) = @_;
248
249 $self->set_invisible;
239 250
240 $self->{parent}->remove ($self) 251 $self->{parent}->remove ($self)
241 if $self->{parent}; 252 if $self->{parent};
242} 253}
243 254
… …
313} 324}
314 325
315sub set_tooltip { 326sub set_tooltip {
316 my ($self, $tooltip) = @_; 327 my ($self, $tooltip) = @_;
317 328
329 $tooltip =~ s/^\s+//;
330 $tooltip =~ s/\s+$//;
331
332 return if $self->{tooltip} eq $tooltip;
333
318 $self->{tooltip} = $tooltip; 334 $self->{tooltip} = $tooltip;
319 335
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 336 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 337 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 338 CFClient::UI::check_tooltip;
… …
343 return if $FOCUS == $self; 359 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 360 return unless $self->{can_focus};
345 361
346 my $focus = $FOCUS; $FOCUS = $self; 362 my $focus = $FOCUS; $FOCUS = $self;
347 363
348 $self->emit (focus_in => $focus); 364 $self->_emit (focus_in => $focus);
349 365
350 $focus->update if $focus; 366 $focus->update if $focus;
351 $FOCUS->update; 367 $FOCUS->update;
352} 368}
353 369
… …
356 372
357 return unless $FOCUS == $self; 373 return unless $FOCUS == $self;
358 374
359 my $focus = $FOCUS; undef $FOCUS; 375 my $focus = $FOCUS; undef $FOCUS;
360 376
361 $self->emit (focus_out => $focus); 377 $self->_emit (focus_out => $focus);
362 378
363 $focus->update if $focus; #? 379 $focus->update if $focus; #?
380
381 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
382 unless $FOCUS;
364} 383}
365 384
366sub mouse_motion { } 385sub mouse_motion { }
367sub button_up { } 386sub button_up { }
368sub key_down { } 387sub key_down { }
369sub key_up { } 388sub key_up { }
370 389
371sub button_down { 390sub button_down {
372 my ($self, $ev, $x, $y) = @_; 391 my ($self, $ev, $x, $y) = @_;
373 392
374 $self->focus_in; 393 $self->focus_in;
… …
408 if ($ENV{PCLIENT_DEBUG}) { 427 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix; 428 glPushMatrix;
410 glColor 1, 1, 0, 1; 429 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP; 431 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 432 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 433 glVertex $self->{w} - 1, 0;
415 glVertex $self->{w}, $self->{h}; 434 glVertex $self->{w} - 1, $self->{h} - 1;
416 glVertex 0 , $self->{h}; 435 glVertex 0 , $self->{h} - 1;
417 glEnd; 436 glEnd;
418 glPopMatrix; 437 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 438 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 439 }
421} 440}
… …
441sub set_parent { 460sub set_parent {
442 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
443 462
444 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
445 464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
446 # TODO: req_w _does_change after ->reconfigure 468 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size 469 $self->check_size
448 unless exists $self->{req_w}; 470 unless exists $self->{req_w};
449 471
450 $self->show; 472 $self->show;
… …
468 my ($self, $signal, $cb) = @_; 490 my ($self, $signal, $cb) = @_;
469 491
470 push @{ $self->{signal_cb}{$signal} }, $cb; 492 push @{ $self->{signal_cb}{$signal} }, $cb;
471} 493}
472 494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
473sub emit { 501sub emit {
474 my ($self, $signal, @args) = @_; 502 my ($self, $signal, @args) = @_;
475 503
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
477} 506}
478 507
479sub DESTROY { 508sub DESTROY {
480 my ($self) = @_; 509 my ($self) = @_;
481 510
… …
594 delete $child->{parent}; 623 delete $child->{parent};
595 $child->hide; 624 $child->hide;
596 625
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 627
599 $self->check_size; 628 $self->check_size (1);
600 $self->update; 629 $self->update;
601} 630}
602 631
603sub clear { 632sub clear {
604 my ($self) = @_; 633 my ($self) = @_;
… …
744 773
745package CFClient::UI::ViewPort; 774package CFClient::UI::ViewPort;
746 775
747our @ISA = CFClient::UI::Window::; 776our @ISA = CFClient::UI::Window::;
748 777
778sub new {
779 my $class = shift;
780
781 $class->SUPER::new (
782 scroll_x => 0,
783 scroll_y => 1,
784 @_,
785 )
786}
787
749sub size_request { 788sub size_request {
750 my ($self) = @_; 789 my ($self) = @_;
751 790
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
753 792
… …
755} 794}
756 795
757sub size_allocate { 796sub size_allocate {
758 my ($self, $w, $h) = @_; 797 my ($self, $w, $h) = @_;
759 798
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
761# $w = $self->{w}; 800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801
762 $self->child->configure (0, 0, $cw, $ch); 802 $self->child->configure (0, 0, $w, $h);
763 $self->update; 803 $self->update;
764} 804}
765 805
766sub set_offset { 806sub set_offset {
767 my ($self, $x, $y) = @_; 807 my ($self, $x, $y) = @_;
… …
836 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp}); 877 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
839 879
840 $self 880 $self
881}
882
883sub update {
884 my ($self) = @_;
885
886 $self->SUPER::update;
887
888 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 891}
842 892
843sub size_allocate { 893sub size_allocate {
844 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
845 895
… …
1062sub new { 1112sub new {
1063 my $class = shift; 1113 my $class = shift;
1064 1114
1065 $class->SUPER::new ( 1115 $class->SUPER::new (
1066 col_expand => [], 1116 col_expand => [],
1067 @_ 1117 @_,
1068 ) 1118 )
1119}
1120
1121sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1123}
1070 1124
1071sub add { 1125sub add {
1072 my ($self, $x, $y, $child) = @_; 1126 my ($self, $x, $y, $child) = @_;
1073 1127
1074 $child->set_parent ($self); 1128 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1129 $self->{children}[$y][$x] = $child;
1076 1130
1077 $child->check_size; 1131 $self->check_size (1);
1078} 1132}
1079 1133
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1134# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1135sub clear {
1086 my ($self) = @_; 1136 my ($self) = @_;
1087 1137
1088 my @children = $self->children; 1138 my @children = $self->children;
1089 delete $self->{children}; 1139 delete $self->{children};
… …
1091 for (@children) { 1141 for (@children) {
1092 delete $_->{parent}; 1142 delete $_->{parent};
1093 $_->hide; 1143 $_->hide;
1094 } 1144 }
1095 1145
1146 $self->check_size (1);
1096 $self->update; 1147 $self->update;
1097} 1148}
1098 1149
1099sub get_wh { 1150sub get_wh {
1100 my ($self) = @_; 1151 my ($self) = @_;
… …
1132sub size_allocate { 1183sub size_allocate {
1133 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1134 1185
1135 my ($ws, $hs) = $self->get_wh; 1186 my ($ws, $hs) = $self->get_wh;
1136 1187
1137 my $req_w = sum @$ws; 1188 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1189 my $req_h = (sum @$hs) || 1;
1139 1190
1140 # TODO: nicer code && do row_expand 1191 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1192 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1193 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1194 my $col_expand = (sum @col_expand) || 1;
… …
1524 $self->{text} = $text; 1575 $self->{text} = $text;
1525 1576
1526 $text =~ s/./*/g if $self->{hidden}; 1577 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1578 $self->{layout}->set_text ("$text ");
1528 1579
1529 $self->emit (changed => $self->{text}); 1580 $self->_emit (changed => $self->{text});
1530} 1581}
1531 1582
1532sub set_text { 1583sub set_text {
1533 my ($self, $text) = @_; 1584 my ($self, $text) = @_;
1534 1585
… …
1546 my ($self) = @_; 1597 my ($self) = @_;
1547 1598
1548 my ($w, $h) = $self->SUPER::size_request; 1599 my ($w, $h) = $self->SUPER::size_request;
1549 1600
1550 ($w + 1, $h) # add 1 for cursor 1601 ($w + 1, $h) # add 1 for cursor
1551}
1552
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557} 1602}
1558 1603
1559sub key_down { 1604sub key_down {
1560 my ($self, $ev) = @_; 1605 my ($self, $ev) = @_;
1561 1606
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1621 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1622 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1623 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1625 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1626 $self->_emit ('escape');
1582 } elsif ($uni) { 1627 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1628 substr $text, $self->{cursor}++, 0, chr $uni;
1584 } 1629 }
1585 1630
1586 $self->_set_text ($text); 1631 $self->_set_text ($text);
… …
1673 if ($sym == 13) { 1718 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1719 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1720 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1721 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1722 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1723 $self->_emit (activate => $txt);
1679 $self->update; 1724 $self->update;
1680 1725
1681 } elsif ($sym == CFClient::SDLK_UP) { 1726 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1727 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1728 $self->{history_saveback} = $self->get_text;
… …
1731 can_events => 1, 1776 can_events => 1,
1732 @_ 1777 @_
1733 ) 1778 )
1734} 1779}
1735 1780
1781sub activate { }
1782
1736sub button_up { 1783sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1784 my ($self, $ev, $x, $y) = @_;
1738 1785
1786 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1787 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1788 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate");
1742 }
1743} 1789}
1744 1790
1745sub _draw { 1791sub _draw {
1746 my ($self) = @_; 1792 my ($self) = @_;
1747 1793
… …
1799 my ($self, $ev, $x, $y) = @_; 1845 my ($self, $ev, $x, $y) = @_;
1800 1846
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1803 $self->{state} = !$self->{state}; 1849 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1850 $self->_emit (changed => $self->{state});
1805 } 1851 }
1806} 1852}
1807 1853
1808sub _draw { 1854sub _draw {
1809 my ($self) = @_; 1855 my ($self) = @_;
… …
2102} 2148}
2103 2149
2104sub set_range { 2150sub set_range {
2105 my ($self, $range) = @_; 2151 my ($self, $range) = @_;
2106 2152
2107 $self->{range} = $range; 2153 ($range, $self->{range}) = ($self->{range}, $range);
2108 2154
2109 $self->update; 2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2110} 2157}
2111 2158
2112sub set_value { 2159sub set_value {
2113 my ($self, $value) = @_; 2160 my ($self, $value) = @_;
2114 2161
… …
2125 if $unit; 2172 if $unit;
2126 2173
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2175
2129 if ($value != $old_value) { 2176 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2177 $self->_emit (changed => $value);
2131 $self->update; 2178 $self->update;
2132 } 2179 }
2133} 2180}
2134 2181
2135sub size_request { 2182sub size_request {
… …
2517 2564
2518 # TODO: use animation 2565 # TODO: use animation
2519 if ($self->{state} = !$self->{state}) { 2566 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other}); 2567 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h})); 2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open"); 2569 $self->_emit ("open");
2523 } else { 2570 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other}); 2571 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close"); 2572 $self->_emit ("close");
2526 } 2573 }
2527 2574
2528 $self->emit (changed => $self->{state}); 2575 $self->_emit (changed => $self->{state});
2529} 2576}
2530 2577
2531############################################################################# 2578#############################################################################
2532 2579
2533package CFClient::UI::Tooltip; 2580package CFClient::UI::Tooltip;
… …
2609 2656
2610sub new { 2657sub new {
2611 my $class = shift; 2658 my $class = shift;
2612 2659
2613 my $self = $class->SUPER::new ( 2660 my $self = $class->SUPER::new (
2614 aspect => 1, 2661 aspect => 1,
2662 can_events => 0,
2615 @_, 2663 @_,
2616 ); 2664 );
2617 2665
2618 if ($self->{anim} && $self->{animspeed}) { 2666 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2667 Scalar::Util::weaken (my $widget = $self);
… …
2678 $self->SUPER::DESTROY; 2726 $self->SUPER::DESTROY;
2679} 2727}
2680 2728
2681############################################################################# 2729#############################################################################
2682 2730
2683package CFClient::UI::InventoryItem; 2731package CFClient::UI::Inventory;
2684 2732
2685our @ISA = CFClient::UI::HBox::; 2733our @ISA = CFClient::UI::ScrolledWindow::;
2686
2687sub _item_to_desc {
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712 2734
2713sub new { 2735sub new {
2714 my $class = shift; 2736 my $class = shift;
2715 2737
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new ( 2738 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table), 2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2804 @_, 2740 @_,
2805 ); 2741 );
2806 2742
2807 $self 2743 $self
2808} 2744}
… …
2818 or ($a->{name} cmp $b->{name}) 2754 or ($a->{name} cmp $b->{name})
2819 } @$items; 2755 } @$items;
2820 2756
2821 $self->{real_items} = \@items; 2757 $self->{real_items} = \@items;
2822 2758
2759 my $row = 0;
2823 for my $item (@items) { 2760 for my $item (@items) {
2824 $item->{item} = $item; 2761 CFClient::Item::update_widgets $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828 2762
2829 my $i = 0; 2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2830 for (@items) { 2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2831 $self->{scrolled}->add (0, $i, $_); 2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835 2766
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2767 $row++;
2768 }
2837} 2769}
2838 2770
2839sub size_request { 2771sub size_request {
2840 my ($self) = @_; 2772 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2881 2813
2882# popup given the event (must be a mouse button down event currently) 2814# popup given the event (must be a mouse button down event currently)
2883sub popup { 2815sub popup {
2884 my ($self, $ev) = @_; 2816 my ($self, $ev) = @_;
2885 2817
2886 $self->emit ("popdown"); 2818 $self->_emit ("popdown");
2887 2819
2888 # maybe save $GRAB? must be careful about events... 2820 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2821 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2822 $self->{button} = $ev->{button};
2891 2823
… …
2906 2838
2907 if ($ev->{button} == $self->{button}) { 2839 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2840 undef $GRAB;
2909 $self->hide; 2841 $self->hide;
2910 2842
2911 $self->emit ("popdown"); 2843 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2844 $self->{hover}[1]->() if $self->{hover};
2913 } 2845 }
2914} 2846}
2915 2847
2916############################################################################# 2848#############################################################################
… …
2978sub add { 2910sub add {
2979 my ($self, $text, %arg) = @_; 2911 my ($self, $text, %arg) = @_;
2980 2912
2981 $text =~ s/^\s+//; 2913 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 2914 $text =~ s/\s+$//;
2915
2916 return unless $text;
2983 2917
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 2918 my $timeout = time + ((delete $arg{timeout}) || 60);
2985 2919
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 2921
… …
3031 2965
3032sub new { 2966sub new {
3033 my $class = shift; 2967 my $class = shift;
3034 2968
3035 $class->SUPER::new ( 2969 $class->SUPER::new (
2970 visible => 1,
3036 @_, 2971 @_,
3037 ) 2972 )
3038} 2973}
3039 2974
3040sub configure { 2975sub configure {
… …
3098sub add { 3033sub add {
3099 my ($self, @children) = @_; 3034 my ($self, @children) = @_;
3100 3035
3101 for (my @widgets = @children; my $w = pop @widgets; ) { 3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children; 3037 push @widgets, $w->children;
3103 $w->{root} = $self; 3038 $w->{root} = $self;
3104 $w->{visible} = 1; 3039 $w->{visible} = $self->{visible} + 1;
3105 } 3040 }
3106 3041
3107 for my $child (@children) { 3042 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3043 $child->{is_toplevel} = 1;
3109 3044
… …
3121 $self->SUPER::remove (@children); 3056 $self->SUPER::remove (@children);
3122 3057
3123 while (@children) { 3058 while (@children) {
3124 my $w = pop @children; 3059 my $w = pop @children;
3125 push @children, $w->children; 3060 push @children, $w->children;
3126 delete $w->{visible}; 3061 $w->set_invisible;
3127 } 3062 }
3128} 3063}
3129 3064
3130sub on_refresh { 3065sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3066 my ($self, $id, $cb) = @_;
… …
3185 $w = 0 if $w < 0; 3120 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3121 $h = 0 if $h < 0;
3187 3122
3188 $widget->{w} = $w; 3123 $widget->{w} = $w;
3189 $widget->{h} = $h; 3124 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h);
3191 $widget->emit (size_allocate => $w, $h); 3125 $widget->emit (size_allocate => $w, $h);
3192 } 3126 }
3193 } 3127 }
3194 3128
3195 while ($self->{post_alloc_hook}) { 3129 while ($self->{post_alloc_hook}) {

Diff Legend

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