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.220 by root, Mon May 22 03:28:55 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
… …
206 %$self = (); 242 %$self = ();
207} 243}
208 244
209sub show { 245sub show {
210 my ($self) = @_; 246 my ($self) = @_;
211
212 return if $self->{parent}; 247 return if $self->{parent};
213 248
214 $CFClient::UI::ROOT->add ($self); 249 $CFClient::UI::ROOT->add ($self);
215} 250}
216 251
217sub hide { 252sub show_centered {
218 my ($self) = @_; 253 my ($self) = @_;
254 return if $self->{parent};
255
256 $self->show;
257
258 $CFClient::UI::ROOT->on_post_alloc (
259 "centered $self" => sub {
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
261 },
262 );
263}
264
265sub set_invisible {
266 my ($self) = @_;
267
268 return unless $self->{visible};
269
270 # broken show/hide model
271
272 delete $self->{root};
273 delete $self->{visible};
219 274
220 undef $GRAB if $GRAB == $self; 275 undef $GRAB if $GRAB == $self;
221 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;
222 290
223 $self->{parent}->remove ($self) 291 $self->{parent}->remove ($self)
224 if $self->{parent}; 292 if $self->{parent};
225} 293}
226 294
… …
296} 364}
297 365
298sub set_tooltip { 366sub set_tooltip {
299 my ($self, $tooltip) = @_; 367 my ($self, $tooltip) = @_;
300 368
369 $tooltip =~ s/^\s+//;
370 $tooltip =~ s/\s+$//;
371
372 return if $self->{tooltip} eq $tooltip;
373
301 $self->{tooltip} = $tooltip; 374 $self->{tooltip} = $tooltip;
302 375
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 376 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 377 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip; 378 CFClient::UI::check_tooltip;
… …
326 return if $FOCUS == $self; 399 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 400 return unless $self->{can_focus};
328 401
329 my $focus = $FOCUS; $FOCUS = $self; 402 my $focus = $FOCUS; $FOCUS = $self;
330 403
331 $self->emit (focus_in => $focus); 404 $self->_emit (focus_in => $focus);
332 405
333 $focus->update if $focus; 406 $focus->update if $focus;
334 $FOCUS->update; 407 $FOCUS->update;
335} 408}
336 409
… …
339 412
340 return unless $FOCUS == $self; 413 return unless $FOCUS == $self;
341 414
342 my $focus = $FOCUS; undef $FOCUS; 415 my $focus = $FOCUS; undef $FOCUS;
343 416
344 $self->emit (focus_out => $focus); 417 $self->_emit (focus_out => $focus);
345 418
346 $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;
347} 423}
348 424
349sub mouse_motion { } 425sub mouse_motion { }
350sub button_up { } 426sub button_up { }
351sub key_down { } 427sub key_down { }
352sub key_up { } 428sub key_up { }
353 429
354sub button_down { 430sub button_down {
355 my ($self, $ev, $x, $y) = @_; 431 my ($self, $ev, $x, $y) = @_;
356 432
357 $self->focus_in; 433 $self->focus_in;
… …
391 if ($ENV{PCLIENT_DEBUG}) { 467 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix; 468 glPushMatrix;
393 glColor 1, 1, 0, 1; 469 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP; 471 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 472 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 473 glVertex $self->{w} - 1, 0;
398 glVertex $self->{w}, $self->{h}; 474 glVertex $self->{w} - 1, $self->{h} - 1;
399 glVertex 0 , $self->{h}; 475 glVertex 0 , $self->{h} - 1;
400 glEnd; 476 glEnd;
401 glPopMatrix; 477 glPopMatrix;
402 #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;
403 } 479 }
404} 480}
… …
424sub set_parent { 500sub set_parent {
425 my ($self, $parent) = @_; 501 my ($self, $parent) = @_;
426 502
427 Scalar::Util::weaken ($self->{parent} = $parent); 503 Scalar::Util::weaken ($self->{parent} = $parent);
428 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
429 # TODO: req_w _does_change after ->reconfigure 513 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size 514 $self->check_size
431 unless exists $self->{req_w}; 515 unless exists $self->{req_w};
516
517 $self->show;
432} 518}
433 519
434sub check_size { 520sub check_size {
435 my ($self, $forced) = @_; 521 my ($self, $forced) = @_;
436 522
… …
449 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
450 536
451 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
452} 538}
453 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
454sub emit { 546sub emit {
455 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
456 548
457 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) = @_;
458} 555}
459 556
460sub DESTROY { 557sub DESTROY {
461 my ($self) = @_; 558 my ($self) = @_;
462 559
… …
575 delete $child->{parent}; 672 delete $child->{parent};
576 $child->hide; 673 $child->hide;
577 674
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 676
580 $self->check_size; 677 $self->check_size (1);
581 $self->update; 678 $self->update;
582} 679}
583 680
584sub clear { 681sub clear {
585 my ($self) = @_; 682 my ($self) = @_;
… …
725 822
726package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
727 824
728our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
729 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
730sub size_request { 837sub size_request {
731 my ($self) = @_; 838 my ($self) = @_;
732 839
733 @$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)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 841
736 @$self{qw(child_w child_h)} 842 @$self{qw(child_w child_h)}
737} 843}
738 844
739sub size_allocate { 845sub size_allocate {
740 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
741 847
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
851 $self->child->configure (0, 0, $w, $h);
742 $self->update; 852 $self->update;
743} 853}
744 854
745sub set_offset { 855sub set_offset {
746 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
797 my $class = shift; 907 my $class = shift;
798 908
799 my $self; 909 my $self;
800 910
801 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
802 vertical => 1, 912 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 914 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 915 $self->{vp}->set_offset (0, $_[1]);
806 }, 916 },
807 ; 917 ;
808 918
809 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 920 vp => (new CFClient::UI::ViewPort expand => 1),
… …
815 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp}); 926 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
818 928
819 $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]);
820} 949}
821 950
822#TODO# update range on size_allocate depending on child 951#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 952# update viewport offset on scroll
824 953
… …
878 my $class = shift; 1007 my $class = shift;
879 1008
880 # TODO: user_x, user_y, overwrite moveto? 1009 # TODO: user_x, user_y, overwrite moveto?
881 1010
882 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1014 border => 0.6,
886 toplevel => 1, 1015 is_toplevel => 1,
887 can_events => 1, 1016 can_events => 1,
888 @_ 1017 @_
889 ); 1018 );
890 1019
891 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
892 align => 0, 1021 align => 0,
… …
945 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
946 1075
947 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
949 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
953 $self->check_size; 1084 $self->check_size;
954 }; 1085 };
955 1086
956 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
960 $self->{motion} = sub { 1091 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
962 1093
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
964 1095
965 $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});
966 $self->update; 1099 $self->update;
967 }; 1100 };
968 } 1101 }
969} 1102}
970 1103
… …
1032sub new { 1165sub new {
1033 my $class = shift; 1166 my $class = shift;
1034 1167
1035 $class->SUPER::new ( 1168 $class->SUPER::new (
1036 col_expand => [], 1169 col_expand => [],
1037 @_ 1170 @_,
1038 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1176}
1040 1177
1041sub add { 1178sub add {
1042 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1043 1180
1044 $child->set_parent ($self); 1181 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1046 1183
1047 $child->check_size; 1184 $self->check_size (1);
1048} 1185}
1049 1186
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052}
1053
1054# 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?
1055sub clear { 1188sub clear {
1056 my ($self) = @_; 1189 my ($self) = @_;
1057 1190
1058 my @children = $self->children; 1191 my @children = $self->children;
1059 delete $self->{children}; 1192 delete $self->{children};
… …
1061 for (@children) { 1194 for (@children) {
1062 delete $_->{parent}; 1195 delete $_->{parent};
1063 $_->hide; 1196 $_->hide;
1064 } 1197 }
1065 1198
1199 $self->check_size (1);
1066 $self->update; 1200 $self->update;
1067} 1201}
1068 1202
1069sub get_wh { 1203sub get_wh {
1070 my ($self) = @_; 1204 my ($self) = @_;
… …
1102sub size_allocate { 1236sub size_allocate {
1103 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1104 1238
1105 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1106 1240
1107 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1109 1243
1110 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1474 active_fg => [0, 0, 0], 1608 active_fg => [0, 0, 0],
1475 can_hover => 1, 1609 can_hover => 1,
1476 can_focus => 1, 1610 can_focus => 1,
1477 valign => 0, 1611 valign => 0,
1478 can_events => 1, 1612 can_events => 1,
1613 #text => ...
1479 @_ 1614 @_
1480 ) 1615 )
1481} 1616}
1482 1617
1483sub _set_text { 1618sub _set_text {
… …
1493 $self->{text} = $text; 1628 $self->{text} = $text;
1494 1629
1495 $text =~ s/./*/g if $self->{hidden}; 1630 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1631 $self->{layout}->set_text ("$text ");
1497 1632
1498 $self->emit (changed => $self->{text}); 1633 $self->_emit (changed => $self->{text});
1499} 1634}
1500 1635
1501sub set_text { 1636sub set_text {
1502 my ($self, $text) = @_; 1637 my ($self, $text) = @_;
1503 1638
… …
1515 my ($self) = @_; 1650 my ($self) = @_;
1516 1651
1517 my ($w, $h) = $self->SUPER::size_request; 1652 my ($w, $h) = $self->SUPER::size_request;
1518 1653
1519 ($w + 1, $h) # add 1 for cursor 1654 ($w + 1, $h) # add 1 for cursor
1520}
1521
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526} 1655}
1527 1656
1528sub key_down { 1657sub key_down {
1529 my ($self, $ev) = @_; 1658 my ($self, $ev) = @_;
1530 1659
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1674 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1675 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1676 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1677 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1678 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1679 $self->_emit ('escape');
1551 } elsif ($uni) { 1680 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1681 substr $text, $self->{cursor}++, 0, chr $uni;
1553 } 1682 }
1554 1683
1555 $self->_set_text ($text); 1684 $self->_set_text ($text);
… …
1642 if ($sym == 13) { 1771 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1772 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1773 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1774 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1775 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1776 $self->_emit (activate => $txt);
1648 $self->update; 1777 $self->update;
1649 1778
1650 } elsif ($sym == CFClient::SDLK_UP) { 1779 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1780 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1781 $self->{history_saveback} = $self->get_text;
… …
1700 can_events => 1, 1829 can_events => 1,
1701 @_ 1830 @_
1702 ) 1831 )
1703} 1832}
1704 1833
1834sub activate { }
1835
1705sub button_up { 1836sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1707 1838
1839 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1840 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1841 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate");
1711 }
1712} 1842}
1713 1843
1714sub _draw { 1844sub _draw {
1715 my ($self) = @_; 1845 my ($self) = @_;
1716 1846
… …
1768 my ($self, $ev, $x, $y) = @_; 1898 my ($self, $ev, $x, $y) = @_;
1769 1899
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1772 $self->{state} = !$self->{state}; 1902 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1903 $self->_emit (changed => $self->{state});
1774 } 1904 }
1775} 1905}
1776 1906
1777sub _draw { 1907sub _draw {
1778 my ($self) = @_; 1908 my ($self) = @_;
… …
2053 my $self = $class->SUPER::new ( 2183 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2184 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2185 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2186 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2187 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2188 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2189 req_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2190 req_h => $::WIDTH / 80,
2061 vertical => 0, 2191 vertical => 0,
2062 can_hover => 1, 2192 can_hover => 1,
2063 inner_pad => 0.02, 2193 inner_pad => 0.02,
… …
2068 $self->update; 2198 $self->update;
2069 2199
2070 $self 2200 $self
2071} 2201}
2072 2202
2203sub set_range {
2204 my ($self, $range) = @_;
2205
2206 ($range, $self->{range}) = ($self->{range}, $range);
2207
2208 $self->update
2209 if "@$range" ne "@{$self->{range}}";
2210}
2211
2073sub set_value { 2212sub set_value {
2074 my ($self, $value) = @_; 2213 my ($self, $value) = @_;
2075 2214
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2215 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2216
2078 $hi = $lo + 1 if $hi <= $lo; 2217 $hi = $lo + 1 if $hi <= $lo;
2079 2218
2219 $page = $hi - $lo if $page > $hi - $lo;
2220
2080 $value = $lo if $value < $lo; 2221 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2222 $value = $hi - $page if $value > $hi - $page;
2082 2223
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2224 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2225 if $unit;
2085 2226
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2227 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2228
2090 if ($value != $old_value) { 2229 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2230 $self->_emit (changed => $value);
2092 $self->update; 2231 $self->update;
2093 } 2232 }
2094} 2233}
2095 2234
2096sub size_request { 2235sub size_request {
… …
2104 2243
2105sub button_down { 2244sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2107 2246
2108 $self->SUPER::button_down ($ev, $x, $y); 2247 $self->SUPER::button_down ($ev, $x, $y);
2248
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250
2109 $self->mouse_motion ($ev, $x, $y); 2251 $self->mouse_motion ($ev, $x, $y);
2110} 2252}
2111 2253
2112sub mouse_motion { 2254sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
… …
2115 if ($GRAB == $self) { 2257 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2258 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2259
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2260 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2261
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2263
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123 } 2265 }
2124} 2266}
2125 2267
2126sub update { 2268sub update {
2127 my ($self) = @_; 2269 my ($self) = @_;
2128 2270
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]); 2272 $self->set_value ($self->{range}[0]);
2131 2273
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2274 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100;
2133 2276
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2277 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2278
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2279 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2280 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2281
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2282 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2283 $value = $value * $self->{scale} + $self->{offset};
2140 2284
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2285 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2286 $self->{knob_w} = $knob_w;
2148 }); 2287 });
2149 2288
2150 $self->SUPER::update; 2289 $self->SUPER::update;
2151} 2290}
2152 2291
… …
2176 # draw handle 2315 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2316 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2317
2179 glDisable GL_TEXTURE_2D; 2318 glDisable GL_TEXTURE_2D;
2180} 2319}
2320
2321#############################################################################
2322
2323package CFClient::UI::ValSlider;
2324
2325our @ISA = CFClient::UI::HBox::;
2326
2327sub new {
2328 my ($class, %arg) = @_;
2329
2330 my $range = delete $arg{range};
2331
2332 my $self = $class->SUPER::new (
2333 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2334 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2335 to_value => sub { shift },
2336 from_value => sub { shift },
2337 %arg,
2338 );
2339
2340 $self->{slider}->connect (changed => sub {
2341 my ($self, $value) = @_;
2342 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2343 $self->{parent}->emit (changed => $value);
2344 });
2345
2346# $self->{entry}->connect (changed => sub {
2347# my ($self, $value) = @_;
2348# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2349# $self->{parent}->emit (changed => $value);
2350# });
2351
2352 $self->add ($self->{slider}, $self->{entry});
2353
2354 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2355
2356 $self
2357}
2358
2359sub set_range { shift->{slider}->set_range (@_) }
2360sub set_value { shift->{slider}->set_value (@_) }
2181 2361
2182############################################################################# 2362#############################################################################
2183 2363
2184package CFClient::UI::TextView; 2364package CFClient::UI::TextView;
2185 2365
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2407 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2408
2229 $self->reflow; 2409 $self->reflow;
2230} 2410}
2231 2411
2232sub text_height { 2412sub text_size {
2233 my ($self, $text, $indent) = @_; 2413 my ($self, $text, $indent) = @_;
2234 2414
2235 my $layout = $self->{layout}; 2415 my $layout = $self->{layout};
2236 2416
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2418 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2419 $layout->set_markup ($text);
2240 2420
2241 ($layout->size)[1] 2421 $layout->size
2242} 2422}
2243 2423
2244sub reflow { 2424sub reflow {
2245 my ($self) = @_; 2425 my ($self) = @_;
2246 2426
2247 $self->{need_reflow}++; 2427 $self->{need_reflow}++;
2248 $self->update; 2428 $self->update;
2249} 2429}
2250 2430
2431sub set_offset {
2432 my ($self, $offset) = @_;
2433
2434 # todo: base offset on lines or so, not on pixels
2435 $self->{children}[1]->set_value ($offset);
2436}
2437
2438sub clear {
2439 my ($self) = @_;
2440
2441 $self->{par} = [];
2442 $self->{height} = 0;
2443 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2444}
2445
2251sub add_paragraph { 2446sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2447 my ($self, $color, $text, $indent) = @_;
2253 2448
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2449 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2450 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2451 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2452 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2453 }
2261 2454
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2455 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2456}
2265 2457
2266sub update { 2458sub update {
2267 my ($self) = @_; 2459 my ($self) = @_;
2268 2460
… …
2271 return unless $self->{h} > 0; 2463 return unless $self->{h} > 0;
2272 2464
2273 delete $self->{texture}; 2465 delete $self->{texture};
2274 2466
2275 $ROOT->on_post_alloc ($self, sub { 2467 $ROOT->on_post_alloc ($self, sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469
2276 if (delete $self->{need_reflow}) { 2470 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2471 my $height = 0;
2278 2472
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2473 my $layout = $self->{layout};
2474
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476
2280 for @{$self->{par}}; 2477 for (@{$self->{par}}) {
2478 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2479 $layout->set_width ($W - $_->[3]);
2480 $layout->set_markup ($_->[4]);
2481 my ($w, $h) = $layout->size;
2482 $_->[0] = $w + $_->[3];
2483 $_->[1] = $h;
2484 }
2485
2486 $height += $_->[1];
2487 }
2281 2488
2282 $self->{height} = $height; 2489 $self->{height} = $height;
2283 2490
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2492
2287 delete $self->{texture}; 2493 delete $self->{texture};
2288 } 2494 }
2289 2495
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2497 glClearColor 0.5, 0.5, 0.5, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2498 glClear GL_COLOR_BUFFER_BIT;
2293 2499
2294 my $top = int $self->{children}[1]{range}[0]; 2500 my $top = int $self->{children}[1]{range}[0];
2295 2501
2296 my $y0 = $top; 2502 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2503 my $y1 = $top + $H;
2298 2504
2299 my $y = 0; 2505 my $y = 0;
2300 2506
2301 my $layout = $self->{layout}; 2507 my $layout = $self->{layout};
2302 2508
2303 $layout->set_font ($self->{font}) if $self->{font}; 2509 $layout->set_font ($self->{font}) if $self->{font};
2304 2510
2305 glEnable GL_BLEND; 2511 glEnable GL_BLEND;
2512 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2513 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2514
2308 for my $par (@{$self->{par}}) { 2515 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2516 my $h = $par->[1];
2310 2517
2311 if ($y0 < $y + $h && $y < $y1) { 2518 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2519 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2520 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2521 $layout->set_markup ($par->[4]);
2315 2522
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2523 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2524
2318 glRasterPos $par->[2], $y - $y0; 2525 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2526 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2527 }
2321 2528
2322 $y += $h; 2529 $y += $h;
2323 } 2530 }
… …
2390 2597
2391sub new { 2598sub new {
2392 my $class = shift; 2599 my $class = shift;
2393 2600
2394 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2395 state => 0, 2602 state => 0,
2396 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2397 @_ 2604 @_
2398 ); 2605 );
2399 2606
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2607 $self
2406} 2608}
2407 2609
2408sub toggle_flopper { 2610sub toggle_flopper {
2409 my ($self) = @_; 2611 my ($self) = @_;
2410 2612
2411 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2614}
2423 2615
2424############################################################################# 2616#############################################################################
2425 2617
2426package CFClient::UI::Tooltip; 2618package CFClient::UI::Tooltip;
… …
2502 2694
2503sub new { 2695sub new {
2504 my $class = shift; 2696 my $class = shift;
2505 2697
2506 my $self = $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2507 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2508 @_, 2701 @_,
2509 ); 2702 );
2510 2703
2511 if ($self->{anim} && $self->{animspeed}) { 2704 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2705 Scalar::Util::weaken (my $widget = $self);
… …
2527 2720
2528sub size_request { 2721sub size_request {
2529 (32, 8) 2722 (32, 8)
2530} 2723}
2531 2724
2725sub update {
2726 my ($self) = @_;
2727
2728 return unless $self->{visible};
2729
2730 $self->SUPER::update;
2731}
2732
2532sub _draw { 2733sub _draw {
2533 my ($self) = @_; 2734 my ($self) = @_;
2534 2735
2535 return unless $::CONN;#d# manage and cache textures differently 2736 return unless $::CONN;
2536 2737
2537 my $face; 2738 my $face;
2538 2739
2539 if ($self->{frame}) { 2740 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2741 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2563 $self->SUPER::DESTROY; 2764 $self->SUPER::DESTROY;
2564} 2765}
2565 2766
2566############################################################################# 2767#############################################################################
2567 2768
2568package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2569 2770
2570our @ISA = CFClient::UI::HBox::; 2771our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub _item_to_desc {
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597 2772
2598sub new { 2773sub new {
2599 my $class = shift; 2774 my $class = shift;
2600 2775
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2608 can_hover => 1, 2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_, 2778 @_,
2688 ); 2779 );
2689 2780
2690 $self 2781 $self
2691} 2782}
… …
2701 or ($a->{name} cmp $b->{name}) 2792 or ($a->{name} cmp $b->{name})
2702 } @$items; 2793 } @$items;
2703 2794
2704 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2705 2796
2797 my $row = 0;
2706 for my $item (@items) { 2798 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2799 CFClient::Item::update_widgets $item;
2708 $item->update_item ();
2709 }
2710 2800
2711 $self->{scrolled}->add (@items); 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2712 2804
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2805 $row++;
2806 }
2714} 2807}
2715 2808
2716sub size_request { 2809sub size_request {
2717 my ($self) = @_; 2810 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h}); 2811 ($self->{req_w}, $self->{req_h});
… …
2758 2851
2759# 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)
2760sub popup { 2853sub popup {
2761 my ($self, $ev) = @_; 2854 my ($self, $ev) = @_;
2762 2855
2763 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2764 2857
2765 # maybe save $GRAB? must be careful about events... 2858 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2859 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2860 $self->{button} = $ev->{button};
2768 2861
… …
2783 2876
2784 if ($ev->{button} == $self->{button}) { 2877 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2878 undef $GRAB;
2786 $self->hide; 2879 $self->hide;
2787 2880
2788 $self->emit ("popdown"); 2881 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2882 $self->{hover}[1]->() if $self->{hover};
2790 } 2883 }
2791} 2884}
2792 2885
2793############################################################################# 2886#############################################################################
… …
2855sub add { 2948sub add {
2856 my ($self, $text, %arg) = @_; 2949 my ($self, $text, %arg) = @_;
2857 2950
2858 $text =~ s/^\s+//; 2951 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2860 2955
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2862 2957
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 2959
… …
2908 3003
2909sub new { 3004sub new {
2910 my $class = shift; 3005 my $class = shift;
2911 3006
2912 $class->SUPER::new ( 3007 $class->SUPER::new (
3008 visible => 1,
2913 @_, 3009 @_,
2914 ) 3010 )
2915} 3011}
2916 3012
2917sub configure { 3013sub configure {
… …
2935} 3031}
2936 3032
2937sub size_allocate { 3033sub size_allocate {
2938 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h) = @_;
2939 3035
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945
2946 for my $child ($self->children) { 3036 for my $child ($self->children) {
2947 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)};
2948 3038
2949 $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
2950 if exists $child->{req_x}; 3040 if exists $child->{req_x};
2951 3041
2952 $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
2953 if exists $child->{req_y}; 3043 if exists $child->{req_y};
2954 3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
2955 $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;
2956 $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;
2957 3050
2958 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
2959 } 3052 }
… …
2979} 3072}
2980 3073
2981sub add { 3074sub add {
2982 my ($self, @children) = @_; 3075 my ($self, @children) = @_;
2983 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
2984 for my $child (@children) { 3083 for my $child (@children) {
2985 $child->{toplevel} = 1; 3084 $child->{is_toplevel} = 1;
2986 3085
2987 # integerise window positions 3086 # integerise window positions
2988 $child->{x} = int $child->{x}; 3087 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y}; 3088 $child->{y} = int $child->{y};
2990 } 3089 }
2991 3090
2992 $self->SUPER::add (@children); 3091 $self->SUPER::add (@children);
2993} 3092}
2994 3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
3104}
3105
2995sub on_refresh { 3106sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2997 3108
2998 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2999} 3110}
… …
3011 $_->() 3122 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3013 } 3124 }
3014 3125
3015 if ($self->{check_size}) { 3126 if ($self->{check_size}) {
3016 my @queue = ([], []); 3127 my @queue;
3017 3128
3018 for (;;) { 3129 for (;;) {
3019 if ($self->{check_size}) { 3130 if ($self->{check_size}) {
3020 # heuristic: check containers last 3131 #TODO use array-of-depth approach
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3133 @queue = sort { $a->{visible} <=> $b->{visible} }
3022 for values %{delete $self->{check_size}} 3134 @queue, values %{delete $self->{check_size}};
3023 } 3135 }
3024 3136
3025 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
3026 3140
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3028 ? @$widget{qw(user_w user_h)} 3142 ? @$widget{qw(user_w user_h)}
3029 : $widget->size_request; 3143 : $widget->size_request;
3030 3144
… …
3050 $w = 0 if $w < 0; 3164 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3165 $h = 0 if $h < 0;
3052 3166
3053 $widget->{w} = $w; 3167 $widget->{w} = $w;
3054 $widget->{h} = $h; 3168 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h);
3056 $widget->emit (size_allocate => $w, $h); 3169 $widget->emit (size_allocate => $w, $h);
3057 } 3170 }
3058 } 3171 }
3059 3172
3060 while ($self->{post_alloc_hook}) { 3173 while ($self->{post_alloc_hook}) {

Diff Legend

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