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.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) = @_;
… …
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);
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 }
198 224
199 $self 225 $self
200} 226}
201 227
202sub destroy { 228sub destroy {
… …
224 $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);
225 }, 251 },
226 ); 252 );
227} 253}
228 254
229sub hide { 255sub set_invisible {
230 my ($self) = @_; 256 my ($self) = @_;
257
258 # broken show/hide model
259
260 delete $self->{root};
261 delete $self->{visible};
231 262
232 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
233 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;
234 276
235 $self->{parent}->remove ($self) 277 $self->{parent}->remove ($self)
236 if $self->{parent}; 278 if $self->{parent};
237} 279}
238 280
… …
308} 350}
309 351
310sub set_tooltip { 352sub set_tooltip {
311 my ($self, $tooltip) = @_; 353 my ($self, $tooltip) = @_;
312 354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
359
313 $self->{tooltip} = $tooltip; 360 $self->{tooltip} = $tooltip;
314 361
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 363 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 364 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 385 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
340 387
341 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
342 389
343 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
344 391
345 $focus->update if $focus; 392 $focus->update if $focus;
346 $FOCUS->update; 393 $FOCUS->update;
347} 394}
348 395
… …
351 398
352 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
353 400
354 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
355 402
356 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
357 404
358 $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;
359} 409}
360 410
361sub mouse_motion { } 411sub mouse_motion { }
362sub button_up { } 412sub button_up { }
363sub key_down { } 413sub key_down { }
364sub key_up { } 414sub key_up { }
365 415
366sub button_down { 416sub button_down {
367 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
368 418
369 $self->focus_in; 419 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 454 glPushMatrix;
405 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 458 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
412 glEnd; 462 glEnd;
413 glPopMatrix; 463 glPopMatrix;
414 #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;
415 } 465 }
416} 466}
… …
436sub set_parent { 486sub set_parent {
437 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
438 488
439 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
440 490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
441 # TODO: req_w _does_change after ->reconfigure 494 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 495 $self->check_size
443 unless exists $self->{req_w}; 496 unless exists $self->{req_w};
444 497
445 $self->show; 498 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
464 517
465 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 519}
467 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
468sub emit { 527sub emit {
469 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
470 529
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
472} 532}
473 533
474sub DESTROY { 534sub DESTROY {
475 my ($self) = @_; 535 my ($self) = @_;
476 536
… …
589 delete $child->{parent}; 649 delete $child->{parent};
590 $child->hide; 650 $child->hide;
591 651
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 653
594 $self->check_size; 654 $self->check_size (1);
595 $self->update; 655 $self->update;
596} 656}
597 657
598sub clear { 658sub clear {
599 my ($self) = @_; 659 my ($self) = @_;
… …
739 799
740package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
741 801
742our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
743 803
804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
813
744sub size_request { 814sub size_request {
745 my ($self) = @_; 815 my ($self) = @_;
746 816
747 @$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)};
748 818
… …
750} 820}
751 821
752sub size_allocate { 822sub size_allocate {
753 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
754 824
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827
757 $self->child->configure (0, 0, $cw, $ch); 828 $self->child->configure (0, 0, $w, $h);
758 $self->update; 829 $self->update;
759} 830}
760 831
761sub set_offset { 832sub set_offset {
762 my ($self, $x, $y) = @_; 833 my ($self, $x, $y) = @_;
… …
813 my $class = shift; 884 my $class = shift;
814 885
815 my $self; 886 my $self;
816 887
817 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
818 vertical => 1, 889 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 891 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 892 $self->{vp}->set_offset (0, $_[1]);
822 }, 893 },
823 ; 894 ;
824 895
825 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 897 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 902 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 903 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
834 905
835 $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]);
917}
918
919sub size_allocate {
920 my ($self, $w, $h) = @_;
921
922 $self->SUPER::size_allocate ($w, $h);
923
924 my $child = $self->{vp}->child;
925 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 926}
837 927
838#TODO# update range on size_allocate depending on child 928#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 929# update viewport offset on scroll
840 930
… …
894 my $class = shift; 984 my $class = shift;
895 985
896 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
897 987
898 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
901 border => 0.6, 991 border => 0.6,
902 toplevel => 1, 992 is_toplevel => 1,
903 can_events => 1, 993 can_events => 1,
904 @_ 994 @_
905 ); 995 );
906 996
907 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 998 align => 0,
… …
961 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
962 1052
963 my $dx = $ev->{x} - $ox; 1053 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1054 my $dy = $ev->{y} - $oy;
965 1055
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1060 $self->move ($self->{user_x}, $self->{user_y});
969 $self->check_size; 1061 $self->check_size;
970 }; 1062 };
971 1063
972 } elsif ($lr ^ $td) { 1064 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
976 $self->{motion} = sub { 1068 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
978 1070
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
980 1072
981 $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});
982 $self->update; 1076 $self->update;
983 }; 1077 };
984 } 1078 }
985} 1079}
986 1080
… …
1048sub new { 1142sub new {
1049 my $class = shift; 1143 my $class = shift;
1050 1144
1051 $class->SUPER::new ( 1145 $class->SUPER::new (
1052 col_expand => [], 1146 col_expand => [],
1053 @_ 1147 @_,
1054 ) 1148 )
1149}
1150
1151sub children {
1152 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1153}
1056 1154
1057sub add { 1155sub add {
1058 my ($self, $x, $y, $child) = @_; 1156 my ($self, $x, $y, $child) = @_;
1059 1157
1060 $child->set_parent ($self); 1158 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1159 $self->{children}[$y][$x] = $child;
1062 1160
1063 $child->check_size; 1161 $self->check_size (1);
1064} 1162}
1065 1163
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# 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?
1071sub clear { 1165sub clear {
1072 my ($self) = @_; 1166 my ($self) = @_;
1073 1167
1074 my @children = $self->children; 1168 my @children = $self->children;
1075 delete $self->{children}; 1169 delete $self->{children};
… …
1077 for (@children) { 1171 for (@children) {
1078 delete $_->{parent}; 1172 delete $_->{parent};
1079 $_->hide; 1173 $_->hide;
1080 } 1174 }
1081 1175
1176 $self->check_size (1);
1082 $self->update; 1177 $self->update;
1083} 1178}
1084 1179
1085sub get_wh { 1180sub get_wh {
1086 my ($self) = @_; 1181 my ($self) = @_;
… …
1118sub size_allocate { 1213sub size_allocate {
1119 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1120 1215
1121 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
1122 1217
1123 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
1125 1220
1126 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
1510 $self->{text} = $text; 1605 $self->{text} = $text;
1511 1606
1512 $text =~ s/./*/g if $self->{hidden}; 1607 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1608 $self->{layout}->set_text ("$text ");
1514 1609
1515 $self->emit (changed => $self->{text}); 1610 $self->_emit (changed => $self->{text});
1516} 1611}
1517 1612
1518sub set_text { 1613sub set_text {
1519 my ($self, $text) = @_; 1614 my ($self, $text) = @_;
1520 1615
… …
1532 my ($self) = @_; 1627 my ($self) = @_;
1533 1628
1534 my ($w, $h) = $self->SUPER::size_request; 1629 my ($w, $h) = $self->SUPER::size_request;
1535 1630
1536 ($w + 1, $h) # add 1 for cursor 1631 ($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} 1632}
1544 1633
1545sub key_down { 1634sub key_down {
1546 my ($self, $ev) = @_; 1635 my ($self, $ev) = @_;
1547 1636
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1651 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1652 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1653 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1654 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1655 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1656 $self->_emit ('escape');
1568 } elsif ($uni) { 1657 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1658 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1659 }
1571 1660
1572 $self->_set_text ($text); 1661 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1748 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1749 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1750 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1751 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1752 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1753 $self->_emit (activate => $txt);
1665 $self->update; 1754 $self->update;
1666 1755
1667 } elsif ($sym == CFClient::SDLK_UP) { 1756 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1757 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1758 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1806 can_events => 1,
1718 @_ 1807 @_
1719 ) 1808 )
1720} 1809}
1721 1810
1811sub activate { }
1812
1722sub button_up { 1813sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1814 my ($self, $ev, $x, $y) = @_;
1724 1815
1816 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1817 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1818 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1819}
1730 1820
1731sub _draw { 1821sub _draw {
1732 my ($self) = @_; 1822 my ($self) = @_;
1733 1823
… …
1785 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1786 1876
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1879 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1880 $self->_emit (changed => $self->{state});
1791 } 1881 }
1792} 1882}
1793 1883
1794sub _draw { 1884sub _draw {
1795 my ($self) = @_; 1885 my ($self) = @_;
… …
2088} 2178}
2089 2179
2090sub set_range { 2180sub set_range {
2091 my ($self, $range) = @_; 2181 my ($self, $range) = @_;
2092 2182
2093 $self->{range} = $range; 2183 ($range, $self->{range}) = ($self->{range}, $range);
2094 2184
2095 $self->update; 2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2096} 2187}
2097 2188
2098sub set_value { 2189sub set_value {
2099 my ($self, $value) = @_; 2190 my ($self, $value) = @_;
2100 2191
… …
2111 if $unit; 2202 if $unit;
2112 2203
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2205
2115 if ($value != $old_value) { 2206 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2207 $self->_emit (changed => $value);
2117 $self->update; 2208 $self->update;
2118 } 2209 }
2119} 2210}
2120 2211
2121sub size_request { 2212sub size_request {
… …
2483 2574
2484sub new { 2575sub new {
2485 my $class = shift; 2576 my $class = shift;
2486 2577
2487 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2488 state => 0, 2579 state => 0,
2489 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2490 @_ 2581 @_
2491 ); 2582 );
2492 2583
2493 if ($self->{state}) { 2584 if ($self->{state}) {
2494 $self->{state} = 0; 2585 $self->{state} = 0;
… …
2503 2594
2504 # TODO: use animation 2595 # TODO: use animation
2505 if ($self->{state} = !$self->{state}) { 2596 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other}); 2597 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h})); 2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open"); 2599 $self->_emit ("open");
2509 } else { 2600 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other}); 2601 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close"); 2602 $self->_emit ("close");
2512 } 2603 }
2513 2604
2514 $self->emit (changed => $self->{state}); 2605 $self->_emit (changed => $self->{state});
2515} 2606}
2516 2607
2517############################################################################# 2608#############################################################################
2518 2609
2519package CFClient::UI::Tooltip; 2610package CFClient::UI::Tooltip;
… …
2595 2686
2596sub new { 2687sub new {
2597 my $class = shift; 2688 my $class = shift;
2598 2689
2599 my $self = $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2600 aspect => 1, 2691 aspect => 1,
2692 can_events => 0,
2601 @_, 2693 @_,
2602 ); 2694 );
2603 2695
2604 if ($self->{anim} && $self->{animspeed}) { 2696 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2697 Scalar::Util::weaken (my $widget = $self);
… …
2664 $self->SUPER::DESTROY; 2756 $self->SUPER::DESTROY;
2665} 2757}
2666 2758
2667############################################################################# 2759#############################################################################
2668 2760
2669package CFClient::UI::InventoryItem; 2761package CFClient::UI::Inventory;
2670 2762
2671our @ISA = CFClient::UI::HBox::; 2763our @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 2764
2699sub new { 2765sub new {
2700 my $class = shift; 2766 my $class = shift;
2701 2767
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 ( 2768 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), 2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2790 @_, 2770 @_,
2791 ); 2771 );
2792 2772
2793 $self 2773 $self
2794} 2774}
… …
2804 or ($a->{name} cmp $b->{name}) 2784 or ($a->{name} cmp $b->{name})
2805 } @$items; 2785 } @$items;
2806 2786
2807 $self->{real_items} = \@items; 2787 $self->{real_items} = \@items;
2808 2788
2789 my $row = 0;
2809 for my $item (@items) { 2790 for my $item (@items) {
2810 $item->{item} = $item; 2791 CFClient::Item::update_widgets $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814 2792
2815 my $i = 0; 2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2816 for (@items) { 2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2817 $self->{scrolled}->add (0, $i, $_); 2795 $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 2796
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2797 $row++;
2798 }
2823} 2799}
2824 2800
2825sub size_request { 2801sub size_request {
2826 my ($self) = @_; 2802 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h}); 2803 ($self->{req_w}, $self->{req_h});
… …
2867 2843
2868# 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)
2869sub popup { 2845sub popup {
2870 my ($self, $ev) = @_; 2846 my ($self, $ev) = @_;
2871 2847
2872 $self->emit ("popdown"); 2848 $self->_emit ("popdown");
2873 2849
2874 # maybe save $GRAB? must be careful about events... 2850 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 2851 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 2852 $self->{button} = $ev->{button};
2877 2853
… …
2892 2868
2893 if ($ev->{button} == $self->{button}) { 2869 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 2870 undef $GRAB;
2895 $self->hide; 2871 $self->hide;
2896 2872
2897 $self->emit ("popdown"); 2873 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2874 $self->{hover}[1]->() if $self->{hover};
2899 } 2875 }
2900} 2876}
2901 2877
2902############################################################################# 2878#############################################################################
… …
2964sub add { 2940sub add {
2965 my ($self, $text, %arg) = @_; 2941 my ($self, $text, %arg) = @_;
2966 2942
2967 $text =~ s/^\s+//; 2943 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 2944 $text =~ s/\s+$//;
2945
2946 return unless $text;
2969 2947
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 2948 my $timeout = time + ((delete $arg{timeout}) || 60);
2971 2949
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 2951
… …
3017 2995
3018sub new { 2996sub new {
3019 my $class = shift; 2997 my $class = shift;
3020 2998
3021 $class->SUPER::new ( 2999 $class->SUPER::new (
3000 visible => 1,
3022 @_, 3001 @_,
3023 ) 3002 )
3024} 3003}
3025 3004
3026sub configure { 3005sub configure {
… …
3044} 3023}
3045 3024
3046sub size_allocate { 3025sub size_allocate {
3047 my ($self, $w, $h) = @_; 3026 my ($self, $w, $h) = @_;
3048 3027
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) { 3028 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3030
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3059 if exists $child->{req_x}; 3032 if exists $child->{req_x};
… …
3088} 3061}
3089 3062
3090sub add { 3063sub add {
3091 my ($self, @children) = @_; 3064 my ($self, @children) = @_;
3092 3065
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3093 for my $child (@children) { 3072 for my $child (@children) {
3094 $child->{toplevel} = 1; 3073 $child->{is_toplevel} = 1;
3095 3074
3096 # integerise window positions 3075 # integerise window positions
3097 $child->{x} = int $child->{x}; 3076 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y}; 3077 $child->{y} = int $child->{y};
3099 } 3078 }
3100 3079
3101 $self->SUPER::add (@children); 3080 $self->SUPER::add (@children);
3081}
3082
3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3102 3087
3103 while (@children) { 3088 while (@children) {
3104 my $w = pop @children; 3089 my $w = pop @children;
3105 push @children, $w->children; 3090 push @children, $w->children;
3106 $w->{visible} = 1; 3091 $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 } 3092 }
3120} 3093}
3121 3094
3122sub on_refresh { 3095sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
… …
3138 $_->() 3111 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3112 for values %{delete $self->{refresh_hook}};
3140 } 3113 }
3141 3114
3142 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
3143 my @queue = ([], []); 3116 my @queue;
3144 3117
3145 for (;;) { 3118 for (;;) {
3146 if ($self->{check_size}) { 3119 if ($self->{check_size}) {
3147 # heuristic: check containers last 3120 #TODO use array-of-depth approach
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
3149 for values %{delete $self->{check_size}} 3123 @queue, values %{delete $self->{check_size}};
3150 } 3124 }
3151 3125
3152 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
3153 3129
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3155 ? @$widget{qw(user_w user_h)} 3131 ? @$widget{qw(user_w user_h)}
3156 : $widget->size_request; 3132 : $widget->size_request;
3157 3133
… …
3177 $w = 0 if $w < 0; 3153 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3154 $h = 0 if $h < 0;
3179 3155
3180 $widget->{w} = $w; 3156 $widget->{w} = $w;
3181 $widget->{h} = $h; 3157 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h);
3183 $widget->emit (size_allocate => $w, $h); 3158 $widget->emit (size_allocate => $w, $h);
3184 } 3159 }
3185 } 3160 }
3186 3161
3187 while ($self->{post_alloc_hook}) { 3162 while ($self->{post_alloc_hook}) {

Diff Legend

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