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.240 by root, Fri May 26 18:28:23 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->{visible};
236 235
237 undef $GRAB if $GRAB == $self; 236 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 237 undef $HOVER if $HOVER == $self;
238
239 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self;
241
242 $self->focus_out;
243}
244
245sub hide {
246 my ($self) = @_;
247
248 $self->set_invisible;
239 249
240 $self->{parent}->remove ($self) 250 $self->{parent}->remove ($self)
241 if $self->{parent}; 251 if $self->{parent};
242} 252}
243 253
… …
313} 323}
314 324
315sub set_tooltip { 325sub set_tooltip {
316 my ($self, $tooltip) = @_; 326 my ($self, $tooltip) = @_;
317 327
328 $tooltip =~ s/^\s+//;
329 $tooltip =~ s/\s+$//;
330
331 return if $self->{tooltip} eq $tooltip;
332
318 $self->{tooltip} = $tooltip; 333 $self->{tooltip} = $tooltip;
319 334
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 335 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 336 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 337 CFClient::UI::check_tooltip;
… …
343 return if $FOCUS == $self; 358 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 359 return unless $self->{can_focus};
345 360
346 my $focus = $FOCUS; $FOCUS = $self; 361 my $focus = $FOCUS; $FOCUS = $self;
347 362
348 $self->emit (focus_in => $focus); 363 $self->_emit (focus_in => $focus);
349 364
350 $focus->update if $focus; 365 $focus->update if $focus;
351 $FOCUS->update; 366 $FOCUS->update;
352} 367}
353 368
… …
356 371
357 return unless $FOCUS == $self; 372 return unless $FOCUS == $self;
358 373
359 my $focus = $FOCUS; undef $FOCUS; 374 my $focus = $FOCUS; undef $FOCUS;
360 375
361 $self->emit (focus_out => $focus); 376 $self->_emit (focus_out => $focus);
362 377
363 $focus->update if $focus; #? 378 $focus->update if $focus; #?
379
380 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
381 unless $FOCUS;
364} 382}
365 383
366sub mouse_motion { } 384sub mouse_motion { }
367sub button_up { } 385sub button_up { }
368sub key_down { } 386sub key_down { }
369sub key_up { } 387sub key_up { }
370 388
371sub button_down { 389sub button_down {
372 my ($self, $ev, $x, $y) = @_; 390 my ($self, $ev, $x, $y) = @_;
373 391
374 $self->focus_in; 392 $self->focus_in;
… …
408 if ($ENV{PCLIENT_DEBUG}) { 426 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix; 427 glPushMatrix;
410 glColor 1, 1, 0, 1; 428 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP; 430 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 431 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 432 glVertex $self->{w} - 1, 0;
415 glVertex $self->{w}, $self->{h}; 433 glVertex $self->{w} - 1, $self->{h} - 1;
416 glVertex 0 , $self->{h}; 434 glVertex 0 , $self->{h} - 1;
417 glEnd; 435 glEnd;
418 glPopMatrix; 436 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 437 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 438 }
421} 439}
… …
441sub set_parent { 459sub set_parent {
442 my ($self, $parent) = @_; 460 my ($self, $parent) = @_;
443 461
444 Scalar::Util::weaken ($self->{parent} = $parent); 462 Scalar::Util::weaken ($self->{parent} = $parent);
445 463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
446 # TODO: req_w _does_change after ->reconfigure 467 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size 468 $self->check_size
448 unless exists $self->{req_w}; 469 unless exists $self->{req_w};
449 470
450 $self->show; 471 $self->show;
… …
468 my ($self, $signal, $cb) = @_; 489 my ($self, $signal, $cb) = @_;
469 490
470 push @{ $self->{signal_cb}{$signal} }, $cb; 491 push @{ $self->{signal_cb}{$signal} }, $cb;
471} 492}
472 493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
473sub emit { 500sub emit {
474 my ($self, $signal, @args) = @_; 501 my ($self, $signal, @args) = @_;
475 502
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
477} 505}
478 506
479sub DESTROY { 507sub DESTROY {
480 my ($self) = @_; 508 my ($self) = @_;
481 509
… …
594 delete $child->{parent}; 622 delete $child->{parent};
595 $child->hide; 623 $child->hide;
596 624
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 626
599 $self->check_size; 627 $self->check_size (1);
600 $self->update; 628 $self->update;
601} 629}
602 630
603sub clear { 631sub clear {
604 my ($self) = @_; 632 my ($self) = @_;
… …
744 772
745package CFClient::UI::ViewPort; 773package CFClient::UI::ViewPort;
746 774
747our @ISA = CFClient::UI::Window::; 775our @ISA = CFClient::UI::Window::;
748 776
777sub new {
778 my $class = shift;
779
780 $class->SUPER::new (
781 scroll_x => 0,
782 scroll_y => 1,
783 @_,
784 )
785}
786
749sub size_request { 787sub size_request {
750 my ($self) = @_; 788 my ($self) = @_;
751 789
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
753 791
… …
755} 793}
756 794
757sub size_allocate { 795sub size_allocate {
758 my ($self, $w, $h) = @_; 796 my ($self, $w, $h) = @_;
759 797
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
761# $w = $self->{w}; 799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
800
762 $self->child->configure (0, 0, $cw, $ch); 801 $self->child->configure (0, 0, $w, $h);
763 $self->update; 802 $self->update;
764} 803}
765 804
766sub set_offset { 805sub set_offset {
767 my ($self, $x, $y) = @_; 806 my ($self, $x, $y) = @_;
… …
836 $self->{vp}->add ($self->{scrolled}); 875 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp}); 876 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 877 $self->add ($self->{slider});
839 878
840 $self 879 $self
880}
881
882sub update {
883 my ($self) = @_;
884
885 $self->SUPER::update;
886
887 # todo: overwrite size_allocate of child
888 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 890}
842 891
843sub size_allocate { 892sub size_allocate {
844 my ($self, $w, $h) = @_; 893 my ($self, $w, $h) = @_;
845 894
… …
1062sub new { 1111sub new {
1063 my $class = shift; 1112 my $class = shift;
1064 1113
1065 $class->SUPER::new ( 1114 $class->SUPER::new (
1066 col_expand => [], 1115 col_expand => [],
1067 @_ 1116 @_,
1068 ) 1117 )
1118}
1119
1120sub children {
1121 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1122}
1070 1123
1071sub add { 1124sub add {
1072 my ($self, $x, $y, $child) = @_; 1125 my ($self, $x, $y, $child) = @_;
1073 1126
1074 $child->set_parent ($self); 1127 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1128 $self->{children}[$y][$x] = $child;
1076 1129
1077 $child->check_size; 1130 $self->check_size (1);
1078} 1131}
1079 1132
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1133# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1134sub clear {
1086 my ($self) = @_; 1135 my ($self) = @_;
1087 1136
1088 my @children = $self->children; 1137 my @children = $self->children;
1089 delete $self->{children}; 1138 delete $self->{children};
… …
1091 for (@children) { 1140 for (@children) {
1092 delete $_->{parent}; 1141 delete $_->{parent};
1093 $_->hide; 1142 $_->hide;
1094 } 1143 }
1095 1144
1145 $self->check_size (1);
1096 $self->update; 1146 $self->update;
1097} 1147}
1098 1148
1099sub get_wh { 1149sub get_wh {
1100 my ($self) = @_; 1150 my ($self) = @_;
… …
1132sub size_allocate { 1182sub size_allocate {
1133 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1134 1184
1135 my ($ws, $hs) = $self->get_wh; 1185 my ($ws, $hs) = $self->get_wh;
1136 1186
1137 my $req_w = sum @$ws; 1187 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1188 my $req_h = (sum @$hs) || 1;
1139 1189
1140 # TODO: nicer code && do row_expand 1190 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1191 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1192 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1193 my $col_expand = (sum @col_expand) || 1;
… …
1524 $self->{text} = $text; 1574 $self->{text} = $text;
1525 1575
1526 $text =~ s/./*/g if $self->{hidden}; 1576 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1577 $self->{layout}->set_text ("$text ");
1528 1578
1529 $self->emit (changed => $self->{text}); 1579 $self->_emit (changed => $self->{text});
1530} 1580}
1531 1581
1532sub set_text { 1582sub set_text {
1533 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1534 1584
… …
1546 my ($self) = @_; 1596 my ($self) = @_;
1547 1597
1548 my ($w, $h) = $self->SUPER::size_request; 1598 my ($w, $h) = $self->SUPER::size_request;
1549 1599
1550 ($w + 1, $h) # add 1 for cursor 1600 ($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} 1601}
1558 1602
1559sub key_down { 1603sub key_down {
1560 my ($self, $ev) = @_; 1604 my ($self, $ev) = @_;
1561 1605
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1620 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1621 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1622 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1623 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1624 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1625 $self->_emit ('escape');
1582 } elsif ($uni) { 1626 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1627 substr $text, $self->{cursor}++, 0, chr $uni;
1584 } 1628 }
1585 1629
1586 $self->_set_text ($text); 1630 $self->_set_text ($text);
… …
1673 if ($sym == 13) { 1717 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1718 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1719 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1720 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1721 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1722 $self->_emit (activate => $txt);
1679 $self->update; 1723 $self->update;
1680 1724
1681 } elsif ($sym == CFClient::SDLK_UP) { 1725 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1726 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1727 $self->{history_saveback} = $self->get_text;
… …
1731 can_events => 1, 1775 can_events => 1,
1732 @_ 1776 @_
1733 ) 1777 )
1734} 1778}
1735 1779
1780sub activate { }
1781
1736sub button_up { 1782sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1783 my ($self, $ev, $x, $y) = @_;
1738 1784
1785 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1786 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1787 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate");
1742 }
1743} 1788}
1744 1789
1745sub _draw { 1790sub _draw {
1746 my ($self) = @_; 1791 my ($self) = @_;
1747 1792
… …
1799 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1800 1845
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1803 $self->{state} = !$self->{state}; 1848 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1849 $self->_emit (changed => $self->{state});
1805 } 1850 }
1806} 1851}
1807 1852
1808sub _draw { 1853sub _draw {
1809 my ($self) = @_; 1854 my ($self) = @_;
… …
2102} 2147}
2103 2148
2104sub set_range { 2149sub set_range {
2105 my ($self, $range) = @_; 2150 my ($self, $range) = @_;
2106 2151
2107 $self->{range} = $range; 2152 ($range, $self->{range}) = ($self->{range}, $range);
2108 2153
2109 $self->update; 2154 $self->update
2155 if "@$range" ne "@{$self->{range}}";
2110} 2156}
2111 2157
2112sub set_value { 2158sub set_value {
2113 my ($self, $value) = @_; 2159 my ($self, $value) = @_;
2114 2160
… …
2125 if $unit; 2171 if $unit;
2126 2172
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2173 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2174
2129 if ($value != $old_value) { 2175 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2176 $self->_emit (changed => $value);
2131 $self->update; 2177 $self->update;
2132 } 2178 }
2133} 2179}
2134 2180
2135sub size_request { 2181sub size_request {
… …
2517 2563
2518 # TODO: use animation 2564 # TODO: use animation
2519 if ($self->{state} = !$self->{state}) { 2565 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other}); 2566 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h})); 2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open"); 2568 $self->_emit ("open");
2523 } else { 2569 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other}); 2570 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close"); 2571 $self->_emit ("close");
2526 } 2572 }
2527 2573
2528 $self->emit (changed => $self->{state}); 2574 $self->_emit (changed => $self->{state});
2529} 2575}
2530 2576
2531############################################################################# 2577#############################################################################
2532 2578
2533package CFClient::UI::Tooltip; 2579package CFClient::UI::Tooltip;
… …
2609 2655
2610sub new { 2656sub new {
2611 my $class = shift; 2657 my $class = shift;
2612 2658
2613 my $self = $class->SUPER::new ( 2659 my $self = $class->SUPER::new (
2614 aspect => 1, 2660 aspect => 1,
2661 can_events => 0,
2615 @_, 2662 @_,
2616 ); 2663 );
2617 2664
2618 if ($self->{anim} && $self->{animspeed}) { 2665 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2666 Scalar::Util::weaken (my $widget = $self);
… …
2678 $self->SUPER::DESTROY; 2725 $self->SUPER::DESTROY;
2679} 2726}
2680 2727
2681############################################################################# 2728#############################################################################
2682 2729
2683package CFClient::UI::InventoryItem; 2730package CFClient::UI::Inventory;
2684 2731
2685our @ISA = CFClient::UI::HBox::; 2732our @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 2733
2713sub new { 2734sub new {
2714 my $class = shift; 2735 my $class = shift;
2715 2736
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 ( 2737 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), 2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2804 @_, 2739 @_,
2805 ); 2740 );
2806 2741
2807 $self 2742 $self
2808} 2743}
… …
2818 or ($a->{name} cmp $b->{name}) 2753 or ($a->{name} cmp $b->{name})
2819 } @$items; 2754 } @$items;
2820 2755
2821 $self->{real_items} = \@items; 2756 $self->{real_items} = \@items;
2822 2757
2758 my $row = 0;
2823 for my $item (@items) { 2759 for my $item (@items) {
2824 $item->{item} = $item; 2760 CFClient::Item::update_widgets $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828 2761
2829 my $i = 0; 2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2830 for (@items) { 2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2831 $self->{scrolled}->add (0, $i, $_); 2764 $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 2765
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2766 $row++;
2767 }
2837} 2768}
2838 2769
2839sub size_request { 2770sub size_request {
2840 my ($self) = @_; 2771 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h}); 2772 ($self->{req_w}, $self->{req_h});
… …
2881 2812
2882# popup given the event (must be a mouse button down event currently) 2813# popup given the event (must be a mouse button down event currently)
2883sub popup { 2814sub popup {
2884 my ($self, $ev) = @_; 2815 my ($self, $ev) = @_;
2885 2816
2886 $self->emit ("popdown"); 2817 $self->_emit ("popdown");
2887 2818
2888 # maybe save $GRAB? must be careful about events... 2819 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2820 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2821 $self->{button} = $ev->{button};
2891 2822
… …
2906 2837
2907 if ($ev->{button} == $self->{button}) { 2838 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2839 undef $GRAB;
2909 $self->hide; 2840 $self->hide;
2910 2841
2911 $self->emit ("popdown"); 2842 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2843 $self->{hover}[1]->() if $self->{hover};
2913 } 2844 }
2914} 2845}
2915 2846
2916############################################################################# 2847#############################################################################
… …
2978sub add { 2909sub add {
2979 my ($self, $text, %arg) = @_; 2910 my ($self, $text, %arg) = @_;
2980 2911
2981 $text =~ s/^\s+//; 2912 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 2913 $text =~ s/\s+$//;
2914
2915 return unless $text;
2983 2916
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 2917 my $timeout = time + ((delete $arg{timeout}) || 60);
2985 2918
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 2920
… …
3121 $self->SUPER::remove (@children); 3054 $self->SUPER::remove (@children);
3122 3055
3123 while (@children) { 3056 while (@children) {
3124 my $w = pop @children; 3057 my $w = pop @children;
3125 push @children, $w->children; 3058 push @children, $w->children;
3126 delete $w->{visible}; 3059 $w->set_invisible;
3127 } 3060 }
3128} 3061}
3129 3062
3130sub on_refresh { 3063sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3064 my ($self, $id, $cb) = @_;
… …
3185 $w = 0 if $w < 0; 3118 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3119 $h = 0 if $h < 0;
3187 3120
3188 $widget->{w} = $w; 3121 $widget->{w} = $w;
3189 $widget->{h} = $h; 3122 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h);
3191 $widget->emit (size_allocate => $w, $h); 3123 $widget->emit (size_allocate => $w, $h);
3192 } 3124 }
3193 } 3125 }
3194 3126
3195 while ($self->{post_alloc_hook}) { 3127 while ($self->{post_alloc_hook}) {

Diff Legend

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