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.243 by root, Sat May 27 20:46:54 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
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
50 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
74 check_tooltip; 94 check_tooltip;
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 check_tooltip;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
192 can_events => 1, 206 can_events => 1,
193 @_ 207 @_
194 }, $class; 208 }, $class;
195 209
196 for (keys %$self) { 210 for (keys %$self) {
197 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
199 } 213 }
200 } 214 }
201 215
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
203 224
204 $self 225 $self
205} 226}
206 227
207sub destroy { 228sub destroy {
… …
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 }, 251 },
231 ); 252 );
232} 253}
233 254
234sub hide { 255sub set_invisible {
235 my ($self) = @_; 256 my ($self) = @_;
257
258 # broken show/hide model
259
260 delete $self->{root};
261 delete $self->{visible};
236 262
237 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 264 undef $HOVER if $HOVER == $self;
265
266 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self;
268
269 $self->focus_out;
270}
271
272sub hide {
273 my ($self) = @_;
274
275 $self->set_invisible;
239 276
240 $self->{parent}->remove ($self) 277 $self->{parent}->remove ($self)
241 if $self->{parent}; 278 if $self->{parent};
242} 279}
243 280
… …
313} 350}
314 351
315sub set_tooltip { 352sub set_tooltip {
316 my ($self, $tooltip) = @_; 353 my ($self, $tooltip) = @_;
317 354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
359
318 $self->{tooltip} = $tooltip; 360 $self->{tooltip} = $tooltip;
319 361
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 363 delete $CFClient::UI::TOOLTIP->{owner};
322 CFClient::UI::check_tooltip; 364 CFClient::UI::check_tooltip;
… …
343 return if $FOCUS == $self; 385 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
345 387
346 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
347 389
348 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
349 391
350 $focus->update if $focus; 392 $focus->update if $focus;
351 $FOCUS->update; 393 $FOCUS->update;
352} 394}
353 395
… …
356 398
357 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
358 400
359 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
360 402
361 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
362 404
363 $focus->update if $focus; #? 405 $focus->update if $focus; #?
406
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408 unless $FOCUS;
364} 409}
365 410
366sub mouse_motion { } 411sub mouse_motion { }
367sub button_up { } 412sub button_up { }
368sub key_down { } 413sub key_down { }
369sub key_up { } 414sub key_up { }
370 415
371sub button_down { 416sub button_down {
372 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
373 418
374 $self->focus_in; 419 $self->focus_in;
… …
408 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix; 454 glPushMatrix;
410 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 458 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
415 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
416 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
417 glEnd; 462 glEnd;
418 glPopMatrix; 463 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 465 }
421} 466}
… …
441sub set_parent { 486sub set_parent {
442 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
443 488
444 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
445 490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
446 # TODO: req_w _does_change after ->reconfigure 494 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size 495 $self->check_size
448 unless exists $self->{req_w}; 496 unless exists $self->{req_w};
449 497
450 $self->show; 498 $self->show;
… …
468 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
469 517
470 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
471} 519}
472 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
473sub emit { 527sub emit {
474 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
475 529
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
477} 532}
478 533
479sub DESTROY { 534sub DESTROY {
480 my ($self) = @_; 535 my ($self) = @_;
481 536
… …
594 delete $child->{parent}; 649 delete $child->{parent};
595 $child->hide; 650 $child->hide;
596 651
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 653
599 $self->check_size; 654 $self->check_size (1);
600 $self->update; 655 $self->update;
601} 656}
602 657
603sub clear { 658sub clear {
604 my ($self) = @_; 659 my ($self) = @_;
… …
744 799
745package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
746 801
747our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
748 803
804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
813
749sub size_request { 814sub size_request {
750 my ($self) = @_; 815 my ($self) = @_;
751 816
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
753 818
… …
755} 820}
756 821
757sub size_allocate { 822sub size_allocate {
758 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
759 824
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
761# $w = $self->{w}; 826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827
762 $self->child->configure (0, 0, $cw, $ch); 828 $self->child->configure (0, 0, $w, $h);
763 $self->update; 829 $self->update;
764} 830}
765 831
766sub set_offset { 832sub set_offset {
767 my ($self, $x, $y) = @_; 833 my ($self, $x, $y) = @_;
… …
818 my $class = shift; 884 my $class = shift;
819 885
820 my $self; 886 my $self;
821 887
822 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
823 vertical => 1, 889 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 891 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 892 $self->{vp}->set_offset (0, $_[1]);
827 }, 893 },
828 ; 894 ;
829 895
830 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
… …
836 $self->{vp}->add ($self->{scrolled}); 902 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp}); 903 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
839 905
840 $self 906 $self
907}
908
909sub update {
910 my ($self) = @_;
911
912 $self->SUPER::update;
913
914 # todo: overwrite size_allocate of child
915 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 917}
842 918
843sub size_allocate { 919sub size_allocate {
844 my ($self, $w, $h) = @_; 920 my ($self, $w, $h) = @_;
845 921
… …
975 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
976 1052
977 my $dx = $ev->{x} - $ox; 1053 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1054 my $dy = $ev->{y} - $oy;
979 1055
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1060 $self->move ($self->{user_x}, $self->{user_y});
983 $self->check_size; 1061 $self->check_size;
984 }; 1062 };
985 1063
986 } elsif ($lr ^ $td) { 1064 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
990 $self->{motion} = sub { 1068 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
992 1070
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
994 1072
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1073 $self->{user_x} = $bx + $x - $ox;
1074 $self->{user_y} = $by + $y - $oy;
1075 $self->move ($self->{user_x}, $self->{user_y});
996 $self->update; 1076 $self->update;
997 }; 1077 };
998 } 1078 }
999} 1079}
1000 1080
… …
1062sub new { 1142sub new {
1063 my $class = shift; 1143 my $class = shift;
1064 1144
1065 $class->SUPER::new ( 1145 $class->SUPER::new (
1066 col_expand => [], 1146 col_expand => [],
1067 @_ 1147 @_,
1068 ) 1148 )
1149}
1150
1151sub children {
1152 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1153}
1070 1154
1071sub add { 1155sub add {
1072 my ($self, $x, $y, $child) = @_; 1156 my ($self, $x, $y, $child) = @_;
1073 1157
1074 $child->set_parent ($self); 1158 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1159 $self->{children}[$y][$x] = $child;
1076 1160
1077 $child->check_size; 1161 $self->check_size (1);
1078} 1162}
1079 1163
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1164# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1165sub clear {
1086 my ($self) = @_; 1166 my ($self) = @_;
1087 1167
1088 my @children = $self->children; 1168 my @children = $self->children;
1089 delete $self->{children}; 1169 delete $self->{children};
… …
1091 for (@children) { 1171 for (@children) {
1092 delete $_->{parent}; 1172 delete $_->{parent};
1093 $_->hide; 1173 $_->hide;
1094 } 1174 }
1095 1175
1176 $self->check_size (1);
1096 $self->update; 1177 $self->update;
1097} 1178}
1098 1179
1099sub get_wh { 1180sub get_wh {
1100 my ($self) = @_; 1181 my ($self) = @_;
… …
1132sub size_allocate { 1213sub size_allocate {
1133 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1134 1215
1135 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
1136 1217
1137 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
1139 1220
1140 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
1524 $self->{text} = $text; 1605 $self->{text} = $text;
1525 1606
1526 $text =~ s/./*/g if $self->{hidden}; 1607 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1608 $self->{layout}->set_text ("$text ");
1528 1609
1529 $self->emit (changed => $self->{text}); 1610 $self->_emit (changed => $self->{text});
1530} 1611}
1531 1612
1532sub set_text { 1613sub set_text {
1533 my ($self, $text) = @_; 1614 my ($self, $text) = @_;
1534 1615
… …
1546 my ($self) = @_; 1627 my ($self) = @_;
1547 1628
1548 my ($w, $h) = $self->SUPER::size_request; 1629 my ($w, $h) = $self->SUPER::size_request;
1549 1630
1550 ($w + 1, $h) # add 1 for cursor 1631 ($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} 1632}
1558 1633
1559sub key_down { 1634sub key_down {
1560 my ($self, $ev) = @_; 1635 my ($self, $ev) = @_;
1561 1636
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1651 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1652 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1653 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1654 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1655 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1656 $self->_emit ('escape');
1582 } elsif ($uni) { 1657 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1658 substr $text, $self->{cursor}++, 0, chr $uni;
1584 } 1659 }
1585 1660
1586 $self->_set_text ($text); 1661 $self->_set_text ($text);
… …
1673 if ($sym == 13) { 1748 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1749 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1750 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1751 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1752 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1753 $self->_emit (activate => $txt);
1679 $self->update; 1754 $self->update;
1680 1755
1681 } elsif ($sym == CFClient::SDLK_UP) { 1756 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1757 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1758 $self->{history_saveback} = $self->get_text;
… …
1731 can_events => 1, 1806 can_events => 1,
1732 @_ 1807 @_
1733 ) 1808 )
1734} 1809}
1735 1810
1811sub activate { }
1812
1736sub button_up { 1813sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1814 my ($self, $ev, $x, $y) = @_;
1738 1815
1816 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1817 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1818 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate");
1742 }
1743} 1819}
1744 1820
1745sub _draw { 1821sub _draw {
1746 my ($self) = @_; 1822 my ($self) = @_;
1747 1823
… …
1799 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1800 1876
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1803 $self->{state} = !$self->{state}; 1879 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1880 $self->_emit (changed => $self->{state});
1805 } 1881 }
1806} 1882}
1807 1883
1808sub _draw { 1884sub _draw {
1809 my ($self) = @_; 1885 my ($self) = @_;
… …
2102} 2178}
2103 2179
2104sub set_range { 2180sub set_range {
2105 my ($self, $range) = @_; 2181 my ($self, $range) = @_;
2106 2182
2107 $self->{range} = $range; 2183 ($range, $self->{range}) = ($self->{range}, $range);
2108 2184
2109 $self->update; 2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2110} 2187}
2111 2188
2112sub set_value { 2189sub set_value {
2113 my ($self, $value) = @_; 2190 my ($self, $value) = @_;
2114 2191
… …
2125 if $unit; 2202 if $unit;
2126 2203
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2205
2129 if ($value != $old_value) { 2206 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2207 $self->_emit (changed => $value);
2131 $self->update; 2208 $self->update;
2132 } 2209 }
2133} 2210}
2134 2211
2135sub size_request { 2212sub size_request {
… …
2497 2574
2498sub new { 2575sub new {
2499 my $class = shift; 2576 my $class = shift;
2500 2577
2501 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2502 state => 0, 2579 state => 0,
2503 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2504 @_ 2581 @_
2505 ); 2582 );
2506 2583
2507 if ($self->{state}) { 2584 if ($self->{state}) {
2508 $self->{state} = 0; 2585 $self->{state} = 0;
… …
2517 2594
2518 # TODO: use animation 2595 # TODO: use animation
2519 if ($self->{state} = !$self->{state}) { 2596 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other}); 2597 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h})); 2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open"); 2599 $self->_emit ("open");
2523 } else { 2600 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other}); 2601 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close"); 2602 $self->_emit ("close");
2526 } 2603 }
2527 2604
2528 $self->emit (changed => $self->{state}); 2605 $self->_emit (changed => $self->{state});
2529} 2606}
2530 2607
2531############################################################################# 2608#############################################################################
2532 2609
2533package CFClient::UI::Tooltip; 2610package CFClient::UI::Tooltip;
… …
2609 2686
2610sub new { 2687sub new {
2611 my $class = shift; 2688 my $class = shift;
2612 2689
2613 my $self = $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2614 aspect => 1, 2691 aspect => 1,
2692 can_events => 0,
2615 @_, 2693 @_,
2616 ); 2694 );
2617 2695
2618 if ($self->{anim} && $self->{animspeed}) { 2696 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2697 Scalar::Util::weaken (my $widget = $self);
… …
2678 $self->SUPER::DESTROY; 2756 $self->SUPER::DESTROY;
2679} 2757}
2680 2758
2681############################################################################# 2759#############################################################################
2682 2760
2683package CFClient::UI::InventoryItem; 2761package CFClient::UI::Inventory;
2684 2762
2685our @ISA = CFClient::UI::HBox::; 2763our @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 2764
2713sub new { 2765sub new {
2714 my $class = shift; 2766 my $class = shift;
2715 2767
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 ( 2768 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), 2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2804 @_, 2770 @_,
2805 ); 2771 );
2806 2772
2807 $self 2773 $self
2808} 2774}
… …
2818 or ($a->{name} cmp $b->{name}) 2784 or ($a->{name} cmp $b->{name})
2819 } @$items; 2785 } @$items;
2820 2786
2821 $self->{real_items} = \@items; 2787 $self->{real_items} = \@items;
2822 2788
2789 my $row = 0;
2823 for my $item (@items) { 2790 for my $item (@items) {
2824 $item->{item} = $item; 2791 CFClient::Item::update_widgets $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828 2792
2829 my $i = 0; 2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2830 for (@items) { 2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2831 $self->{scrolled}->add (0, $i, $_); 2795 $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 2796
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2797 $row++;
2798 }
2837} 2799}
2838 2800
2839sub size_request { 2801sub size_request {
2840 my ($self) = @_; 2802 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h}); 2803 ($self->{req_w}, $self->{req_h});
… …
2881 2843
2882# popup given the event (must be a mouse button down event currently) 2844# popup given the event (must be a mouse button down event currently)
2883sub popup { 2845sub popup {
2884 my ($self, $ev) = @_; 2846 my ($self, $ev) = @_;
2885 2847
2886 $self->emit ("popdown"); 2848 $self->_emit ("popdown");
2887 2849
2888 # maybe save $GRAB? must be careful about events... 2850 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2851 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2852 $self->{button} = $ev->{button};
2891 2853
… …
2906 2868
2907 if ($ev->{button} == $self->{button}) { 2869 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2870 undef $GRAB;
2909 $self->hide; 2871 $self->hide;
2910 2872
2911 $self->emit ("popdown"); 2873 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2874 $self->{hover}[1]->() if $self->{hover};
2913 } 2875 }
2914} 2876}
2915 2877
2916############################################################################# 2878#############################################################################
… …
2978sub add { 2940sub add {
2979 my ($self, $text, %arg) = @_; 2941 my ($self, $text, %arg) = @_;
2980 2942
2981 $text =~ s/^\s+//; 2943 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 2944 $text =~ s/\s+$//;
2945
2946 return unless $text;
2983 2947
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 2948 my $timeout = time + ((delete $arg{timeout}) || 60);
2985 2949
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 2951
… …
3031 2995
3032sub new { 2996sub new {
3033 my $class = shift; 2997 my $class = shift;
3034 2998
3035 $class->SUPER::new ( 2999 $class->SUPER::new (
3000 visible => 1,
3036 @_, 3001 @_,
3037 ) 3002 )
3038} 3003}
3039 3004
3040sub configure { 3005sub configure {
… …
3098sub add { 3063sub add {
3099 my ($self, @children) = @_; 3064 my ($self, @children) = @_;
3100 3065
3101 for (my @widgets = @children; my $w = pop @widgets; ) { 3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children; 3067 push @widgets, $w->children;
3103 $w->{root} = $self; 3068 $w->{root} = $self;
3104 $w->{visible} = 1; 3069 $w->{visible} = $self->{visible} + 1;
3105 } 3070 }
3106 3071
3107 for my $child (@children) { 3072 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3073 $child->{is_toplevel} = 1;
3109 3074
… …
3121 $self->SUPER::remove (@children); 3086 $self->SUPER::remove (@children);
3122 3087
3123 while (@children) { 3088 while (@children) {
3124 my $w = pop @children; 3089 my $w = pop @children;
3125 push @children, $w->children; 3090 push @children, $w->children;
3126 delete $w->{visible}; 3091 $w->set_invisible;
3127 } 3092 }
3128} 3093}
3129 3094
3130sub on_refresh { 3095sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
… …
3146 $_->() 3111 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3112 for values %{delete $self->{refresh_hook}};
3148 } 3113 }
3149 3114
3150 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
3151 my @queue = ([], []); 3116 my @queue;
3152 3117
3153 for (;;) { 3118 for (;;) {
3154 if ($self->{check_size}) { 3119 if ($self->{check_size}) {
3155 # heuristic: check containers last 3120 #TODO use array-of-depth approach
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
3157 for values %{delete $self->{check_size}} 3123 @queue, values %{delete $self->{check_size}};
3158 } 3124 }
3159 3125
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3126 my $widget = pop @queue || last;
3127
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3161 3129
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3163 ? @$widget{qw(user_w user_h)} 3131 ? @$widget{qw(user_w user_h)}
3164 : $widget->size_request; 3132 : $widget->size_request;
3165 3133
… …
3185 $w = 0 if $w < 0; 3153 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3154 $h = 0 if $h < 0;
3187 3155
3188 $widget->{w} = $w; 3156 $widget->{w} = $w;
3189 $widget->{h} = $h; 3157 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h);
3191 $widget->emit (size_allocate => $w, $h); 3158 $widget->emit (size_allocate => $w, $h);
3192 } 3159 }
3193 } 3160 }
3194 3161
3195 while ($self->{post_alloc_hook}) { 3162 while ($self->{post_alloc_hook}) {

Diff Legend

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