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.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]); 915 $self->{vp}->set_offset (0, $_[1]);
822 }, 916 },
823 ; 917 ;
824 918
825 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
… …
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]);
836} 940}
837 941
838sub size_allocate { 942sub size_allocate {
839 my ($self, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
840 944
… …
903 my $class = shift; 1007 my $class = shift;
904 1008
905 # TODO: user_x, user_y, overwrite moveto? 1009 # TODO: user_x, user_y, overwrite moveto?
906 1010
907 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
908 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
909 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
910 border => 0.6, 1014 border => 0.6,
911 toplevel => 1, 1015 is_toplevel => 1,
912 can_events => 1, 1016 can_events => 1,
913 @_ 1017 @_
914 ); 1018 );
915 1019
916 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
917 align => 0, 1021 align => 0,
… …
970 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
971 1075
972 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
973 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
974 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
975 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
976 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
977 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
978 $self->check_size; 1084 $self->check_size;
979 }; 1085 };
980 1086
981 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
982 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
985 $self->{motion} = sub { 1091 $self->{motion} = sub {
986 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
987 1093
988 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
989 1095
990 $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});
991 $self->update; 1099 $self->update;
992 }; 1100 };
993 } 1101 }
994} 1102}
995 1103
… …
1057sub new { 1165sub new {
1058 my $class = shift; 1166 my $class = shift;
1059 1167
1060 $class->SUPER::new ( 1168 $class->SUPER::new (
1061 col_expand => [], 1169 col_expand => [],
1062 @_ 1170 @_,
1063 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1176}
1065 1177
1066sub add { 1178sub add {
1067 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1068 1180
1069 $child->set_parent ($self); 1181 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1071 1183
1072 $child->check_size; 1184 $self->check_size (1);
1073} 1185}
1074 1186
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# 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?
1080sub clear { 1188sub clear {
1081 my ($self) = @_; 1189 my ($self) = @_;
1082 1190
1083 my @children = $self->children; 1191 my @children = $self->children;
1084 delete $self->{children}; 1192 delete $self->{children};
… …
1086 for (@children) { 1194 for (@children) {
1087 delete $_->{parent}; 1195 delete $_->{parent};
1088 $_->hide; 1196 $_->hide;
1089 } 1197 }
1090 1198
1199 $self->check_size (1);
1091 $self->update; 1200 $self->update;
1092} 1201}
1093 1202
1094sub get_wh { 1203sub get_wh {
1095 my ($self) = @_; 1204 my ($self) = @_;
… …
1127sub size_allocate { 1236sub size_allocate {
1128 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1129 1238
1130 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1131 1240
1132 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1134 1243
1135 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1519 $self->{text} = $text; 1628 $self->{text} = $text;
1520 1629
1521 $text =~ s/./*/g if $self->{hidden}; 1630 $text =~ s/./*/g if $self->{hidden};
1522 $self->{layout}->set_text ("$text "); 1631 $self->{layout}->set_text ("$text ");
1523 1632
1524 $self->emit (changed => $self->{text}); 1633 $self->_emit (changed => $self->{text});
1525} 1634}
1526 1635
1527sub set_text { 1636sub set_text {
1528 my ($self, $text) = @_; 1637 my ($self, $text) = @_;
1529 1638
… …
1541 my ($self) = @_; 1650 my ($self) = @_;
1542 1651
1543 my ($w, $h) = $self->SUPER::size_request; 1652 my ($w, $h) = $self->SUPER::size_request;
1544 1653
1545 ($w + 1, $h) # add 1 for cursor 1654 ($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} 1655}
1553 1656
1554sub key_down { 1657sub key_down {
1555 my ($self, $ev) = @_; 1658 my ($self, $ev) = @_;
1556 1659
… …
1571 } elsif ($sym == CFClient::SDLK_HOME) { 1674 } elsif ($sym == CFClient::SDLK_HOME) {
1572 $self->{cursor} = 0; 1675 $self->{cursor} = 0;
1573 } elsif ($sym == CFClient::SDLK_END) { 1676 } elsif ($sym == CFClient::SDLK_END) {
1574 $self->{cursor} = length $text; 1677 $self->{cursor} = length $text;
1575 } elsif ($uni == 27) { 1678 } elsif ($uni == 27) {
1576 $self->emit ('escape'); 1679 $self->_emit ('escape');
1577 } elsif ($uni) { 1680 } elsif ($uni) {
1578 substr $text, $self->{cursor}++, 0, chr $uni; 1681 substr $text, $self->{cursor}++, 0, chr $uni;
1579 } 1682 }
1580 1683
1581 $self->_set_text ($text); 1684 $self->_set_text ($text);
… …
1668 if ($sym == 13) { 1771 if ($sym == 13) {
1669 unshift @{$self->{history}}, 1772 unshift @{$self->{history}},
1670 my $txt = $self->get_text; 1773 my $txt = $self->get_text;
1671 $self->{history_pointer} = -1; 1774 $self->{history_pointer} = -1;
1672 $self->{history_saveback} = ''; 1775 $self->{history_saveback} = '';
1673 $self->emit (activate => $txt); 1776 $self->_emit (activate => $txt);
1674 $self->update; 1777 $self->update;
1675 1778
1676 } elsif ($sym == CFClient::SDLK_UP) { 1779 } elsif ($sym == CFClient::SDLK_UP) {
1677 if ($self->{history_pointer} < 0) { 1780 if ($self->{history_pointer} < 0) {
1678 $self->{history_saveback} = $self->get_text; 1781 $self->{history_saveback} = $self->get_text;
… …
1726 can_events => 1, 1829 can_events => 1,
1727 @_ 1830 @_
1728 ) 1831 )
1729} 1832}
1730 1833
1834sub activate { }
1835
1731sub button_up { 1836sub button_up {
1732 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1733 1838
1839 $self->emit ("activate")
1734 if ($x >= 0 && $x < $self->{w} 1840 if $x >= 0 && $x < $self->{w}
1735 && $y >= 0 && $y < $self->{h}) { 1841 && $y >= 0 && $y < $self->{h};
1736 $self->emit ("activate");
1737 }
1738} 1842}
1739 1843
1740sub _draw { 1844sub _draw {
1741 my ($self) = @_; 1845 my ($self) = @_;
1742 1846
… …
1794 my ($self, $ev, $x, $y) = @_; 1898 my ($self, $ev, $x, $y) = @_;
1795 1899
1796 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1797 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1798 $self->{state} = !$self->{state}; 1902 $self->{state} = !$self->{state};
1799 $self->emit (changed => $self->{state}); 1903 $self->_emit (changed => $self->{state});
1800 } 1904 }
1801} 1905}
1802 1906
1803sub _draw { 1907sub _draw {
1804 my ($self) = @_; 1908 my ($self) = @_;
… …
2097} 2201}
2098 2202
2099sub set_range { 2203sub set_range {
2100 my ($self, $range) = @_; 2204 my ($self, $range) = @_;
2101 2205
2102 $self->{range} = $range; 2206 ($range, $self->{range}) = ($self->{range}, $range);
2103 2207
2104 $self->update; 2208 $self->update
2209 if "@$range" ne "@{$self->{range}}";
2105} 2210}
2106 2211
2107sub set_value { 2212sub set_value {
2108 my ($self, $value) = @_; 2213 my ($self, $value) = @_;
2109 2214
… …
2120 if $unit; 2225 if $unit;
2121 2226
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2227 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123 2228
2124 if ($value != $old_value) { 2229 if ($value != $old_value) {
2125 $self->emit (changed => $value); 2230 $self->_emit (changed => $value);
2126 $self->update; 2231 $self->update;
2127 } 2232 }
2128} 2233}
2129 2234
2130sub size_request { 2235sub size_request {
… …
2492 2597
2493sub new { 2598sub new {
2494 my $class = shift; 2599 my $class = shift;
2495 2600
2496 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2497 state => 0, 2602 state => 0,
2498 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2499 @_ 2604 @_
2500 ); 2605 );
2501 2606
2502 if ($self->{state}) {
2503 $self->{state} = 0;
2504 $self->toggle_flopper;
2505 }
2506
2507 $self 2607 $self
2508} 2608}
2509 2609
2510sub toggle_flopper { 2610sub toggle_flopper {
2511 my ($self) = @_; 2611 my ($self) = @_;
2512 2612
2513 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2514 if ($self->{state} = !$self->{state}) {
2515 $CFClient::UI::ROOT->add ($self->{other});
2516 $self->{other}->move ($self->coord2global (0, $self->{h}));
2517 $self->emit ("open");
2518 } else {
2519 $CFClient::UI::ROOT->remove ($self->{other});
2520 $self->emit ("close");
2521 }
2522
2523 $self->emit (changed => $self->{state});
2524} 2614}
2525 2615
2526############################################################################# 2616#############################################################################
2527 2617
2528package CFClient::UI::Tooltip; 2618package CFClient::UI::Tooltip;
… …
2604 2694
2605sub new { 2695sub new {
2606 my $class = shift; 2696 my $class = shift;
2607 2697
2608 my $self = $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2609 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2610 @_, 2701 @_,
2611 ); 2702 );
2612 2703
2613 if ($self->{anim} && $self->{animspeed}) { 2704 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self); 2705 Scalar::Util::weaken (my $widget = $self);
… …
2673 $self->SUPER::DESTROY; 2764 $self->SUPER::DESTROY;
2674} 2765}
2675 2766
2676############################################################################# 2767#############################################################################
2677 2768
2678package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2679 2770
2680our @ISA = CFClient::UI::HBox::; 2771our @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 2772
2708sub new { 2773sub new {
2709 my $class = shift; 2774 my $class = shift;
2710 2775
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 ( 2776 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), 2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2799 @_, 2778 @_,
2800 ); 2779 );
2801 2780
2802 $self 2781 $self
2803} 2782}
… …
2813 or ($a->{name} cmp $b->{name}) 2792 or ($a->{name} cmp $b->{name})
2814 } @$items; 2793 } @$items;
2815 2794
2816 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2817 2796
2797 my $row = 0;
2818 for my $item (@items) { 2798 for my $item (@items) {
2819 $item->{item} = $item; 2799 CFClient::Item::update_widgets $item;
2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2822 }
2823 2800
2824 my $i = 0; 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2825 for (@items) { 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2826 $self->{scrolled}->add (0, $i, $_); 2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2829 }
2830 2804
2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2805 $row++;
2806 }
2832} 2807}
2833 2808
2834sub size_request { 2809sub size_request {
2835 my ($self) = @_; 2810 my ($self) = @_;
2836 ($self->{req_w}, $self->{req_h}); 2811 ($self->{req_w}, $self->{req_h});
… …
2876 2851
2877# 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)
2878sub popup { 2853sub popup {
2879 my ($self, $ev) = @_; 2854 my ($self, $ev) = @_;
2880 2855
2881 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2882 2857
2883 # maybe save $GRAB? must be careful about events... 2858 # maybe save $GRAB? must be careful about events...
2884 $GRAB = $self; 2859 $GRAB = $self;
2885 $self->{button} = $ev->{button}; 2860 $self->{button} = $ev->{button};
2886 2861
… …
2901 2876
2902 if ($ev->{button} == $self->{button}) { 2877 if ($ev->{button} == $self->{button}) {
2903 undef $GRAB; 2878 undef $GRAB;
2904 $self->hide; 2879 $self->hide;
2905 2880
2906 $self->emit ("popdown"); 2881 $self->_emit ("popdown");
2907 $self->{hover}[1]->() if $self->{hover}; 2882 $self->{hover}[1]->() if $self->{hover};
2908 } 2883 }
2909} 2884}
2910 2885
2911############################################################################# 2886#############################################################################
… …
2973sub add { 2948sub add {
2974 my ($self, $text, %arg) = @_; 2949 my ($self, $text, %arg) = @_;
2975 2950
2976 $text =~ s/^\s+//; 2951 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//; 2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2978 2955
2979 my $timeout = time + ((delete $arg{timeout}) || 60); 2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2980 2957
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982 2959
… …
3026 3003
3027sub new { 3004sub new {
3028 my $class = shift; 3005 my $class = shift;
3029 3006
3030 $class->SUPER::new ( 3007 $class->SUPER::new (
3008 visible => 1,
3031 @_, 3009 @_,
3032 ) 3010 )
3033} 3011}
3034 3012
3035sub configure { 3013sub configure {
… …
3053} 3031}
3054 3032
3055sub size_allocate { 3033sub size_allocate {
3056 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h) = @_;
3057 3035
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) { 3036 for my $child ($self->children) {
3065 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)};
3066 3038
3067 $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
3068 if exists $child->{req_x}; 3040 if exists $child->{req_x};
3069 3041
3070 $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
3071 if exists $child->{req_y}; 3043 if exists $child->{req_y};
3072 3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3073 $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;
3074 $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;
3075 3050
3076 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
3077 } 3052 }
… …
3099sub add { 3074sub add {
3100 my ($self, @children) = @_; 3075 my ($self, @children) = @_;
3101 3076
3102 for (my @widgets = @children; my $w = pop @widgets; ) { 3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children; 3078 push @widgets, $w->children;
3104 $w->{root} = $self; 3079 $w->{root} = $self;
3105 $w->{visible} = 1; 3080 $w->{visible} = $self->{visible} + 1;
3106 } 3081 }
3107 3082
3108 for my $child (@children) { 3083 for my $child (@children) {
3109 $child->{toplevel} = 1; 3084 $child->{is_toplevel} = 1;
3110 3085
3111 # integerise window positions 3086 # integerise window positions
3112 $child->{x} = int $child->{x}; 3087 $child->{x} = int $child->{x};
3113 $child->{y} = int $child->{y}; 3088 $child->{y} = int $child->{y};
3114 } 3089 }
… …
3122 $self->SUPER::remove (@children); 3097 $self->SUPER::remove (@children);
3123 3098
3124 while (@children) { 3099 while (@children) {
3125 my $w = pop @children; 3100 my $w = pop @children;
3126 push @children, $w->children; 3101 push @children, $w->children;
3127 delete $w->{visible}; 3102 $w->set_invisible;
3128 } 3103 }
3129} 3104}
3130 3105
3131sub on_refresh { 3106sub on_refresh {
3132 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
… …
3147 $_->() 3122 $_->()
3148 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3149 } 3124 }
3150 3125
3151 if ($self->{check_size}) { 3126 if ($self->{check_size}) {
3152 my @queue = ([], []); 3127 my @queue;
3153 3128
3154 for (;;) { 3129 for (;;) {
3155 if ($self->{check_size}) { 3130 if ($self->{check_size}) {
3156 # heuristic: check containers last 3131 #TODO use array-of-depth approach
3157 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3133 @queue = sort { $a->{visible} <=> $b->{visible} }
3158 for values %{delete $self->{check_size}} 3134 @queue, values %{delete $self->{check_size}};
3159 } 3135 }
3160 3136
3161 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
3162 3140
3163 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3164 ? @$widget{qw(user_w user_h)} 3142 ? @$widget{qw(user_w user_h)}
3165 : $widget->size_request; 3143 : $widget->size_request;
3166 3144
… …
3186 $w = 0 if $w < 0; 3164 $w = 0 if $w < 0;
3187 $h = 0 if $h < 0; 3165 $h = 0 if $h < 0;
3188 3166
3189 $widget->{w} = $w; 3167 $widget->{w} = $w;
3190 $widget->{h} = $h; 3168 $widget->{h} = $h;
3191 $widget->size_allocate ($w, $h);
3192 $widget->emit (size_allocate => $w, $h); 3169 $widget->emit (size_allocate => $w, $h);
3193 } 3170 }
3194 } 3171 }
3195 3172
3196 while ($self->{post_alloc_hook}) { 3173 while ($self->{post_alloc_hook}) {

Diff Legend

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