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.229 by root, Wed May 24 21:49:58 2006 UTC vs.
Revision 1.237 by root, Thu May 25 21:36:45 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) = @_;
… …
144 138
145 $_->update 139 $_->update
146 for @widgets; 140 for @widgets;
147} 141}
148 142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
149# call when resolution changes etc. 151# call when resolution changes etc.
150sub rescale_widgets { 152sub rescale_widgets {
151 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
152 154
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 155 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 165 }
167
168 $widget->reconfigure;
169 } 166 }
167
168 reconfigure_widgets;
170} 169}
171 170
172############################################################################# 171#############################################################################
173 172
174package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
224 $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);
225 }, 224 },
226 ); 225 );
227} 226}
228 227
229sub hide { 228sub set_invisible {
230 my ($self) = @_; 229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
231 234
232 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
233 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;
234 248
235 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
236 if $self->{parent}; 250 if $self->{parent};
237} 251}
238 252
… …
308} 322}
309 323
310sub set_tooltip { 324sub set_tooltip {
311 my ($self, $tooltip) = @_; 325 my ($self, $tooltip) = @_;
312 326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
313 $self->{tooltip} = $tooltip; 332 $self->{tooltip} = $tooltip;
314 333
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 335 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 336 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 357 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
340 359
341 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
342 361
343 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
344 363
345 $focus->update if $focus; 364 $focus->update if $focus;
346 $FOCUS->update; 365 $FOCUS->update;
347} 366}
348 367
… …
351 370
352 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
353 372
354 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
355 374
356 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
357 376
358 $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;
359} 381}
360 382
361sub mouse_motion { } 383sub mouse_motion { }
362sub button_up { } 384sub button_up { }
363sub key_down { } 385sub key_down { }
364sub key_up { } 386sub key_up { }
365 387
366sub button_down { 388sub button_down {
367 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
368 390
369 $self->focus_in; 391 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 426 glPushMatrix;
405 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 430 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
412 glEnd; 434 glEnd;
413 glPopMatrix; 435 glPopMatrix;
414 #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;
415 } 437 }
416} 438}
… …
436sub set_parent { 458sub set_parent {
437 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
438 460
439 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
440 462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
441 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 467 $self->check_size
443 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
444 469
445 $self->show; 470 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
464 489
465 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 491}
467 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
468sub emit { 499sub emit {
469 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
470 501
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
472} 504}
473 505
474sub DESTROY { 506sub DESTROY {
475 my ($self) = @_; 507 my ($self) = @_;
476 508
… …
589 delete $child->{parent}; 621 delete $child->{parent};
590 $child->hide; 622 $child->hide;
591 623
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 625
594 $self->check_size; 626 $self->check_size (1);
595 $self->update; 627 $self->update;
596} 628}
597 629
598sub clear { 630sub clear {
599 my ($self) = @_; 631 my ($self) = @_;
… …
739 771
740package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
741 773
742our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
743 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
744sub size_request { 786sub size_request {
745 my ($self) = @_; 787 my ($self) = @_;
746 788
747 @$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)};
748 790
… …
750} 792}
751 793
752sub size_allocate { 794sub size_allocate {
753 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
754 796
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
757 $self->child->configure (0, 0, $cw, $ch); 800 $self->child->configure (0, 0, $w, $h);
758 $self->update; 801 $self->update;
759} 802}
760 803
761sub set_offset { 804sub set_offset {
762 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
903 my $class = shift; 946 my $class = shift;
904 947
905 # TODO: user_x, user_y, overwrite moveto? 948 # TODO: user_x, user_y, overwrite moveto?
906 949
907 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
908 bg => [1, 1, 1, 1], 951 bg => [1, 1, 1, 1],
909 border_bg => [1, 1, 1, 1], 952 border_bg => [1, 1, 1, 1],
910 border => 0.6, 953 border => 0.6,
911 toplevel => 1, 954 is_toplevel => 1,
912 can_events => 1, 955 can_events => 1,
913 @_ 956 @_
914 ); 957 );
915 958
916 $self->{title} &&= new CFClient::UI::Label 959 $self->{title} &&= new CFClient::UI::Label
917 align => 0, 960 align => 0,
… …
1057sub new { 1100sub new {
1058 my $class = shift; 1101 my $class = shift;
1059 1102
1060 $class->SUPER::new ( 1103 $class->SUPER::new (
1061 col_expand => [], 1104 col_expand => [],
1062 @_ 1105 @_,
1063 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1111}
1065 1112
1066sub add { 1113sub add {
1067 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
1068 1115
1069 $child->set_parent ($self); 1116 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
1071 1118
1072 $child->check_size; 1119 $self->check_size (1);
1073} 1120}
1074 1121
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# 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?
1080sub clear { 1123sub clear {
1081 my ($self) = @_; 1124 my ($self) = @_;
1082 1125
1083 my @children = $self->children; 1126 my @children = $self->children;
1084 delete $self->{children}; 1127 delete $self->{children};
… …
1086 for (@children) { 1129 for (@children) {
1087 delete $_->{parent}; 1130 delete $_->{parent};
1088 $_->hide; 1131 $_->hide;
1089 } 1132 }
1090 1133
1134 $self->check_size (1);
1091 $self->update; 1135 $self->update;
1092} 1136}
1093 1137
1094sub get_wh { 1138sub get_wh {
1095 my ($self) = @_; 1139 my ($self) = @_;
… …
1519 $self->{text} = $text; 1563 $self->{text} = $text;
1520 1564
1521 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1522 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1523 1567
1524 $self->emit (changed => $self->{text}); 1568 $self->_emit (changed => $self->{text});
1525} 1569}
1526 1570
1527sub set_text { 1571sub set_text {
1528 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1529 1573
… …
1541 my ($self) = @_; 1585 my ($self) = @_;
1542 1586
1543 my ($w, $h) = $self->SUPER::size_request; 1587 my ($w, $h) = $self->SUPER::size_request;
1544 1588
1545 ($w + 1, $h) # add 1 for cursor 1589 ($w + 1, $h) # add 1 for cursor
1546}
1547
1548sub size_allocate {
1549 my ($self, $w, $h) = @_;
1550
1551 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1552} 1590}
1553 1591
1554sub key_down { 1592sub key_down {
1555 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1556 1594
… …
1571 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1572 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1573 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1574 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1575 } elsif ($uni == 27) { 1613 } elsif ($uni == 27) {
1576 $self->emit ('escape'); 1614 $self->_emit ('escape');
1577 } elsif ($uni) { 1615 } elsif ($uni) {
1578 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1579 } 1617 }
1580 1618
1581 $self->_set_text ($text); 1619 $self->_set_text ($text);
… …
1668 if ($sym == 13) { 1706 if ($sym == 13) {
1669 unshift @{$self->{history}}, 1707 unshift @{$self->{history}},
1670 my $txt = $self->get_text; 1708 my $txt = $self->get_text;
1671 $self->{history_pointer} = -1; 1709 $self->{history_pointer} = -1;
1672 $self->{history_saveback} = ''; 1710 $self->{history_saveback} = '';
1673 $self->emit (activate => $txt); 1711 $self->_emit (activate => $txt);
1674 $self->update; 1712 $self->update;
1675 1713
1676 } elsif ($sym == CFClient::SDLK_UP) { 1714 } elsif ($sym == CFClient::SDLK_UP) {
1677 if ($self->{history_pointer} < 0) { 1715 if ($self->{history_pointer} < 0) {
1678 $self->{history_saveback} = $self->get_text; 1716 $self->{history_saveback} = $self->get_text;
… …
1726 can_events => 1, 1764 can_events => 1,
1727 @_ 1765 @_
1728 ) 1766 )
1729} 1767}
1730 1768
1769sub activate { }
1770
1731sub button_up { 1771sub button_up {
1732 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1733 1773
1774 $self->emit ("activate")
1734 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1735 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1736 $self->emit ("activate");
1737 }
1738} 1777}
1739 1778
1740sub _draw { 1779sub _draw {
1741 my ($self) = @_; 1780 my ($self) = @_;
1742 1781
… …
1794 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1795 1834
1796 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1797 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1798 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1799 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1800 } 1839 }
1801} 1840}
1802 1841
1803sub _draw { 1842sub _draw {
1804 my ($self) = @_; 1843 my ($self) = @_;
… …
2120 if $unit; 2159 if $unit;
2121 2160
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123 2162
2124 if ($value != $old_value) { 2163 if ($value != $old_value) {
2125 $self->emit (changed => $value); 2164 $self->_emit (changed => $value);
2126 $self->update; 2165 $self->update;
2127 } 2166 }
2128} 2167}
2129 2168
2130sub size_request { 2169sub size_request {
… …
2512 2551
2513 # TODO: use animation 2552 # TODO: use animation
2514 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2515 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2516 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2517 $self->emit ("open"); 2556 $self->_emit ("open");
2518 } else { 2557 } else {
2519 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2520 $self->emit ("close"); 2559 $self->_emit ("close");
2521 } 2560 }
2522 2561
2523 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2524} 2563}
2525 2564
2526############################################################################# 2565#############################################################################
2527 2566
2528package CFClient::UI::Tooltip; 2567package CFClient::UI::Tooltip;
… …
2604 2643
2605sub new { 2644sub new {
2606 my $class = shift; 2645 my $class = shift;
2607 2646
2608 my $self = $class->SUPER::new ( 2647 my $self = $class->SUPER::new (
2609 aspect => 1, 2648 aspect => 1,
2649 can_events => 0,
2610 @_, 2650 @_,
2611 ); 2651 );
2612 2652
2613 if ($self->{anim} && $self->{animspeed}) { 2653 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self); 2654 Scalar::Util::weaken (my $widget = $self);
… …
2673 $self->SUPER::DESTROY; 2713 $self->SUPER::DESTROY;
2674} 2714}
2675 2715
2676############################################################################# 2716#############################################################################
2677 2717
2678package CFClient::UI::InventoryItem; 2718package CFClient::UI::Inventory;
2679 2719
2680our @ISA = CFClient::UI::HBox::; 2720our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub _item_to_desc {
2683 my ($item) = @_;
2684
2685 my $desc =
2686 $item->{nrof} < 2
2687 ? $item->{name}
2688 : "$item->{nrof} × $item->{name_pl}";
2689
2690 $item->{flags} & Crossfire::Protocol::F_OPEN
2691 and $desc .= " (open)";
2692 $item->{flags} & Crossfire::Protocol::F_APPLIED
2693 and $desc .= " (applied)";
2694 $item->{flags} & Crossfire::Protocol::F_UNPAID
2695 and $desc .= " (unpaid)";
2696 $item->{flags} & Crossfire::Protocol::F_MAGIC
2697 and $desc .= " (magic)";
2698 $item->{flags} & Crossfire::Protocol::F_CURSED
2699 and $desc .= " (cursed)";
2700 $item->{flags} & Crossfire::Protocol::F_DAMNED
2701 and $desc .= " (damned)";
2702 $item->{flags} & Crossfire::Protocol::F_LOCKED
2703 and $desc .= " *";
2704
2705 $desc
2706}
2707 2721
2708sub new { 2722sub new {
2709 my $class = shift; 2723 my $class = shift;
2710 2724
2711 my %args = @_;
2712
2713 my $item = delete $args{item};
2714
2715 my $desc = _item_to_desc ($item);
2716
2717 my $self = $class->SUPER::new ( 2725 my $self = $class->SUPER::new (
2718 can_hover => 1,
2719 can_events => 1,
2720 tooltip => ((CFClient::UI::Label::escape $desc)
2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2722 connect_button_down => sub {
2723 my ($self, $ev, $x, $y) = @_;
2724
2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2727 my $targ = $::CONN->{player}{tag};
2728
2729 if ($item->{container} == $::CONN->{player}{tag}) {
2730 $targ = $main::OPENCONT;
2731 }
2732
2733 $::CONN->send ("move $targ $item->{tag} 0");
2734 } elsif ($ev->{button} == 1) {
2735 $::CONN->send ("examine $item->{tag}");
2736 } elsif ($ev->{button} == 2) {
2737 $::CONN->send ("apply $item->{tag}");
2738 } elsif ($ev->{button} == 3) {
2739 my @menu_items = (
2740 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2741 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2742 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2743 (
2744 $item->{flags} & Crossfire::Protocol::F_LOCKED
2745 ? (
2746 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2747 )
2748 : (
2749 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2750 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2751 )
2752 ),
2753 );
2754
2755 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2756 }
2757
2758 1
2759 },
2760 %args
2761 );
2762
2763
2764 $self->add (new CFClient::UI::Face
2765 can_events => 0,
2766 face => $item->{face},
2767 anim => $item->{anim},
2768 animspeed => $item->{animspeed},
2769 );
2770
2771 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2772
2773 $self->{item} = $item;
2774
2775 $self->update_item;
2776
2777 $self
2778}
2779
2780sub update_item {
2781 my ($self) = @_;
2782
2783 my $desc = _item_to_desc ($self->{item});
2784
2785 $self->{name_lbl}->set_text ($desc);
2786}
2787
2788#############################################################################
2789
2790package CFClient::UI::Inventory;
2791
2792our @ISA = CFClient::UI::ScrolledWindow::;
2793
2794sub new {
2795 my $class = shift;
2796
2797 my $self = $class->SUPER::new (
2798 scrolled => (new CFClient::UI::Table), 2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2799 @_, 2727 @_,
2800 ); 2728 );
2801 2729
2802 $self 2730 $self
2803} 2731}
… …
2813 or ($a->{name} cmp $b->{name}) 2741 or ($a->{name} cmp $b->{name})
2814 } @$items; 2742 } @$items;
2815 2743
2816 $self->{real_items} = \@items; 2744 $self->{real_items} = \@items;
2817 2745
2746 my $row = 0;
2818 for my $item (@items) { 2747 for my $item (@items) {
2819 $item->{item} = $item; 2748 CFClient::Item::update_widgets $item;
2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2822 }
2823 2749
2824 my $i = 0; 2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2825 for (@items) { 2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2826 $self->{scrolled}->add (0, $i, $_); 2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2827 my $nrof = $_->{item}->{nrof} || 1; 2753
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); 2754 $row++;
2829 } 2755 }
2830 2756
2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2832} 2758}
2833 2759
… …
2876 2802
2877# 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)
2878sub popup { 2804sub popup {
2879 my ($self, $ev) = @_; 2805 my ($self, $ev) = @_;
2880 2806
2881 $self->emit ("popdown"); 2807 $self->_emit ("popdown");
2882 2808
2883 # maybe save $GRAB? must be careful about events... 2809 # maybe save $GRAB? must be careful about events...
2884 $GRAB = $self; 2810 $GRAB = $self;
2885 $self->{button} = $ev->{button}; 2811 $self->{button} = $ev->{button};
2886 2812
… …
2901 2827
2902 if ($ev->{button} == $self->{button}) { 2828 if ($ev->{button} == $self->{button}) {
2903 undef $GRAB; 2829 undef $GRAB;
2904 $self->hide; 2830 $self->hide;
2905 2831
2906 $self->emit ("popdown"); 2832 $self->_emit ("popdown");
2907 $self->{hover}[1]->() if $self->{hover}; 2833 $self->{hover}[1]->() if $self->{hover};
2908 } 2834 }
2909} 2835}
2910 2836
2911############################################################################# 2837#############################################################################
… …
2973sub add { 2899sub add {
2974 my ($self, $text, %arg) = @_; 2900 my ($self, $text, %arg) = @_;
2975 2901
2976 $text =~ s/^\s+//; 2902 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//; 2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2978 2906
2979 my $timeout = time + ((delete $arg{timeout}) || 60); 2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2980 2908
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982 2910
… …
3053} 2981}
3054 2982
3055sub size_allocate { 2983sub size_allocate {
3056 my ($self, $w, $h) = @_; 2984 my ($self, $w, $h) = @_;
3057 2985
3058 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3059 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3060
3061 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3062 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3063
3064 for my $child ($self->children) { 2986 for my $child ($self->children) {
3065 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3066 2988
3067 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3068 if exists $child->{req_x}; 2990 if exists $child->{req_x};
… …
3104 $w->{root} = $self; 3026 $w->{root} = $self;
3105 $w->{visible} = 1; 3027 $w->{visible} = 1;
3106 } 3028 }
3107 3029
3108 for my $child (@children) { 3030 for my $child (@children) {
3109 $child->{toplevel} = 1; 3031 $child->{is_toplevel} = 1;
3110 3032
3111 # integerise window positions 3033 # integerise window positions
3112 $child->{x} = int $child->{x}; 3034 $child->{x} = int $child->{x};
3113 $child->{y} = int $child->{y}; 3035 $child->{y} = int $child->{y};
3114 } 3036 }
… …
3122 $self->SUPER::remove (@children); 3044 $self->SUPER::remove (@children);
3123 3045
3124 while (@children) { 3046 while (@children) {
3125 my $w = pop @children; 3047 my $w = pop @children;
3126 push @children, $w->children; 3048 push @children, $w->children;
3127 delete $w->{visible}; 3049 $w->set_invisible;
3128 } 3050 }
3129} 3051}
3130 3052
3131sub on_refresh { 3053sub on_refresh {
3132 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
… …
3186 $w = 0 if $w < 0; 3108 $w = 0 if $w < 0;
3187 $h = 0 if $h < 0; 3109 $h = 0 if $h < 0;
3188 3110
3189 $widget->{w} = $w; 3111 $widget->{w} = $w;
3190 $widget->{h} = $h; 3112 $widget->{h} = $h;
3191 $widget->size_allocate ($w, $h);
3192 $widget->emit (size_allocate => $w, $h); 3113 $widget->emit (size_allocate => $w, $h);
3193 } 3114 }
3194 } 3115 }
3195 3116
3196 while ($self->{post_alloc_hook}) { 3117 while ($self->{post_alloc_hook}) {

Diff Legend

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