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.238 by root, Thu May 25 21:48:22 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 }, 224 },
231 ); 225 );
232} 226}
233 227
234sub hide { 228sub set_invisible {
235 my ($self) = @_; 229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
236 234
237 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
239 248
240 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
241 if $self->{parent}; 250 if $self->{parent};
242} 251}
243 252
… …
313} 322}
314 323
315sub set_tooltip { 324sub set_tooltip {
316 my ($self, $tooltip) = @_; 325 my ($self, $tooltip) = @_;
317 326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
318 $self->{tooltip} = $tooltip; 332 $self->{tooltip} = $tooltip;
319 333
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 335 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 336 CFClient::UI::check_tooltip;
… …
343 return if $FOCUS == $self; 357 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
345 359
346 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
347 361
348 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
349 363
350 $focus->update if $focus; 364 $focus->update if $focus;
351 $FOCUS->update; 365 $FOCUS->update;
352} 366}
353 367
… …
356 370
357 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
358 372
359 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
360 374
361 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
362 376
363 $focus->update if $focus; #? 377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS;
364} 381}
365 382
366sub mouse_motion { } 383sub mouse_motion { }
367sub button_up { } 384sub button_up { }
368sub key_down { } 385sub key_down { }
369sub key_up { } 386sub key_up { }
370 387
371sub button_down { 388sub button_down {
372 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
373 390
374 $self->focus_in; 391 $self->focus_in;
… …
408 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix; 426 glPushMatrix;
410 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 430 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
415 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
416 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
417 glEnd; 434 glEnd;
418 glPopMatrix; 435 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 437 }
421} 438}
… …
441sub set_parent { 458sub set_parent {
442 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
443 460
444 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
445 462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
446 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size 467 $self->check_size
448 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
449 469
450 $self->show; 470 $self->show;
… …
468 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
469 489
470 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
471} 491}
472 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
473sub emit { 499sub emit {
474 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
475 501
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
477} 504}
478 505
479sub DESTROY { 506sub DESTROY {
480 my ($self) = @_; 507 my ($self) = @_;
481 508
… …
594 delete $child->{parent}; 621 delete $child->{parent};
595 $child->hide; 622 $child->hide;
596 623
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 625
599 $self->check_size; 626 $self->check_size (1);
600 $self->update; 627 $self->update;
601} 628}
602 629
603sub clear { 630sub clear {
604 my ($self) = @_; 631 my ($self) = @_;
… …
744 771
745package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
746 773
747our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
748 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
749sub size_request { 786sub size_request {
750 my ($self) = @_; 787 my ($self) = @_;
751 788
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
753 790
… …
755} 792}
756 793
757sub size_allocate { 794sub size_allocate {
758 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
759 796
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
761# $w = $self->{w}; 798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
762 $self->child->configure (0, 0, $cw, $ch); 800 $self->child->configure (0, 0, $w, $h);
763 $self->update; 801 $self->update;
764} 802}
765 803
766sub set_offset { 804sub set_offset {
767 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
1062sub new { 1100sub new {
1063 my $class = shift; 1101 my $class = shift;
1064 1102
1065 $class->SUPER::new ( 1103 $class->SUPER::new (
1066 col_expand => [], 1104 col_expand => [],
1067 @_ 1105 @_,
1068 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1111}
1070 1112
1071sub add { 1113sub add {
1072 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
1073 1115
1074 $child->set_parent ($self); 1116 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
1076 1118
1077 $child->check_size; 1119 $self->check_size (1);
1078} 1120}
1079 1121
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1122# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1123sub clear {
1086 my ($self) = @_; 1124 my ($self) = @_;
1087 1125
1088 my @children = $self->children; 1126 my @children = $self->children;
1089 delete $self->{children}; 1127 delete $self->{children};
… …
1091 for (@children) { 1129 for (@children) {
1092 delete $_->{parent}; 1130 delete $_->{parent};
1093 $_->hide; 1131 $_->hide;
1094 } 1132 }
1095 1133
1134 $self->check_size (1);
1096 $self->update; 1135 $self->update;
1097} 1136}
1098 1137
1099sub get_wh { 1138sub get_wh {
1100 my ($self) = @_; 1139 my ($self) = @_;
… …
1132sub size_allocate { 1171sub size_allocate {
1133 my ($self, $w, $h) = @_; 1172 my ($self, $w, $h) = @_;
1134 1173
1135 my ($ws, $hs) = $self->get_wh; 1174 my ($ws, $hs) = $self->get_wh;
1136 1175
1137 my $req_w = sum @$ws; 1176 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1177 my $req_h = (sum @$hs) || 1;
1139 1178
1140 # TODO: nicer code && do row_expand 1179 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1180 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1181 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1182 my $col_expand = (sum @col_expand) || 1;
… …
1524 $self->{text} = $text; 1563 $self->{text} = $text;
1525 1564
1526 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1528 1567
1529 $self->emit (changed => $self->{text}); 1568 $self->_emit (changed => $self->{text});
1530} 1569}
1531 1570
1532sub set_text { 1571sub set_text {
1533 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1534 1573
… …
1546 my ($self) = @_; 1585 my ($self) = @_;
1547 1586
1548 my ($w, $h) = $self->SUPER::size_request; 1587 my ($w, $h) = $self->SUPER::size_request;
1549 1588
1550 ($w + 1, $h) # add 1 for cursor 1589 ($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} 1590}
1558 1591
1559sub key_down { 1592sub key_down {
1560 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1561 1594
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1613 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1614 $self->_emit ('escape');
1582 } elsif ($uni) { 1615 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1584 } 1617 }
1585 1618
1586 $self->_set_text ($text); 1619 $self->_set_text ($text);
… …
1673 if ($sym == 13) { 1706 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1707 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1708 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1709 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1710 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1711 $self->_emit (activate => $txt);
1679 $self->update; 1712 $self->update;
1680 1713
1681 } elsif ($sym == CFClient::SDLK_UP) { 1714 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1715 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1716 $self->{history_saveback} = $self->get_text;
… …
1731 can_events => 1, 1764 can_events => 1,
1732 @_ 1765 @_
1733 ) 1766 )
1734} 1767}
1735 1768
1769sub activate { }
1770
1736sub button_up { 1771sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1738 1773
1774 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate");
1742 }
1743} 1777}
1744 1778
1745sub _draw { 1779sub _draw {
1746 my ($self) = @_; 1780 my ($self) = @_;
1747 1781
… …
1799 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1800 1834
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1803 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1805 } 1839 }
1806} 1840}
1807 1841
1808sub _draw { 1842sub _draw {
1809 my ($self) = @_; 1843 my ($self) = @_;
… …
2125 if $unit; 2159 if $unit;
2126 2160
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2162
2129 if ($value != $old_value) { 2163 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2164 $self->_emit (changed => $value);
2131 $self->update; 2165 $self->update;
2132 } 2166 }
2133} 2167}
2134 2168
2135sub size_request { 2169sub size_request {
… …
2517 2551
2518 # TODO: use animation 2552 # TODO: use animation
2519 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open"); 2556 $self->_emit ("open");
2523 } else { 2557 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close"); 2559 $self->_emit ("close");
2526 } 2560 }
2527 2561
2528 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2529} 2563}
2530 2564
2531############################################################################# 2565#############################################################################
2532 2566
2533package CFClient::UI::Tooltip; 2567package CFClient::UI::Tooltip;
… …
2609 2643
2610sub new { 2644sub new {
2611 my $class = shift; 2645 my $class = shift;
2612 2646
2613 my $self = $class->SUPER::new ( 2647 my $self = $class->SUPER::new (
2614 aspect => 1, 2648 aspect => 1,
2649 can_events => 0,
2615 @_, 2650 @_,
2616 ); 2651 );
2617 2652
2618 if ($self->{anim} && $self->{animspeed}) { 2653 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2654 Scalar::Util::weaken (my $widget = $self);
… …
2678 $self->SUPER::DESTROY; 2713 $self->SUPER::DESTROY;
2679} 2714}
2680 2715
2681############################################################################# 2716#############################################################################
2682 2717
2683package CFClient::UI::InventoryItem; 2718package CFClient::UI::Inventory;
2684 2719
2685our @ISA = CFClient::UI::HBox::; 2720our @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 2721
2713sub new { 2722sub new {
2714 my $class = shift; 2723 my $class = shift;
2715 2724
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 ( 2725 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), 2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2804 @_, 2727 @_,
2805 ); 2728 );
2806 2729
2807 $self 2730 $self
2808} 2731}
… …
2818 or ($a->{name} cmp $b->{name}) 2741 or ($a->{name} cmp $b->{name})
2819 } @$items; 2742 } @$items;
2820 2743
2821 $self->{real_items} = \@items; 2744 $self->{real_items} = \@items;
2822 2745
2746 my $row = 0;
2823 for my $item (@items) { 2747 for my $item (@items) {
2824 $item->{item} = $item; 2748 CFClient::Item::update_widgets $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828 2749
2829 my $i = 0; 2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2830 for (@items) { 2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2831 $self->{scrolled}->add (0, $i, $_); 2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2832 my $nrof = $_->{item}->{nrof} || 1; 2753
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); 2754 $row++;
2834 } 2755 }
2835 2756
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837} 2758}
2838 2759
… …
2881 2802
2882# popup given the event (must be a mouse button down event currently) 2803# popup given the event (must be a mouse button down event currently)
2883sub popup { 2804sub popup {
2884 my ($self, $ev) = @_; 2805 my ($self, $ev) = @_;
2885 2806
2886 $self->emit ("popdown"); 2807 $self->_emit ("popdown");
2887 2808
2888 # maybe save $GRAB? must be careful about events... 2809 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2810 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2811 $self->{button} = $ev->{button};
2891 2812
… …
2906 2827
2907 if ($ev->{button} == $self->{button}) { 2828 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2829 undef $GRAB;
2909 $self->hide; 2830 $self->hide;
2910 2831
2911 $self->emit ("popdown"); 2832 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2833 $self->{hover}[1]->() if $self->{hover};
2913 } 2834 }
2914} 2835}
2915 2836
2916############################################################################# 2837#############################################################################
… …
2978sub add { 2899sub add {
2979 my ($self, $text, %arg) = @_; 2900 my ($self, $text, %arg) = @_;
2980 2901
2981 $text =~ s/^\s+//; 2902 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2983 2906
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2985 2908
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 2910
… …
3121 $self->SUPER::remove (@children); 3044 $self->SUPER::remove (@children);
3122 3045
3123 while (@children) { 3046 while (@children) {
3124 my $w = pop @children; 3047 my $w = pop @children;
3125 push @children, $w->children; 3048 push @children, $w->children;
3126 delete $w->{visible}; 3049 $w->set_invisible;
3127 } 3050 }
3128} 3051}
3129 3052
3130sub on_refresh { 3053sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
… …
3185 $w = 0 if $w < 0; 3108 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3109 $h = 0 if $h < 0;
3187 3110
3188 $widget->{w} = $w; 3111 $widget->{w} = $w;
3189 $widget->{h} = $h; 3112 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h);
3191 $widget->emit (size_allocate => $w, $h); 3113 $widget->emit (size_allocate => $w, $h);
3192 } 3114 }
3193 } 3115 }
3194 3116
3195 while ($self->{post_alloc_hook}) { 3117 while ($self->{post_alloc_hook}) {

Diff Legend

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