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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 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) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $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}; 178 $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}; 179 $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}; 180 $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}; 181 $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}; 182 $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}; 183 $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}; 184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 185 }
167
168 $widget->reconfigure;
169 } 186 }
187
188 reconfigure_widgets;
170} 189}
171 190
172############################################################################# 191#############################################################################
173 192
174package CFClient::UI::Base; 193package CFClient::UI::Base;
… …
187 can_events => 1, 206 can_events => 1,
188 @_ 207 @_
189 }, $class; 208 }, $class;
190 209
191 for (keys %$self) { 210 for (keys %$self) {
192 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
194 } 213 }
195 } 214 }
196 215
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 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 }
224
199 $self 225 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
200} 236}
201 237
202sub destroy { 238sub destroy {
203 my ($self) = @_; 239 my ($self) = @_;
204 240
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 261 },
226 ); 262 );
227} 263}
228 264
229sub hide { 265sub set_invisible {
230 my ($self) = @_; 266 my ($self) = @_;
267
268 return unless $self->{visible};
269
270 # broken show/hide model
271
272 delete $self->{root};
273 delete $self->{visible};
231 274
232 undef $GRAB if $GRAB == $self; 275 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 276 undef $HOVER if $HOVER == $self;
277
278 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self;
280
281 $self->focus_out;
282
283 $self->emit (visibility_change => 0);
284}
285
286sub hide {
287 my ($self) = @_;
288
289 $self->set_invisible;
234 290
235 $self->{parent}->remove ($self) 291 $self->{parent}->remove ($self)
236 if $self->{parent}; 292 if $self->{parent};
237} 293}
238 294
… …
308} 364}
309 365
310sub set_tooltip { 366sub set_tooltip {
311 my ($self, $tooltip) = @_; 367 my ($self, $tooltip) = @_;
312 368
369 $tooltip =~ s/^\s+//;
370 $tooltip =~ s/\s+$//;
371
372 return if $self->{tooltip} eq $tooltip;
373
313 $self->{tooltip} = $tooltip; 374 $self->{tooltip} = $tooltip;
314 375
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 376 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 377 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 378 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 399 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 400 return unless $self->{can_focus};
340 401
341 my $focus = $FOCUS; $FOCUS = $self; 402 my $focus = $FOCUS; $FOCUS = $self;
342 403
343 $self->emit (focus_in => $focus); 404 $self->_emit (focus_in => $focus);
344 405
345 $focus->update if $focus; 406 $focus->update if $focus;
346 $FOCUS->update; 407 $FOCUS->update;
347} 408}
348 409
… …
351 412
352 return unless $FOCUS == $self; 413 return unless $FOCUS == $self;
353 414
354 my $focus = $FOCUS; undef $FOCUS; 415 my $focus = $FOCUS; undef $FOCUS;
355 416
356 $self->emit (focus_out => $focus); 417 $self->_emit (focus_out => $focus);
357 418
358 $focus->update if $focus; #? 419 $focus->update if $focus; #?
420
421 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
422 unless $FOCUS;
359} 423}
360 424
361sub mouse_motion { } 425sub mouse_motion { }
362sub button_up { } 426sub button_up { }
363sub key_down { } 427sub key_down { }
364sub key_up { } 428sub key_up { }
365 429
366sub button_down { 430sub button_down {
367 my ($self, $ev, $x, $y) = @_; 431 my ($self, $ev, $x, $y) = @_;
368 432
369 $self->focus_in; 433 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 467 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 468 glPushMatrix;
405 glColor 1, 1, 0, 1; 469 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 471 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 472 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 473 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 474 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 475 glVertex 0 , $self->{h} - 1;
412 glEnd; 476 glEnd;
413 glPopMatrix; 477 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 478 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 479 }
416} 480}
… …
436sub set_parent { 500sub set_parent {
437 my ($self, $parent) = @_; 501 my ($self, $parent) = @_;
438 502
439 Scalar::Util::weaken ($self->{parent} = $parent); 503 Scalar::Util::weaken ($self->{parent} = $parent);
440 504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
441 # TODO: req_w _does_change after ->reconfigure 513 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 514 $self->check_size
443 unless exists $self->{req_w}; 515 unless exists $self->{req_w};
444 516
445 $self->show; 517 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
464 536
465 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 538}
467 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
468sub emit { 546sub emit {
469 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
470 548
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
472} 555}
473 556
474sub DESTROY { 557sub DESTROY {
475 my ($self) = @_; 558 my ($self) = @_;
476 559
… …
589 delete $child->{parent}; 672 delete $child->{parent};
590 $child->hide; 673 $child->hide;
591 674
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 676
594 $self->check_size; 677 $self->check_size (1);
595 $self->update; 678 $self->update;
596} 679}
597 680
598sub clear { 681sub clear {
599 my ($self) = @_; 682 my ($self) = @_;
… …
739 822
740package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
741 824
742our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
743 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
744sub size_request { 837sub size_request {
745 my ($self) = @_; 838 my ($self) = @_;
746 839
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 841
… …
750} 843}
751 844
752sub size_allocate { 845sub size_allocate {
753 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
754 847
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
757 $self->child->configure (0, 0, $cw, $ch); 851 $self->child->configure (0, 0, $w, $h);
758 $self->update; 852 $self->update;
759} 853}
760 854
761sub set_offset { 855sub set_offset {
762 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
813 my $class = shift; 907 my $class = shift;
814 908
815 my $self; 909 my $self;
816 910
817 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
818 vertical => 1, 912 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 914 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 915 $self->{vp}->set_offset (0, $_[1]);
822 }, 916 },
823 ; 917 ;
824 918
825 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 920 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 926 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
834 928
835 $self 929 $self
930}
931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940}
941
942sub size_allocate {
943 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 949}
837 950
838#TODO# update range on size_allocate depending on child 951#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 952# update viewport offset on scroll
840 953
… …
894 my $class = shift; 1007 my $class = shift;
895 1008
896 # TODO: user_x, user_y, overwrite moveto? 1009 # TODO: user_x, user_y, overwrite moveto?
897 1010
898 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1014 border => 0.6,
902 toplevel => 1, 1015 is_toplevel => 1,
903 can_events => 1, 1016 can_events => 1,
904 @_ 1017 @_
905 ); 1018 );
906 1019
907 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 1021 align => 0,
… …
961 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
962 1075
963 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
965 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
969 $self->check_size; 1084 $self->check_size;
970 }; 1085 };
971 1086
972 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
976 $self->{motion} = sub { 1091 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
978 1093
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
980 1095
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098 $self->move ($self->{user_x}, $self->{user_y});
982 $self->update; 1099 $self->update;
983 }; 1100 };
984 } 1101 }
985} 1102}
986 1103
… …
1048sub new { 1165sub new {
1049 my $class = shift; 1166 my $class = shift;
1050 1167
1051 $class->SUPER::new ( 1168 $class->SUPER::new (
1052 col_expand => [], 1169 col_expand => [],
1053 @_ 1170 @_,
1054 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1176}
1056 1177
1057sub add { 1178sub add {
1058 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1059 1180
1060 $child->set_parent ($self); 1181 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1062 1183
1063 $child->check_size; 1184 $self->check_size (1);
1064} 1185}
1065 1186
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1187# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1188sub clear {
1072 my ($self) = @_; 1189 my ($self) = @_;
1073 1190
1074 my @children = $self->children; 1191 my @children = $self->children;
1075 delete $self->{children}; 1192 delete $self->{children};
… …
1077 for (@children) { 1194 for (@children) {
1078 delete $_->{parent}; 1195 delete $_->{parent};
1079 $_->hide; 1196 $_->hide;
1080 } 1197 }
1081 1198
1199 $self->check_size (1);
1082 $self->update; 1200 $self->update;
1083} 1201}
1084 1202
1085sub get_wh { 1203sub get_wh {
1086 my ($self) = @_; 1204 my ($self) = @_;
… …
1118sub size_allocate { 1236sub size_allocate {
1119 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1120 1238
1121 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1122 1240
1123 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1125 1243
1126 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1510 $self->{text} = $text; 1628 $self->{text} = $text;
1511 1629
1512 $text =~ s/./*/g if $self->{hidden}; 1630 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1631 $self->{layout}->set_text ("$text ");
1514 1632
1515 $self->emit (changed => $self->{text}); 1633 $self->_emit (changed => $self->{text});
1516} 1634}
1517 1635
1518sub set_text { 1636sub set_text {
1519 my ($self, $text) = @_; 1637 my ($self, $text) = @_;
1520 1638
… …
1532 my ($self) = @_; 1650 my ($self) = @_;
1533 1651
1534 my ($w, $h) = $self->SUPER::size_request; 1652 my ($w, $h) = $self->SUPER::size_request;
1535 1653
1536 ($w + 1, $h) # add 1 for cursor 1654 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1655}
1544 1656
1545sub key_down { 1657sub key_down {
1546 my ($self, $ev) = @_; 1658 my ($self, $ev) = @_;
1547 1659
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1674 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1675 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1676 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1677 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1678 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1679 $self->_emit ('escape');
1568 } elsif ($uni) { 1680 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1681 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1682 }
1571 1683
1572 $self->_set_text ($text); 1684 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1771 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1772 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1773 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1774 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1775 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1776 $self->_emit (activate => $txt);
1665 $self->update; 1777 $self->update;
1666 1778
1667 } elsif ($sym == CFClient::SDLK_UP) { 1779 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1780 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1781 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1829 can_events => 1,
1718 @_ 1830 @_
1719 ) 1831 )
1720} 1832}
1721 1833
1834sub activate { }
1835
1722sub button_up { 1836sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1724 1838
1839 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1840 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1841 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1842}
1730 1843
1731sub _draw { 1844sub _draw {
1732 my ($self) = @_; 1845 my ($self) = @_;
1733 1846
… …
1785 my ($self, $ev, $x, $y) = @_; 1898 my ($self, $ev, $x, $y) = @_;
1786 1899
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1902 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1903 $self->_emit (changed => $self->{state});
1791 } 1904 }
1792} 1905}
1793 1906
1794sub _draw { 1907sub _draw {
1795 my ($self) = @_; 1908 my ($self) = @_;
… …
2088} 2201}
2089 2202
2090sub set_range { 2203sub set_range {
2091 my ($self, $range) = @_; 2204 my ($self, $range) = @_;
2092 2205
2093 $self->{range} = $range; 2206 ($range, $self->{range}) = ($self->{range}, $range);
2094 2207
2095 $self->update; 2208 $self->update
2209 if "@$range" ne "@{$self->{range}}";
2096} 2210}
2097 2211
2098sub set_value { 2212sub set_value {
2099 my ($self, $value) = @_; 2213 my ($self, $value) = @_;
2100 2214
… …
2111 if $unit; 2225 if $unit;
2112 2226
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2227 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2228
2115 if ($value != $old_value) { 2229 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2230 $self->_emit (changed => $value);
2117 $self->update; 2231 $self->update;
2118 } 2232 }
2119} 2233}
2120 2234
2121sub size_request { 2235sub size_request {
… …
2483 2597
2484sub new { 2598sub new {
2485 my $class = shift; 2599 my $class = shift;
2486 2600
2487 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2488 state => 0, 2602 state => 0,
2489 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2490 @_ 2604 @_
2491 ); 2605 );
2492 2606
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2607 $self
2499} 2608}
2500 2609
2501sub toggle_flopper { 2610sub toggle_flopper {
2502 my ($self) = @_; 2611 my ($self) = @_;
2503 2612
2504 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2505 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open");
2509 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close");
2512 }
2513
2514 $self->emit (changed => $self->{state});
2515} 2614}
2516 2615
2517############################################################################# 2616#############################################################################
2518 2617
2519package CFClient::UI::Tooltip; 2618package CFClient::UI::Tooltip;
… …
2595 2694
2596sub new { 2695sub new {
2597 my $class = shift; 2696 my $class = shift;
2598 2697
2599 my $self = $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2600 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2601 @_, 2701 @_,
2602 ); 2702 );
2603 2703
2604 if ($self->{anim} && $self->{animspeed}) { 2704 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2705 Scalar::Util::weaken (my $widget = $self);
… …
2664 $self->SUPER::DESTROY; 2764 $self->SUPER::DESTROY;
2665} 2765}
2666 2766
2667############################################################################# 2767#############################################################################
2668 2768
2669package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2670 2770
2671our @ISA = CFClient::UI::HBox::; 2771our @ISA = CFClient::UI::ScrolledWindow::;
2672
2673sub _item_to_desc {
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2698 2772
2699sub new { 2773sub new {
2700 my $class = shift; 2774 my $class = shift;
2701 2775
2702 my %args = @_;
2703
2704 my $item = delete $args{item};
2705
2706 my $desc = _item_to_desc ($item);
2707
2708 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2709 can_hover => 1,
2710 can_events => 1,
2711 tooltip => ((CFClient::UI::Label::escape $desc)
2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713 connect_button_down => sub {
2714 my ($self, $ev, $x, $y) = @_;
2715
2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2727 } elsif ($ev->{button} == 2) {
2728 $::CONN->send ("apply $item->{tag}");
2729 } elsif ($ev->{button} == 3) {
2730 my @menu_items = (
2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2743 ),
2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747 }
2748
2749 1
2750 },
2751 %args
2752 );
2753
2754
2755 $self->add (new CFClient::UI::Face
2756 can_events => 0,
2757 face => $item->{face},
2758 anim => $item->{anim},
2759 animspeed => $item->{animspeed},
2760 );
2761
2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764 $self->{item} = $item;
2765
2766 $self->update_item;
2767
2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2777}
2778
2779#############################################################################
2780
2781package CFClient::UI::Inventory;
2782
2783our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785sub new {
2786 my $class = shift;
2787
2788 my $self = $class->SUPER::new (
2789 scrolled => (new CFClient::UI::Table), 2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2790 @_, 2778 @_,
2791 ); 2779 );
2792 2780
2793 $self 2781 $self
2794} 2782}
… …
2804 or ($a->{name} cmp $b->{name}) 2792 or ($a->{name} cmp $b->{name})
2805 } @$items; 2793 } @$items;
2806 2794
2807 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2808 2796
2797 my $row = 0;
2809 for my $item (@items) { 2798 for my $item (@items) {
2810 $item->{item} = $item; 2799 CFClient::Item::update_widgets $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814 2800
2815 my $i = 0; 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2816 for (@items) { 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2817 $self->{scrolled}->add (0, $i, $_); 2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2821 2804
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2805 $row++;
2806 }
2823} 2807}
2824 2808
2825sub size_request { 2809sub size_request {
2826 my ($self) = @_; 2810 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h}); 2811 ($self->{req_w}, $self->{req_h});
… …
2867 2851
2868# popup given the event (must be a mouse button down event currently) 2852# popup given the event (must be a mouse button down event currently)
2869sub popup { 2853sub popup {
2870 my ($self, $ev) = @_; 2854 my ($self, $ev) = @_;
2871 2855
2872 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2873 2857
2874 # maybe save $GRAB? must be careful about events... 2858 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 2859 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 2860 $self->{button} = $ev->{button};
2877 2861
… …
2892 2876
2893 if ($ev->{button} == $self->{button}) { 2877 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 2878 undef $GRAB;
2895 $self->hide; 2879 $self->hide;
2896 2880
2897 $self->emit ("popdown"); 2881 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2882 $self->{hover}[1]->() if $self->{hover};
2899 } 2883 }
2900} 2884}
2901 2885
2902############################################################################# 2886#############################################################################
… …
2964sub add { 2948sub add {
2965 my ($self, $text, %arg) = @_; 2949 my ($self, $text, %arg) = @_;
2966 2950
2967 $text =~ s/^\s+//; 2951 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2969 2955
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2971 2957
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 2959
… …
3017 3003
3018sub new { 3004sub new {
3019 my $class = shift; 3005 my $class = shift;
3020 3006
3021 $class->SUPER::new ( 3007 $class->SUPER::new (
3008 visible => 1,
3022 @_, 3009 @_,
3023 ) 3010 )
3024} 3011}
3025 3012
3026sub configure { 3013sub configure {
… …
3044} 3031}
3045 3032
3046sub size_allocate { 3033sub size_allocate {
3047 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h) = @_;
3048 3035
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055 for my $child ($self->children) { 3036 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3038
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3059 if exists $child->{req_x}; 3040 if exists $child->{req_x};
3060 3041
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3062 if exists $child->{req_y}; 3043 if exists $child->{req_y};
3063 3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3064 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066 3050
3067 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
3068 } 3052 }
… …
3088} 3072}
3089 3073
3090sub add { 3074sub add {
3091 my ($self, @children) = @_; 3075 my ($self, @children) = @_;
3092 3076
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3093 for my $child (@children) { 3083 for my $child (@children) {
3094 $child->{toplevel} = 1; 3084 $child->{is_toplevel} = 1;
3095 3085
3096 # integerise window positions 3086 # integerise window positions
3097 $child->{x} = int $child->{x}; 3087 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y}; 3088 $child->{y} = int $child->{y};
3099 } 3089 }
3100 3090
3101 $self->SUPER::add (@children); 3091 $self->SUPER::add (@children);
3092}
3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3102 3098
3103 while (@children) { 3099 while (@children) {
3104 my $w = pop @children; 3100 my $w = pop @children;
3105 push @children, $w->children; 3101 push @children, $w->children;
3106 $w->{visible} = 1; 3102 $w->set_invisible;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 } 3103 }
3120} 3104}
3121 3105
3122sub on_refresh { 3106sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
… …
3138 $_->() 3122 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3140 } 3124 }
3141 3125
3142 if ($self->{check_size}) { 3126 if ($self->{check_size}) {
3143 my @queue = ([], []); 3127 my @queue;
3144 3128
3145 for (;;) { 3129 for (;;) {
3146 if ($self->{check_size}) { 3130 if ($self->{check_size}) {
3147 # heuristic: check containers last 3131 #TODO use array-of-depth approach
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3133 @queue = sort { $a->{visible} <=> $b->{visible} }
3149 for values %{delete $self->{check_size}} 3134 @queue, values %{delete $self->{check_size}};
3150 } 3135 }
3151 3136
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3137 my $widget = pop @queue || last;
3138
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3153 3140
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3155 ? @$widget{qw(user_w user_h)} 3142 ? @$widget{qw(user_w user_h)}
3156 : $widget->size_request; 3143 : $widget->size_request;
3157 3144
… …
3177 $w = 0 if $w < 0; 3164 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3165 $h = 0 if $h < 0;
3179 3166
3180 $widget->{w} = $w; 3167 $widget->{w} = $w;
3181 $widget->{h} = $h; 3168 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h);
3183 $widget->emit (size_allocate => $w, $h); 3169 $widget->emit (size_allocate => $w, $h);
3184 } 3170 }
3185 } 3171 }
3186 3172
3187 while ($self->{post_alloc_hook}) { 3173 while ($self->{post_alloc_hook}) {

Diff Legend

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