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.244 by root, Sat May 27 21:06:09 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
200} 226}
201 227
202sub destroy { 228sub destroy {
203 my ($self) = @_; 229 my ($self) = @_;
… …
206 %$self = (); 232 %$self = ();
207} 233}
208 234
209sub show { 235sub show {
210 my ($self) = @_; 236 my ($self) = @_;
211
212 return if $self->{parent}; 237 return if $self->{parent};
213 238
214 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
215} 240}
216 241
217sub hide { 242sub show_centered {
218 my ($self) = @_; 243 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247
248 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 },
252 );
253}
254
255sub set_invisible {
256 my ($self) = @_;
257
258 return unless $self->{visible};
259
260 # broken show/hide model
261
262 delete $self->{root};
263 delete $self->{visible};
219 264
220 undef $GRAB if $GRAB == $self; 265 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 266 undef $HOVER if $HOVER == $self;
267
268 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self;
270
271 $self->focus_out;
272
273 $self->emit (visibility_change => 0);
274}
275
276sub hide {
277 my ($self) = @_;
278
279 $self->set_invisible;
222 280
223 $self->{parent}->remove ($self) 281 $self->{parent}->remove ($self)
224 if $self->{parent}; 282 if $self->{parent};
225} 283}
226 284
… …
296} 354}
297 355
298sub set_tooltip { 356sub set_tooltip {
299 my ($self, $tooltip) = @_; 357 my ($self, $tooltip) = @_;
300 358
359 $tooltip =~ s/^\s+//;
360 $tooltip =~ s/\s+$//;
361
362 return if $self->{tooltip} eq $tooltip;
363
301 $self->{tooltip} = $tooltip; 364 $self->{tooltip} = $tooltip;
302 365
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 366 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 367 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip; 368 CFClient::UI::check_tooltip;
… …
326 return if $FOCUS == $self; 389 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 390 return unless $self->{can_focus};
328 391
329 my $focus = $FOCUS; $FOCUS = $self; 392 my $focus = $FOCUS; $FOCUS = $self;
330 393
331 $self->emit (focus_in => $focus); 394 $self->_emit (focus_in => $focus);
332 395
333 $focus->update if $focus; 396 $focus->update if $focus;
334 $FOCUS->update; 397 $FOCUS->update;
335} 398}
336 399
… …
339 402
340 return unless $FOCUS == $self; 403 return unless $FOCUS == $self;
341 404
342 my $focus = $FOCUS; undef $FOCUS; 405 my $focus = $FOCUS; undef $FOCUS;
343 406
344 $self->emit (focus_out => $focus); 407 $self->_emit (focus_out => $focus);
345 408
346 $focus->update if $focus; #? 409 $focus->update if $focus; #?
410
411 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
412 unless $FOCUS;
347} 413}
348 414
349sub mouse_motion { } 415sub mouse_motion { }
350sub button_up { } 416sub button_up { }
351sub key_down { } 417sub key_down { }
352sub key_up { } 418sub key_up { }
353 419
354sub button_down { 420sub button_down {
355 my ($self, $ev, $x, $y) = @_; 421 my ($self, $ev, $x, $y) = @_;
356 422
357 $self->focus_in; 423 $self->focus_in;
… …
391 if ($ENV{PCLIENT_DEBUG}) { 457 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix; 458 glPushMatrix;
393 glColor 1, 1, 0, 1; 459 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP; 461 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 462 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 463 glVertex $self->{w} - 1, 0;
398 glVertex $self->{w}, $self->{h}; 464 glVertex $self->{w} - 1, $self->{h} - 1;
399 glVertex 0 , $self->{h}; 465 glVertex 0 , $self->{h} - 1;
400 glEnd; 466 glEnd;
401 glPopMatrix; 467 glPopMatrix;
402 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 468 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
403 } 469 }
404} 470}
… …
424sub set_parent { 490sub set_parent {
425 my ($self, $parent) = @_; 491 my ($self, $parent) = @_;
426 492
427 Scalar::Util::weaken ($self->{parent} = $parent); 493 Scalar::Util::weaken ($self->{parent} = $parent);
428 494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
429 # TODO: req_w _does_change after ->reconfigure 503 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size 504 $self->check_size
431 unless exists $self->{req_w}; 505 unless exists $self->{req_w};
506
507 $self->show;
432} 508}
433 509
434sub check_size { 510sub check_size {
435 my ($self, $forced) = @_; 511 my ($self, $forced) = @_;
436 512
… …
449 my ($self, $signal, $cb) = @_; 525 my ($self, $signal, $cb) = @_;
450 526
451 push @{ $self->{signal_cb}{$signal} }, $cb; 527 push @{ $self->{signal_cb}{$signal} }, $cb;
452} 528}
453 529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
454sub emit { 536sub emit {
455 my ($self, $signal, @args) = @_; 537 my ($self, $signal, @args) = @_;
456 538
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
458} 545}
459 546
460sub DESTROY { 547sub DESTROY {
461 my ($self) = @_; 548 my ($self) = @_;
462 549
… …
575 delete $child->{parent}; 662 delete $child->{parent};
576 $child->hide; 663 $child->hide;
577 664
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 666
580 $self->check_size; 667 $self->check_size (1);
581 $self->update; 668 $self->update;
582} 669}
583 670
584sub clear { 671sub clear {
585 my ($self) = @_; 672 my ($self) = @_;
… …
725 812
726package CFClient::UI::ViewPort; 813package CFClient::UI::ViewPort;
727 814
728our @ISA = CFClient::UI::Window::; 815our @ISA = CFClient::UI::Window::;
729 816
817sub new {
818 my $class = shift;
819
820 $class->SUPER::new (
821 scroll_x => 0,
822 scroll_y => 1,
823 @_,
824 )
825}
826
730sub size_request { 827sub size_request {
731 my ($self) = @_; 828 my ($self) = @_;
732 829
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 830 @$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 831
736 @$self{qw(child_w child_h)} 832 @$self{qw(child_w child_h)}
737} 833}
738 834
739sub size_allocate { 835sub size_allocate {
740 my ($self, $w, $h) = @_; 836 my ($self, $w, $h) = @_;
741 837
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
840
841 $self->child->configure (0, 0, $w, $h);
742 $self->update; 842 $self->update;
743} 843}
744 844
745sub set_offset { 845sub set_offset {
746 my ($self, $x, $y) = @_; 846 my ($self, $x, $y) = @_;
… …
797 my $class = shift; 897 my $class = shift;
798 898
799 my $self; 899 my $self;
800 900
801 my $slider = new CFClient::UI::Slider 901 my $slider = new CFClient::UI::Slider
802 vertical => 1, 902 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 903 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 904 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 905 $self->{vp}->set_offset (0, $_[1]);
806 }, 906 },
807 ; 907 ;
808 908
809 $self = $class->SUPER::new ( 909 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 910 vp => (new CFClient::UI::ViewPort expand => 1),
… …
815 $self->{vp}->add ($self->{scrolled}); 915 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp}); 916 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 917 $self->add ($self->{slider});
818 918
819 $self 919 $self
920}
921
922sub update {
923 my ($self) = @_;
924
925 $self->SUPER::update;
926
927 # todo: overwrite size_allocate of child
928 my $child = $self->{vp}->child;
929 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
930}
931
932sub size_allocate {
933 my ($self, $w, $h) = @_;
934
935 $self->SUPER::size_allocate ($w, $h);
936
937 my $child = $self->{vp}->child;
938 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820} 939}
821 940
822#TODO# update range on size_allocate depending on child 941#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 942# update viewport offset on scroll
824 943
… …
878 my $class = shift; 997 my $class = shift;
879 998
880 # TODO: user_x, user_y, overwrite moveto? 999 # TODO: user_x, user_y, overwrite moveto?
881 1000
882 my $self = $class->SUPER::new ( 1001 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1002 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1003 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1004 border => 0.6,
886 toplevel => 1, 1005 is_toplevel => 1,
887 can_events => 1, 1006 can_events => 1,
888 @_ 1007 @_
889 ); 1008 );
890 1009
891 $self->{title} &&= new CFClient::UI::Label 1010 $self->{title} &&= new CFClient::UI::Label
892 align => 0, 1011 align => 0,
… …
945 my ($ev, $x, $y) = @_; 1064 my ($ev, $x, $y) = @_;
946 1065
947 my $dx = $ev->{x} - $ox; 1066 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1067 my $dy = $ev->{y} - $oy;
949 1068
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1073 $self->move ($self->{user_x}, $self->{user_y});
953 $self->check_size; 1074 $self->check_size;
954 }; 1075 };
955 1076
956 } elsif ($lr ^ $td) { 1077 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1078 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
960 $self->{motion} = sub { 1081 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
962 1083
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1084 ($x, $y) = ($ev->{x}, $ev->{y});
964 1085
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1086 $self->{user_x} = $bx + $x - $ox;
1087 $self->{user_y} = $by + $y - $oy;
1088 $self->move ($self->{user_x}, $self->{user_y});
966 $self->update; 1089 $self->update;
967 }; 1090 };
968 } 1091 }
969} 1092}
970 1093
… …
1032sub new { 1155sub new {
1033 my $class = shift; 1156 my $class = shift;
1034 1157
1035 $class->SUPER::new ( 1158 $class->SUPER::new (
1036 col_expand => [], 1159 col_expand => [],
1037 @_ 1160 @_,
1038 ) 1161 )
1162}
1163
1164sub children {
1165 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1166}
1040 1167
1041sub add { 1168sub add {
1042 my ($self, $x, $y, $child) = @_; 1169 my ($self, $x, $y, $child) = @_;
1043 1170
1044 $child->set_parent ($self); 1171 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1172 $self->{children}[$y][$x] = $child;
1046 1173
1047 $child->check_size; 1174 $self->check_size (1);
1048} 1175}
1049 1176
1050sub children {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052}
1053
1054# TODO: move to container class maybe? send childs a signal on removal? 1177# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1178sub clear {
1056 my ($self) = @_; 1179 my ($self) = @_;
1057 1180
1058 my @children = $self->children; 1181 my @children = $self->children;
1059 delete $self->{children}; 1182 delete $self->{children};
… …
1061 for (@children) { 1184 for (@children) {
1062 delete $_->{parent}; 1185 delete $_->{parent};
1063 $_->hide; 1186 $_->hide;
1064 } 1187 }
1065 1188
1189 $self->check_size (1);
1066 $self->update; 1190 $self->update;
1067} 1191}
1068 1192
1069sub get_wh { 1193sub get_wh {
1070 my ($self) = @_; 1194 my ($self) = @_;
… …
1102sub size_allocate { 1226sub size_allocate {
1103 my ($self, $w, $h) = @_; 1227 my ($self, $w, $h) = @_;
1104 1228
1105 my ($ws, $hs) = $self->get_wh; 1229 my ($ws, $hs) = $self->get_wh;
1106 1230
1107 my $req_w = sum @$ws; 1231 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1232 my $req_h = (sum @$hs) || 1;
1109 1233
1110 # TODO: nicer code && do row_expand 1234 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1235 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1236 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1237 my $col_expand = (sum @col_expand) || 1;
… …
1474 active_fg => [0, 0, 0], 1598 active_fg => [0, 0, 0],
1475 can_hover => 1, 1599 can_hover => 1,
1476 can_focus => 1, 1600 can_focus => 1,
1477 valign => 0, 1601 valign => 0,
1478 can_events => 1, 1602 can_events => 1,
1603 #text => ...
1479 @_ 1604 @_
1480 ) 1605 )
1481} 1606}
1482 1607
1483sub _set_text { 1608sub _set_text {
… …
1493 $self->{text} = $text; 1618 $self->{text} = $text;
1494 1619
1495 $text =~ s/./*/g if $self->{hidden}; 1620 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1621 $self->{layout}->set_text ("$text ");
1497 1622
1498 $self->emit (changed => $self->{text}); 1623 $self->_emit (changed => $self->{text});
1499} 1624}
1500 1625
1501sub set_text { 1626sub set_text {
1502 my ($self, $text) = @_; 1627 my ($self, $text) = @_;
1503 1628
… …
1515 my ($self) = @_; 1640 my ($self) = @_;
1516 1641
1517 my ($w, $h) = $self->SUPER::size_request; 1642 my ($w, $h) = $self->SUPER::size_request;
1518 1643
1519 ($w + 1, $h) # add 1 for cursor 1644 ($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} 1645}
1527 1646
1528sub key_down { 1647sub key_down {
1529 my ($self, $ev) = @_; 1648 my ($self, $ev) = @_;
1530 1649
… …
1545 } elsif ($sym == CFClient::SDLK_HOME) { 1664 } elsif ($sym == CFClient::SDLK_HOME) {
1546 $self->{cursor} = 0; 1665 $self->{cursor} = 0;
1547 } elsif ($sym == CFClient::SDLK_END) { 1666 } elsif ($sym == CFClient::SDLK_END) {
1548 $self->{cursor} = length $text; 1667 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1668 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1669 $self->_emit ('escape');
1551 } elsif ($uni) { 1670 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1671 substr $text, $self->{cursor}++, 0, chr $uni;
1553 } 1672 }
1554 1673
1555 $self->_set_text ($text); 1674 $self->_set_text ($text);
… …
1642 if ($sym == 13) { 1761 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1762 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1763 my $txt = $self->get_text;
1645 $self->{history_pointer} = -1; 1764 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1765 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1766 $self->_emit (activate => $txt);
1648 $self->update; 1767 $self->update;
1649 1768
1650 } elsif ($sym == CFClient::SDLK_UP) { 1769 } elsif ($sym == CFClient::SDLK_UP) {
1651 if ($self->{history_pointer} < 0) { 1770 if ($self->{history_pointer} < 0) {
1652 $self->{history_saveback} = $self->get_text; 1771 $self->{history_saveback} = $self->get_text;
… …
1700 can_events => 1, 1819 can_events => 1,
1701 @_ 1820 @_
1702 ) 1821 )
1703} 1822}
1704 1823
1824sub activate { }
1825
1705sub button_up { 1826sub button_up {
1706 my ($self, $ev, $x, $y) = @_; 1827 my ($self, $ev, $x, $y) = @_;
1707 1828
1829 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1830 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1831 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate");
1711 }
1712} 1832}
1713 1833
1714sub _draw { 1834sub _draw {
1715 my ($self) = @_; 1835 my ($self) = @_;
1716 1836
… …
1768 my ($self, $ev, $x, $y) = @_; 1888 my ($self, $ev, $x, $y) = @_;
1769 1889
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1772 $self->{state} = !$self->{state}; 1892 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 1893 $self->_emit (changed => $self->{state});
1774 } 1894 }
1775} 1895}
1776 1896
1777sub _draw { 1897sub _draw {
1778 my ($self) = @_; 1898 my ($self) = @_;
… …
2053 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2176 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2177 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2179 req_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2180 req_h => $::WIDTH / 80,
2061 vertical => 0, 2181 vertical => 0,
2062 can_hover => 1, 2182 can_hover => 1,
2063 inner_pad => 0.02, 2183 inner_pad => 0.02,
… …
2068 $self->update; 2188 $self->update;
2069 2189
2070 $self 2190 $self
2071} 2191}
2072 2192
2193sub set_range {
2194 my ($self, $range) = @_;
2195
2196 ($range, $self->{range}) = ($self->{range}, $range);
2197
2198 $self->update
2199 if "@$range" ne "@{$self->{range}}";
2200}
2201
2073sub set_value { 2202sub set_value {
2074 my ($self, $value) = @_; 2203 my ($self, $value) = @_;
2075 2204
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2205 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2206
2078 $hi = $lo + 1 if $hi <= $lo; 2207 $hi = $lo + 1 if $hi <= $lo;
2079 2208
2209 $page = $hi - $lo if $page > $hi - $lo;
2210
2080 $value = $lo if $value < $lo; 2211 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2212 $value = $hi - $page if $value > $hi - $page;
2082 2213
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2214 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2215 if $unit;
2085 2216
2086 $page = $hi - $lo if $page > $hi - $lo;
2087
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2217 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2218
2090 if ($value != $old_value) { 2219 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2220 $self->_emit (changed => $value);
2092 $self->update; 2221 $self->update;
2093 } 2222 }
2094} 2223}
2095 2224
2096sub size_request { 2225sub size_request {
… …
2104 2233
2105sub button_down { 2234sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2107 2236
2108 $self->SUPER::button_down ($ev, $x, $y); 2237 $self->SUPER::button_down ($ev, $x, $y);
2238
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240
2109 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2110} 2242}
2111 2243
2112sub mouse_motion { 2244sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
… …
2115 if ($GRAB == $self) { 2247 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2249
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2250 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2251
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2253
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123 } 2255 }
2124} 2256}
2125 2257
2126sub update { 2258sub update {
2127 my ($self) = @_; 2259 my ($self) = @_;
2128 2260
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]); 2262 $self->set_value ($self->{range}[0]);
2131 2263
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2133 2266
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2268
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2271
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2272 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2273 $value = $value * $self->{scale} + $self->{offset};
2140 2274
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; 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2276 $self->{knob_w} = $knob_w;
2148 }); 2277 });
2149 2278
2150 $self->SUPER::update; 2279 $self->SUPER::update;
2151} 2280}
2152 2281
… …
2176 # draw handle 2305 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2306 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2307
2179 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2180} 2309}
2310
2311#############################################################################
2312
2313package CFClient::UI::ValSlider;
2314
2315our @ISA = CFClient::UI::HBox::;
2316
2317sub new {
2318 my ($class, %arg) = @_;
2319
2320 my $range = delete $arg{range};
2321
2322 my $self = $class->SUPER::new (
2323 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2324 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2325 to_value => sub { shift },
2326 from_value => sub { shift },
2327 %arg,
2328 );
2329
2330 $self->{slider}->connect (changed => sub {
2331 my ($self, $value) = @_;
2332 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2333 $self->{parent}->emit (changed => $value);
2334 });
2335
2336# $self->{entry}->connect (changed => sub {
2337# my ($self, $value) = @_;
2338# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2339# $self->{parent}->emit (changed => $value);
2340# });
2341
2342 $self->add ($self->{slider}, $self->{entry});
2343
2344 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2345
2346 $self
2347}
2348
2349sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) }
2181 2351
2182############################################################################# 2352#############################################################################
2183 2353
2184package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2185 2355
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2398
2229 $self->reflow; 2399 $self->reflow;
2230} 2400}
2231 2401
2232sub text_height { 2402sub text_size {
2233 my ($self, $text, $indent) = @_; 2403 my ($self, $text, $indent) = @_;
2234 2404
2235 my $layout = $self->{layout}; 2405 my $layout = $self->{layout};
2236 2406
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2408 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2409 $layout->set_markup ($text);
2240 2410
2241 ($layout->size)[1] 2411 $layout->size
2242} 2412}
2243 2413
2244sub reflow { 2414sub reflow {
2245 my ($self) = @_; 2415 my ($self) = @_;
2246 2416
2247 $self->{need_reflow}++; 2417 $self->{need_reflow}++;
2248 $self->update; 2418 $self->update;
2249} 2419}
2250 2420
2421sub set_offset {
2422 my ($self, $offset) = @_;
2423
2424 # todo: base offset on lines or so, not on pixels
2425 $self->{children}[1]->set_value ($offset);
2426}
2427
2428sub clear {
2429 my ($self) = @_;
2430
2431 $self->{par} = [];
2432 $self->{height} = 0;
2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2434}
2435
2251sub add_paragraph { 2436sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2253 2438
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2439 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2440 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2441 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2443 }
2261 2444
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2446}
2265 2447
2266sub update { 2448sub update {
2267 my ($self) = @_; 2449 my ($self) = @_;
2268 2450
… …
2271 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2272 2454
2273 delete $self->{texture}; 2455 delete $self->{texture};
2274 2456
2275 $ROOT->on_post_alloc ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2276 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2461 my $height = 0;
2278 2462
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2280 for @{$self->{par}}; 2467 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]);
2470 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h;
2474 }
2475
2476 $height += $_->[1];
2477 }
2281 2478
2282 $self->{height} = $height; 2479 $self->{height} = $height;
2283 2480
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2482
2287 delete $self->{texture}; 2483 delete $self->{texture};
2288 } 2484 }
2289 2485
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2293 2489
2294 my $top = int $self->{children}[1]{range}[0]; 2490 my $top = int $self->{children}[1]{range}[0];
2295 2491
2296 my $y0 = $top; 2492 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2493 my $y1 = $top + $H;
2298 2494
2299 my $y = 0; 2495 my $y = 0;
2300 2496
2301 my $layout = $self->{layout}; 2497 my $layout = $self->{layout};
2302 2498
2303 $layout->set_font ($self->{font}) if $self->{font}; 2499 $layout->set_font ($self->{font}) if $self->{font};
2304 2500
2305 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2504
2308 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2506 my $h = $par->[1];
2310 2507
2311 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2509 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2510 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2511 $layout->set_markup ($par->[4]);
2315 2512
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2514
2318 glRasterPos $par->[2], $y - $y0; 2515 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2517 }
2321 2518
2322 $y += $h; 2519 $y += $h;
2323 } 2520 }
… …
2390 2587
2391sub new { 2588sub new {
2392 my $class = shift; 2589 my $class = shift;
2393 2590
2394 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2395 state => 0, 2592 state => 0,
2396 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2397 @_ 2594 @_
2398 ); 2595 );
2399 2596
2400 if ($self->{state}) { 2597 if ($self->{state}) {
2401 $self->{state} = 0; 2598 $self->{state} = 0;
… …
2410 2607
2411 # TODO: use animation 2608 # TODO: use animation
2412 if ($self->{state} = !$self->{state}) { 2609 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other}); 2610 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h})); 2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open"); 2612 $self->_emit ("open");
2416 } else { 2613 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other}); 2614 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close"); 2615 $self->_emit ("close");
2419 } 2616 }
2420 2617
2421 $self->emit (changed => $self->{state}); 2618 $self->_emit (changed => $self->{state});
2422} 2619}
2423 2620
2424############################################################################# 2621#############################################################################
2425 2622
2426package CFClient::UI::Tooltip; 2623package CFClient::UI::Tooltip;
… …
2502 2699
2503sub new { 2700sub new {
2504 my $class = shift; 2701 my $class = shift;
2505 2702
2506 my $self = $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2507 aspect => 1, 2704 aspect => 1,
2705 can_events => 0,
2508 @_, 2706 @_,
2509 ); 2707 );
2510 2708
2511 if ($self->{anim} && $self->{animspeed}) { 2709 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2710 Scalar::Util::weaken (my $widget = $self);
… …
2527 2725
2528sub size_request { 2726sub size_request {
2529 (32, 8) 2727 (32, 8)
2530} 2728}
2531 2729
2730sub update {
2731 my ($self) = @_;
2732
2733 return unless $self->{visible};
2734
2735 $self->SUPER::update;
2736}
2737
2532sub _draw { 2738sub _draw {
2533 my ($self) = @_; 2739 my ($self) = @_;
2534 2740
2535 return unless $::CONN;#d# manage and cache textures differently 2741 return unless $::CONN;
2536 2742
2537 my $face; 2743 my $face;
2538 2744
2539 if ($self->{frame}) { 2745 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2746 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2563 $self->SUPER::DESTROY; 2769 $self->SUPER::DESTROY;
2564} 2770}
2565 2771
2566############################################################################# 2772#############################################################################
2567 2773
2568package CFClient::UI::InventoryItem; 2774package CFClient::UI::Inventory;
2569 2775
2570our @ISA = CFClient::UI::HBox::; 2776our @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 2777
2598sub new { 2778sub new {
2599 my $class = shift; 2779 my $class = shift;
2600 2780
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 ( 2781 my $self = $class->SUPER::new (
2608 can_hover => 1, 2782 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 @_, 2783 @_,
2688 ); 2784 );
2689 2785
2690 $self 2786 $self
2691} 2787}
… …
2701 or ($a->{name} cmp $b->{name}) 2797 or ($a->{name} cmp $b->{name})
2702 } @$items; 2798 } @$items;
2703 2799
2704 $self->{real_items} = \@items; 2800 $self->{real_items} = \@items;
2705 2801
2802 my $row = 0;
2706 for my $item (@items) { 2803 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2804 CFClient::Item::update_widgets $item;
2708 $item->update_item ();
2709 }
2710 2805
2711 $self->{scrolled}->add (@items); 2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2712 2809
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2810 $row++;
2811 }
2714} 2812}
2715 2813
2716sub size_request { 2814sub size_request {
2717 my ($self) = @_; 2815 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h}); 2816 ($self->{req_w}, $self->{req_h});
… …
2758 2856
2759# popup given the event (must be a mouse button down event currently) 2857# popup given the event (must be a mouse button down event currently)
2760sub popup { 2858sub popup {
2761 my ($self, $ev) = @_; 2859 my ($self, $ev) = @_;
2762 2860
2763 $self->emit ("popdown"); 2861 $self->_emit ("popdown");
2764 2862
2765 # maybe save $GRAB? must be careful about events... 2863 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 2864 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 2865 $self->{button} = $ev->{button};
2768 2866
… …
2783 2881
2784 if ($ev->{button} == $self->{button}) { 2882 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 2883 undef $GRAB;
2786 $self->hide; 2884 $self->hide;
2787 2885
2788 $self->emit ("popdown"); 2886 $self->_emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 2887 $self->{hover}[1]->() if $self->{hover};
2790 } 2888 }
2791} 2889}
2792 2890
2793############################################################################# 2891#############################################################################
… …
2855sub add { 2953sub add {
2856 my ($self, $text, %arg) = @_; 2954 my ($self, $text, %arg) = @_;
2857 2955
2858 $text =~ s/^\s+//; 2956 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 2957 $text =~ s/\s+$//;
2958
2959 return unless $text;
2860 2960
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 2961 my $timeout = time + ((delete $arg{timeout}) || 60);
2862 2962
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 2964
… …
2908 3008
2909sub new { 3009sub new {
2910 my $class = shift; 3010 my $class = shift;
2911 3011
2912 $class->SUPER::new ( 3012 $class->SUPER::new (
3013 visible => 1,
2913 @_, 3014 @_,
2914 ) 3015 )
2915} 3016}
2916 3017
2917sub configure { 3018sub configure {
… …
2935} 3036}
2936 3037
2937sub size_allocate { 3038sub size_allocate {
2938 my ($self, $w, $h) = @_; 3039 my ($self, $w, $h) = @_;
2939 3040
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) { 3041 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3043
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2950 if exists $child->{req_x}; 3045 if exists $child->{req_x};
2951 3046
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2953 if exists $child->{req_y}; 3048 if exists $child->{req_y};
2954 3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3053 $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; 3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957 3055
2958 $child->configure ($X, $Y, $W, $H); 3056 $child->configure ($X, $Y, $W, $H);
2959 } 3057 }
… …
2979} 3077}
2980 3078
2981sub add { 3079sub add {
2982 my ($self, @children) = @_; 3080 my ($self, @children) = @_;
2983 3081
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
2984 for my $child (@children) { 3088 for my $child (@children) {
2985 $child->{toplevel} = 1; 3089 $child->{is_toplevel} = 1;
2986 3090
2987 # integerise window positions 3091 # integerise window positions
2988 $child->{x} = int $child->{x}; 3092 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y}; 3093 $child->{y} = int $child->{y};
2990 } 3094 }
2991 3095
2992 $self->SUPER::add (@children); 3096 $self->SUPER::add (@children);
2993} 3097}
2994 3098
3099sub remove {
3100 my ($self, @children) = @_;
3101
3102 $self->SUPER::remove (@children);
3103
3104 while (@children) {
3105 my $w = pop @children;
3106 push @children, $w->children;
3107 $w->set_invisible;
3108 }
3109}
3110
2995sub on_refresh { 3111sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3112 my ($self, $id, $cb) = @_;
2997 3113
2998 $self->{refresh_hook}{$id} = $cb; 3114 $self->{refresh_hook}{$id} = $cb;
2999} 3115}
… …
3011 $_->() 3127 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
3013 } 3129 }
3014 3130
3015 if ($self->{check_size}) { 3131 if ($self->{check_size}) {
3016 my @queue = ([], []); 3132 my @queue;
3017 3133
3018 for (;;) { 3134 for (;;) {
3019 if ($self->{check_size}) { 3135 if ($self->{check_size}) {
3020 # heuristic: check containers last 3136 #TODO use array-of-depth approach
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3137
3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3022 for values %{delete $self->{check_size}} 3139 @queue, values %{delete $self->{check_size}};
3023 } 3140 }
3024 3141
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3142 my $widget = pop @queue || last;
3143
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3026 3145
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3028 ? @$widget{qw(user_w user_h)} 3147 ? @$widget{qw(user_w user_h)}
3029 : $widget->size_request; 3148 : $widget->size_request;
3030 3149
… …
3050 $w = 0 if $w < 0; 3169 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3170 $h = 0 if $h < 0;
3052 3171
3053 $widget->{w} = $w; 3172 $widget->{w} = $w;
3054 $widget->{h} = $h; 3173 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h);
3056 $widget->emit (size_allocate => $w, $h); 3174 $widget->emit (size_allocate => $w, $h);
3057 } 3175 }
3058 } 3176 }
3059 3177
3060 while ($self->{post_alloc_hook}) { 3178 while ($self->{post_alloc_hook}) {

Diff Legend

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