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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

… …
9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
19 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
20sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
21 if (!$GRAB) { 47 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
26 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
27 54
28 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
29 56
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 58
32 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 60 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
… …
153sub rescale_widgets { 171sub rescale_widgets {
154 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
155 173
156 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $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}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $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}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $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}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
166 } 189 }
167 } 190 }
168 191
169 reconfigure_widgets; 192 reconfigure_widgets;
170} 193}
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 263
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
225 }, 265
226 ); 266 $_->set_visible for $self->children;
227} 267}
228 268
229sub set_invisible { 269sub set_invisible {
230 my ($self) = @_; 270 my ($self) = @_;
231 271
232 # broken show/hide model 272 return unless $self->{visible};
233 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
234 delete $self->{visible}; 277 delete $self->{visible};
235 278
236 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
238 281
239 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
241 284
242 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
243} 305}
244 306
245sub hide { 307sub hide {
246 my ($self) = @_; 308 my ($self) = @_;
247 309
… …
249 311
250 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
251 if $self->{parent}; 313 if $self->{parent};
252} 314}
253 315
254sub move { 316sub move_abs {
255 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
256 318
257 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
258 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
259 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
260 322
261 $self->update; 323 $self->update;
262} 324}
263 325
264sub set_size { 326sub set_size {
265 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
266 328
267 $self->{user_w} = $w; 329 $self->{force_w} = $w;
268 $self->{user_h} = $h; 330 $self->{force_h} = $h;
269 331
270 $self->check_size; 332 $self->realloc;
271} 333}
272 334
273sub size_request { 335sub size_request {
274 require Carp; 336 require Carp;
275 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
277 339
278sub configure { 340sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
280 342
281 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
284 348
285 # use alignment to adjust x, y 349 # use alignment to adjust x, y
286 350
287 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 353 }
292 354
293 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 356 $self->{x} = $x;
295 $self->{y} = $y; 357 $self->{y} = $y;
296 $self->update; 358 $self->update;
297 } 359 }
298 360
299 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
301 } 368 }
302} 369}
303 370
304sub size_allocate { 371sub size_allocate {
305 # nothing to be done 372 # nothing to be done
306}
307
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313} 373}
314 374
315sub children { 375sub children {
316} 376}
317 377
… …
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
399sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
460
461sub find_widget {
462 my ($self, $x, $y) = @_;
463
464 return () unless $self->{can_events};
465
466 return $self
467 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
468 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
469
470 ()
471}
472
473sub set_parent {
474 my ($self, $parent) = @_;
475
476 Scalar::Util::weaken ($self->{parent} = $parent);
477 $self->set_visible if $parent->{visible};
478}
479
480sub connect {
481 my ($self, $signal, $cb) = @_;
482
483 push @{ $self->{signal_cb}{$signal} }, $cb;
484}
485
486sub _emit {
487 my ($self, $signal, @args) = @_;
488
489 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
490}
491
492sub emit {
493 my ($self, $signal, @args) = @_;
494
495 $self->_emit ($signal, @args)
496 || $self->$signal (@args);
497}
498
499sub visibility_change {
500 #my ($self, $visible) = @_;
501}
502
503sub realloc {
504 my ($self) = @_;
505
506 if ($self->{visible}) {
507 return if $self->{root}{realloc}{$self+0};
508
509 $self->{root}{realloc}{$self+0} = $self;
510 $self->{root}->update;
511 } else {
512 delete $self->{req_w};
513 delete $self->{req_h};
514 }
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub reconfigure {
525 my ($self) = @_;
526
527 $self->realloc;
528 $self->update;
529}
400 530
401sub draw { 531sub draw {
402 my ($self) = @_; 532 my ($self) = @_;
403 533
404 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
… …
421 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
422 glEnd; 552 glEnd;
423 glDisable GL_BLEND; 553 glDisable GL_BLEND;
424 } 554 }
425 555
426 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 557 glPushMatrix;
428 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
430 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 561 glVertex 0 , 0;
… …
442 my ($self) = @_; 572 my ($self) = @_;
443 573
444 warn "no draw defined for $self\n"; 574 warn "no draw defined for $self\n";
445} 575}
446 576
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505}
506
507sub DESTROY { 577sub DESTROY {
508 my ($self) = @_; 578 my ($self) = @_;
509 579
510 delete $WIDGET{$self+0}; 580 delete $WIDGET{$self+0};
511 #$self->deactivate; 581 #$self->deactivate;
… …
567 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
569} 639}
570 640
571sub size_request { 641sub size_request {
572 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
573} 645}
574 646
575sub draw { } 647sub draw { }
576 648
577############################################################################# 649#############################################################################
… …
606 $self->{children} = [ 678 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 679 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 680 @{$self->{children}}, @widgets
609 ]; 681 ];
610 682
611 $self->check_size (1); 683 $self->realloc;
612 $self->update;
613} 684}
614 685
615sub children { 686sub children {
616 @{ $_[0]{children} } 687 @{ $_[0]{children} }
617} 688}
… …
622 delete $child->{parent}; 693 delete $child->{parent};
623 $child->hide; 694 $child->hide;
624 695
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 696 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 697
627 $self->check_size (1); 698 $self->realloc;
628 $self->update;
629} 699}
630 700
631sub clear { 701sub clear {
632 my ($self) = @_; 702 my ($self) = @_;
633 703
… …
637 for (@$children) { 707 for (@$children) {
638 delete $_->{parent}; 708 delete $_->{parent};
639 $_->hide; 709 $_->hide;
640 } 710 }
641 711
642 $self->check_size; 712 $self->realloc;
643 $self->update;
644} 713}
645 714
646sub find_widget { 715sub find_widget {
647 my ($self, $x, $y) = @_; 716 my ($self, $x, $y) = @_;
648 717
… …
785} 854}
786 855
787sub size_request { 856sub size_request {
788 my ($self) = @_; 857 my ($self) = @_;
789 858
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 860
792 @$self{qw(child_w child_h)} 861 $w = 10 if $self->{scroll_x};
862 $h = 10 if $self->{scroll_y};
863
864 ($w, $h)
793} 865}
794 866
795sub size_allocate { 867sub size_allocate {
796 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
797 869
870 my $child = $self->child;
871
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 874
801 $self->child->configure (0, 0, $w, $h); 875 $self->child->configure (0, 0, $w, $h);
802 $self->update; 876 $self->update;
803} 877}
804 878
… …
857 my $class = shift; 931 my $class = shift;
858 932
859 my $self; 933 my $self;
860 934
861 my $slider = new CFClient::UI::Slider 935 my $slider = new CFClient::UI::Slider
862 vertical => 1, 936 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 937 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 938 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 939 $self->{vp}->set_offset (0, $_[1]);
866 }, 940 },
867 ; 941 ;
868 942
869 $self = $class->SUPER::new ( 943 $self = $class->SUPER::new (
… …
947 1021
948our @ISA = CFClient::UI::Bin::; 1022our @ISA = CFClient::UI::Bin::;
949 1023
950use CFClient::OpenGL; 1024use CFClient::OpenGL;
951 1025
952my @tex = 1026my $bg =
1027 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1028 mipmap => 1, wrap => 1;
1029
1030my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1031 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1032 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955 1033
956sub new { 1034sub new {
957 my $class = shift; 1035 my $class = shift;
958
959 # TODO: user_x, user_y, overwrite moveto?
960 1036
961 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1040 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
967 @_ 1044 @_
968 ); 1045 );
969 1046
970 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
971 align => 0, 1048 align => 0,
… …
1024 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
1025 1102
1026 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
1028 1105
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1108
1109 $self->realloc;
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size;
1033 }; 1111 };
1034 1112
1035 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1117 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
1041 1119
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1121
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update;
1046 }; 1123 };
1047 } 1124 }
1048} 1125}
1049 1126
1050sub button_up { 1127sub button_up {
… …
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1146 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1147
1071 my $border = $self->border; 1148 my $border = $self->border;
1072 1149
1073 glColor @{ $self->{border_bg} }; 1150 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1151 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1152 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1153 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1154 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1155
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1156 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1157 glColor @{ $self->{bg} };
1081 1158
1082 # TODO: repeat texture not scale 1159 # TODO: repeat texture not scale
1160 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1161 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1162 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1163 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1164 }
1093 1165
1094 glDisable GL_TEXTURE_2D; 1166 glDisable GL_TEXTURE_2D;
1095 1167
… …
1125 my ($self, $x, $y, $child) = @_; 1197 my ($self, $x, $y, $child) = @_;
1126 1198
1127 $child->set_parent ($self); 1199 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1200 $self->{children}[$y][$x] = $child;
1129 1201
1130 $self->check_size (1); 1202 $self->realloc;
1131} 1203}
1132 1204
1133# TODO: move to container class maybe? send children a signal on removal? 1205# TODO: move to container class maybe? send children a signal on removal?
1134sub clear { 1206sub clear {
1135 my ($self) = @_; 1207 my ($self) = @_;
… …
1140 for (@children) { 1212 for (@children) {
1141 delete $_->{parent}; 1213 delete $_->{parent};
1142 $_->hide; 1214 $_->hide;
1143 } 1215 }
1144 1216
1145 $self->check_size (1); 1217 $self->realloc;
1146 $self->update;
1147} 1218}
1148 1219
1149sub get_wh { 1220sub get_wh {
1150 my ($self) = @_; 1221 my ($self) = @_;
1151 1222
… …
1247 } 1318 }
1248} 1319}
1249 1320
1250############################################################################# 1321#############################################################################
1251 1322
1252package CFClient::UI::HBox; 1323package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1324
1256our @ISA = CFClient::UI::Container::; 1325our @ISA = CFClient::UI::Container::;
1257 1326
1258sub size_request { 1327sub size_request {
1259 my ($self) = @_; 1328 my ($self) = @_;
1260 1329
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1330 $self->{vertical}
1262 1331 ? (
1263 ( 1332 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1333 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1334 )
1266 ) 1335 : (
1336 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1338 )
1267} 1339}
1268 1340
1269sub size_allocate { 1341sub size_allocate {
1270 my ($self, $w, $h) = @_; 1342 my ($self, $w, $h) = @_;
1271 1343
1272 ($h, $w) = ($w, $h); 1344 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1345 my $children = $self->{children};
1275 1346
1276 my @h = map $_->{req_w}, @$children; 1347 my @req;
1277 1348
1278 my $req_h = List::Util::sum @h; 1349 if ($self->{homogeneous}) {
1279 1350 @req = ($space / (@$children || 1)) x @$children;
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } else { 1351 } else {
1352 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1353 my $req = List::Util::sum @req;
1354
1355 if ($req > $space) {
1356 # ah well, not enough space
1357 $_ *= $space / $req for @req;
1358 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1359 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1360
1361 $space = ($space - $req) / $expand; # remaining space to give away
1362
1363 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1364 for 0 .. $#$children;
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 } 1365 }
1294 } 1366 }
1295 1367
1296 CFClient::UI::harmonize \@h; 1368 CFClient::UI::harmonize \@req;
1297 1369
1298 my $y = 0; 1370 my $pos = 0;
1299 for (0 .. $#$children) { 1371 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1372 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1373 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1374
1304 $y += $h; 1375 $pos += $alloc;
1305 } 1376 }
1306 1377
1307 1 1378 1
1308} 1379}
1309 1380
1310############################################################################# 1381#############################################################################
1311 1382
1383package CFClient::UI::HBox;
1384
1385our @ISA = CFClient::UI::Box::;
1386
1387sub new {
1388 my $class = shift;
1389
1390 $class->SUPER::new (
1391 vertical => 0,
1392 @_,
1393 )
1394}
1395
1396#############################################################################
1397
1312package CFClient::UI::VBox; 1398package CFClient::UI::VBox;
1313 1399
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Box::;
1317 1401
1318sub size_request { 1402sub new {
1319 my ($self) = @_; 1403 my $class = shift;
1320 1404
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $class->SUPER::new (
1322 1406 vertical => 1,
1323 ( 1407 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1408 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1409}
1367 1410
1368############################################################################# 1411#############################################################################
1369 1412
1370package CFClient::UI::Label; 1413package CFClient::UI::Label;
… …
1387 ellipsise => 3, # end 1430 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1431 layout => (new CFClient::Layout),
1389 fontsize => 1, 1432 fontsize => 1,
1390 align => -1, 1433 align => -1,
1391 valign => -1, 1434 valign => -1,
1392 padding => 2, 1435 padding_x => 2,
1436 padding_y => 2,
1393 can_events => 0, 1437 can_events => 0,
1394 %arg 1438 %arg
1395 ); 1439 );
1396 1440
1397 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
… …
1433 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1434 1478
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1437 1481
1482 $self->realloc;
1438 $self->update; 1483 $self->update;
1439 $self->check_size;
1440} 1484}
1441 1485
1442sub set_markup { 1486sub set_markup {
1443 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1444 1488
… …
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1493
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1452 1496
1497 $self->realloc;
1453 $self->update; 1498 $self->update;
1454 $self->check_size;
1455} 1499}
1456 1500
1457sub size_request { 1501sub size_request {
1458 my ($self) = @_; 1502 my ($self) = @_;
1459 1503
… …
1473 1517
1474 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1476 } 1520 }
1477 1521
1478 ( 1522 ($w, $h)
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1523}
1483 1524
1484sub size_allocate { 1525sub size_allocate {
1485 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1486 1527
1487 delete $self->{texture}; 1528 delete $self->{texture}
1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488} 1530}
1489 1531
1490sub set_fontsize { 1532sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1492 1534
1493 $self->{fontsize} = $fontsize; 1535 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1536 delete $self->{texture};
1495 1537
1496 $self->update; 1538 $self->realloc;
1497 $self->check_size;
1498} 1539}
1499 1540
1500sub _draw { 1541sub _draw {
1501 my ($self) = @_; 1542 my ($self) = @_;
1502 1543
… …
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1553
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1514 1555
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517 : ($self->{w} - $tex->{w}) * 0.5); 1558 : ($self->{w} - $tex->{w}) * 0.5);
1518 1559
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521 : ($self->{h} - $tex->{h}) * 0.5); 1562 : ($self->{h} - $tex->{h}) * 0.5);
1522 1563
1523 $tex 1564 $tex
1524 }; 1565 };
1525 1566
… …
1582sub set_text { 1623sub set_text {
1583 my ($self, $text) = @_; 1624 my ($self, $text) = @_;
1584 1625
1585 $self->{cursor} = length $text; 1626 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1627 $self->_set_text ($text);
1587 $self->update; 1628
1588 $self->check_size; 1629 $self->realloc;
1589} 1630}
1590 1631
1591sub get_text { 1632sub get_text {
1592 $_[0]{text} 1633 $_[0]{text}
1593} 1634}
… …
1626 } elsif ($uni) { 1667 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1668 substr $text, $self->{cursor}++, 0, chr $uni;
1628 } 1669 }
1629 1670
1630 $self->_set_text ($text); 1671 $self->_set_text ($text);
1631 $self->update; 1672
1632 $self->check_size; 1673 $self->realloc;
1633} 1674}
1634 1675
1635sub focus_in { 1676sub focus_in {
1636 my ($self) = @_; 1677 my ($self) = @_;
1637 1678
… …
1764 1805
1765sub new { 1806sub new {
1766 my $class = shift; 1807 my $class = shift;
1767 1808
1768 $class->SUPER::new ( 1809 $class->SUPER::new (
1769 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1770 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1772 can_hover => 1, 1814 can_hover => 1,
1773 align => 0, 1815 align => 0,
1774 valign => 0, 1816 valign => 0,
… …
1821 1863
1822sub new { 1864sub new {
1823 my $class = shift; 1865 my $class = shift;
1824 1866
1825 $class->SUPER::new ( 1867 $class->SUPER::new (
1826 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1827 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 1871 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 1872 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 1873 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 1874 state => 0,
… …
1835} 1878}
1836 1879
1837sub size_request { 1880sub size_request {
1838 my ($self) = @_; 1881 my ($self) = @_;
1839 1882
1840 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1841} 1884}
1842 1885
1843sub button_down { 1886sub button_down {
1844 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1845 1888
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1849 $self->_emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1850 } 1893 }
1851} 1894}
1852 1895
1853sub _draw { 1896sub _draw {
1854 my ($self) = @_; 1897 my ($self) = @_;
1855 1898
1856 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1857 1900
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 1902
1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1903 my ($w, $h) = @$self{qw(w h)};
1904
1905 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1861 1906
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 1908
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 1910
… …
2130 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2176 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2177 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2178 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2179 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2137 vertical => 0, 2182 vertical => 0,
2138 can_hover => 1, 2183 can_hover => 1,
2139 inner_pad => 0.02, 2184 inner_pad => 0.02,
2140 @_ 2185 @_
2141 ); 2186 );
… …
2144 $self->update; 2189 $self->update;
2145 2190
2146 $self 2191 $self
2147} 2192}
2148 2193
2194sub changed { }
2195
2149sub set_range { 2196sub set_range {
2150 my ($self, $range) = @_; 2197 my ($self, $range) = @_;
2151 2198
2152 ($range, $self->{range}) = ($self->{range}, $range); 2199 ($range, $self->{range}) = ($self->{range}, $range);
2153 2200
… …
2179} 2226}
2180 2227
2181sub size_request { 2228sub size_request {
2182 my ($self) = @_; 2229 my ($self) = @_;
2183 2230
2184 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2232}
2189 2233
2190sub button_down { 2234sub button_down {
2191 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2192 2236
… …
2543 2587
2544sub new { 2588sub new {
2545 my $class = shift; 2589 my $class = shift;
2546 2590
2547 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2548 state => 0, 2592 state => 0,
2549 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2550 @_ 2594 @_
2551 ); 2595 );
2552 2596
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2597 $self
2559} 2598}
2560 2599
2561sub toggle_flopper { 2600sub toggle_flopper {
2562 my ($self) = @_; 2601 my ($self) = @_;
2563 2602
2564 # TODO: use animation 2603 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2604}
2576 2605
2577############################################################################# 2606#############################################################################
2578 2607
2579package CFClient::UI::Tooltip; 2608package CFClient::UI::Tooltip;
… …
2592} 2621}
2593 2622
2594sub set_tooltip_from { 2623sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2624 my ($self, $widget) = @_;
2596 2625
2626 my $tooltip = $widget->{tooltip};
2627
2628 if ($ENV{CFPLUS_DEBUG} & 2) {
2629 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}";
2633 }
2634
2597 $self->add (new CFClient::UI::Label 2635 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip}, 2636 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2638 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2639 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2640 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 2641 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2614 2652
2615sub size_allocate { 2653sub size_allocate {
2616 my ($self, $w, $h) = @_; 2654 my ($self, $w, $h) = @_;
2617 2655
2618 $self->SUPER::size_allocate ($w - 4, $h - 4); 2656 $self->SUPER::size_allocate ($w - 4, $h - 4);
2657}
2658
2659sub visibility_change {
2660 my ($self, $visible) = @_;
2661
2662 return unless $visible;
2663
2664 $self->{root}->on_post_alloc ("move_$self" => sub {
2665 my $widget = $self->{owner}
2666 or return;
2667
2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2669
2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2671 if $x + $self->{w} > $::WIDTH;
2672
2673 $self->move_abs ($x, $y);
2674 });
2619} 2675}
2620 2676
2621sub _draw { 2677sub _draw {
2622 my ($self) = @_; 2678 my ($self) = @_;
2623 2679
… …
2640 glVertex $w, $h; 2696 glVertex $w, $h;
2641 glVertex $w, 0; 2697 glVertex $w, 0;
2642 glEnd; 2698 glEnd;
2643 2699
2644 glTranslate 2 - 0.375, 2 - 0.375; 2700 glTranslate 2 - 0.375, 2 - 0.375;
2701
2645 $self->SUPER::_draw; 2702 $self->SUPER::_draw;
2646} 2703}
2647 2704
2648############################################################################# 2705#############################################################################
2649 2706
… …
2725 $self->SUPER::DESTROY; 2782 $self->SUPER::DESTROY;
2726} 2783}
2727 2784
2728############################################################################# 2785#############################################################################
2729 2786
2730package CFClient::UI::Inventory;
2731
2732our @ISA = CFClient::UI::ScrolledWindow::;
2733
2734sub new {
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774
2775#############################################################################
2776
2777package CFClient::UI::Menu; 2787package CFClient::UI::Menu;
2778 2788
2779our @ISA = CFClient::UI::FancyFrame::; 2789our @ISA = CFClient::UI::FancyFrame::;
2780 2790
2781use CFClient::OpenGL; 2791use CFClient::OpenGL;
… …
2819 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 2830 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2822 2832
2823 $self->show; 2833 $self->show;
2824 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2834 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825} 2835}
2826 2836
2827sub mouse_motion { 2837sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2829 2839
… …
2954 $self->SUPER::reconfigure; 2964 $self->SUPER::reconfigure;
2955} 2965}
2956 2966
2957############################################################################# 2967#############################################################################
2958 2968
2959package CFClient::UI::Root; 2969package CFClient::UI::Inventory;
2960 2970
2961our @ISA = CFClient::UI::Container::; 2971our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963use CFClient::OpenGL;
2964 2972
2965sub new { 2973sub new {
2966 my $class = shift; 2974 my $class = shift;
2967 2975
2968 $class->SUPER::new ( 2976 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2969 @_, 2978 @_,
2970 ) 2979 );
2971}
2972 2980
2973sub configure { 2981 $self
2982}
2983
2984sub set_items {
2985 my ($self, $items) = @_;
2986
2987 $self->{scrolled}->clear;
2988 return unless $items;
2989
2990 my @items = sort {
2991 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name})
2993 } @$items;
2994
2995 $self->{real_items} = \@items;
2996
2997 my $row = 0;
2998 for my $item (@items) {
2999 CFClient::Item::update_widgets $item;
3000
3001 $self->{scrolled}->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3004
3005 $row++;
3006 }
3007}
3008
3009#############################################################################
3010
3011package CFClient::UI::BindEditor;
3012
3013our @ISA = CFClient::UI::FancyFrame::;
3014
3015sub new {
3016 my $class = shift;
3017
3018 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3019
3020 $self->add (my $vb = new CFClient::UI::VBox);
3021
3022
3023 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3024 text => "start recording",
3025 tooltip => "Start/Stops recording of actions."
3026 ."All subsequent actions after the recording started will be captured."
3027 ."The actions are displayed after the record was stopped."
3028 ."To bind the action you have to click on the 'Bind' button",
3029 on_activate => sub {
3030 unless ($self->{recording}) {
3031 $self->start;
3032 } else {
3033 $self->stop;
3034 }
3035 });
3036
3037 $vb->add (new CFClient::UI::Label text => "Actions:");
3038 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3039
3040 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3041 $vb->add (my $hb = new CFClient::UI::HBox);
3042 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3043 $hb->add (new CFClient::UI::Button
3044 text => "bind",
3045 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3046 on_activate => sub {
3047 $self->ask_for_bind;
3048 });
3049
3050 $vb->add (my $hb = new CFClient::UI::HBox);
3051 $hb->add (new CFClient::UI::Button
3052 text => "ok",
3053 expand => 1,
3054 tooltip => "This closes the binding editor and saves the binding",
3055 on_activate => sub {
3056 $self->hide;
3057 $self->commit;
3058 });
3059
3060 $hb->add (new CFClient::UI::Button
3061 text => "cancel",
3062 expand => 1,
3063 tooltip => "This closes the binding editor without saving",
3064 on_activate => sub {
3065 $self->hide;
3066 $self->{binding_cancel}->()
3067 if $self->{binding_cancel};
3068 });
3069
3070 $self->update_binding_widgets;
3071
3072 $self
3073}
3074
3075sub commit {
3076 my ($self) = @_;
3077 my ($mod, $sym, $cmds) = $self->get_binding;
3078 if ($sym != 0 && @$cmds > 0) {
3079 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3080 ."'. Don't forget 'Save Config'!");
3081 $self->{binding_change}->($mod, $sym, $cmds)
3082 if $self->{binding_change};
3083 } else {
3084 $::STATUSBOX->add ("No action bound, no key or action specified!");
3085 $self->{binding_cancel}->()
3086 if $self->{binding_cancel};
3087 }
3088}
3089
3090sub start {
3091 my ($self) = @_;
3092
3093 $self->{rec_btn}->set_text ("stop recording");
3094 $self->{recording} = 1;
3095 $self->clear_command_list;
3096 $::CONN->start_record if $::CONN;
3097}
3098
3099sub stop {
3100 my ($self) = @_;
3101
3102 $self->{rec_btn}->set_text ("start recording");
3103 $self->{recording} = 0;
3104
3105 my $rec;
3106 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec);
3109}
3110
3111# if $commit is true, the binding will be set after the user entered a key combo
3112sub ask_for_bind {
3113 my ($self, $commit) = @_;
3114
3115 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_;
3117 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3118 $self->update_binding_widgets;
3119 $self->commit if $commit;
3120 });
3121}
3122
3123# $mod and $sym are the modifiers and key symbol
3124# $cmds is a array ref of strings (the commands)
3125# $cb is the callback that is executed on OK
3126# $ccb is the callback that is executed on CANCEL and
3127# when the binding was unsuccessful on OK
3128sub set_binding {
2974 my ($self, $x, $y, $w, $h) = @_; 3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2975 3130
2976 $self->{w} = $w; 3131 $self->clear_command_list;
2977 $self->{h} = $h; 3132 $self->{recording} = 0;
2978} 3133 $self->{rec_btn}->set_text ("start recording");
2979 3134
2980sub check_size { 3135 $self->{binding} = [$mod, $sym];
3136 $self->{commands} = $cmds;
3137
3138 $self->{binding_change} = $cb;
3139 $self->{binding_cancel} = $ccb;
3140
3141 $self->update_binding_widgets;
3142}
3143
3144# this is a shortcut method that asks for a binding
3145# and then just binds it.
3146sub do_quick_binding {
2981 my ($self) = @_; 3147 my ($self, $cmds) = @_;
3148 $self->set_binding (undef, undef, $cmds, sub {
3149 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3150 });
3151 $self->ask_for_bind (1);
3152}
2982 3153
2983 $self->size_allocate ($self->{w}, $self->{h}) 3154sub update_binding_widgets {
2984 if $self->{w}; 3155 my ($self) = @_;
3156 my ($mod, $sym, $cmds) = $self->get_binding;
3157 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3158 $self->set_command_list ($cmds);
3159}
3160
3161sub get_binding {
3162 my ($self) = @_;
3163 return (
3164 $self->{binding}->[0],
3165 $self->{binding}->[1],
3166 [ grep { defined $_ } @{$self->{commands}} ]
3167 );
3168}
3169
3170sub clear_command_list {
3171 my ($self) = @_;
3172 $self->{cmdbox}->clear ();
3173}
3174
3175sub set_command_list {
3176 my ($self, $cmds) = @_;
3177
3178 $self->{cmdbox}->clear ();
3179 $self->{commands} = $cmds;
3180
3181 my $idx = 0;
3182
3183 for (@$cmds) {
3184 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3185
3186 my $i = $idx;
3187 $hb->add (new CFClient::UI::Label text => $_);
3188 $hb->add (new CFClient::UI::Button
3189 text => "delete",
3190 tooltip => "Deletes the action from the record",
3191 on_activate => sub {
3192 $self->{cmdbox}->remove ($hb);
3193 $cmds->[$i] = undef;
3194 });
3195
3196
3197 $idx++
3198 }
3199}
3200
3201#############################################################################
3202
3203package CFClient::UI::SpellList;
3204
3205our @ISA = CFClient::UI::FancyFrame::;
3206
3207sub new {
3208 my $class = shift;
3209
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3211
3212 $self->add (new CFClient::UI::ScrolledWindow
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3214
3215 $self;
3216}
3217
3218# XXX: Do sorting? Argl...
3219sub add_spell {
3220 my ($self, $spell) = @_;
3221 $self->{spells}->{$spell->{name}} = $spell;
3222
3223 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224 face => $spell->{face},
3225 can_hover => 1,
3226 can_events => 1,
3227 tooltip => $spell->{message});
3228
3229 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230 text => $spell->{name},
3231 can_hover => 1,
3232 can_events => 1,
3233 tooltip => $spell->{message},
3234 expand => 1);
3235
3236 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3239 expand => 1);
3240
3241 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242 text => "bind to key",
3243 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244}
3245
3246sub rebuild_spell_list {
3247 my ($self) = @_;
3248 $self->{tbl_idx} = 0;
3249 $self->add_spell ($_) for values %{$self->{spells}};
3250}
3251
3252sub remove_spell {
3253 my ($self, $spell) = @_;
3254 delete $self->{spells}->{$spell->{name}};
3255 $self->rebuild_spell_list;
3256}
3257
3258#############################################################################
3259
3260package CFClient::UI::Root;
3261
3262our @ISA = CFClient::UI::Container::;
3263
3264use CFClient::OpenGL;
3265
3266sub new {
3267 my $class = shift;
3268
3269 my $self = $class->SUPER::new (
3270 visible => 1,
3271 @_,
3272 );
3273
3274 Scalar::Util::weaken ($self->{root} = $self);
3275
3276 $self
2985} 3277}
2986 3278
2987sub size_request { 3279sub size_request {
2988 my ($self) = @_; 3280 my ($self) = @_;
2989 3281
2990 ($self->{w}, $self->{h}) 3282 ($self->{w}, $self->{h})
3283}
3284
3285sub _to_pixel {
3286 my ($coord, $size, $max) = @_;
3287
3288 $coord =
3289 $coord eq "center" ? ($max - $size) * 0.5
3290 : $coord eq "max" ? $max
3291 : $coord;
3292
3293 $coord = 0 if $coord < 0;
3294 $coord = $max - $size if $coord > $max - $size;
3295
3296 int $coord + 0.5
2991} 3297}
2992 3298
2993sub size_allocate { 3299sub size_allocate {
2994 my ($self, $w, $h) = @_; 3300 my ($self, $w, $h) = @_;
2995 3301
2996 for my $child ($self->children) { 3302 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 3304
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3305 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3306 $Y = $child->{force_y} if exists $child->{force_y};
3001 3307
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3308 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3309 $Y = _to_pixel $Y, $H, $self->{h};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3310
3008 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
3009 } 3312 }
3010} 3313}
3011 3314
… …
3022} 3325}
3023 3326
3024sub update { 3327sub update {
3025 my ($self) = @_; 3328 my ($self) = @_;
3026 3329
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3330 $::WANT_REFRESH++;
3029} 3331}
3030 3332
3031sub add { 3333sub add {
3032 my ($self, @children) = @_; 3334 my ($self, @children) = @_;
3033 3335
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3336 $_->{is_toplevel} = 1
3042 3337 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3338
3048 $self->SUPER::add (@children); 3339 $self->SUPER::add (@children);
3049} 3340}
3050 3341
3051sub remove { 3342sub remove {
3052 my ($self, @children) = @_; 3343 my ($self, @children) = @_;
3053 3344
3054 $self->SUPER::remove (@children); 3345 $self->SUPER::remove (@children);
3346
3347 delete $self->{is_toplevel}
3348 for @children;
3055 3349
3056 while (@children) { 3350 while (@children) {
3057 my $w = pop @children; 3351 my $w = pop @children;
3058 push @children, $w->children; 3352 push @children, $w->children;
3059 $w->set_invisible; 3353 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3372 while ($self->{refresh_hook}) {
3079 $_->() 3373 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3374 for values %{delete $self->{refresh_hook}};
3081 } 3375 }
3082 3376
3083 if ($self->{check_size}) { 3377 if ($self->{realloc}) {
3084 my @queue = ([], []); 3378 my %queue;
3379 my @queue;
3380 my $widget;
3085 3381
3086 for (;;) { 3382 outer:
3087 if ($self->{check_size}) { 3383 while () {
3088 # heuristic: check containers last 3384 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3385 for $widget (values %$realloc) {
3090 for values %{delete $self->{check_size}} 3386 $widget->{visible} or next; # do not resize invisible widgets
3387
3388 $queue{$widget+0}++ and next; # duplicates are common
3389
3390 push @{ $queue[$widget->{visible}] }, $widget;
3391 }
3091 } 3392 }
3092 3393
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3394 while () {
3395 @queue or last outer;
3094 3396
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3397 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3398 and last;
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 3399
3400 pop @queue;
3401 }
3402
3403 delete $queue{$widget+0};
3404
3405 my ($w, $h) = $widget->size_request;
3406
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3409
3410 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h};
3412
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3414 || delete $widget->{force_realloc}) {
3103 $widget->{req_w} = $w; 3415 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3416 $widget->{req_h} = $h;
3105 3417
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3418 $self->{size_alloc}{$widget+0} = $widget;
3107 3419
3108 $widget->{parent}->check_size
3109 if $widget->{parent}; 3420 if (my $parent = $widget->{parent}) {
3421 $self->{realloc}{$parent+0} = $parent
3422 unless $queue{$parent+0};
3423
3424 $parent->{force_size_alloc} = 1;
3425 $self->{size_alloc}{$parent+0} = $parent;
3426 }
3110 } 3427 }
3428
3429 delete $self->{realloc}{$widget+0};
3111 } 3430 }
3112 } 3431 }
3113 3432
3114 while ($self->{size_alloc}) { 3433 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3434 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 my ($widget, $w, $h) = @$_; 3435 values %$size_alloc;
3436
3437 while () {
3438 my $widget = pop @queue || last;
3439
3440 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117 3441
3118 $w = 0 if $w < 0; 3442 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3443 $h = 0 if $h < 0;
3120 3444
3445 $w = int $w + 0.5;
3446 $h = int $h + 0.5;
3447
3448 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3449 $widget->{old_w} = $widget->{w};
3450 $widget->{old_h} = $widget->{h};
3451
3121 $widget->{w} = $w; 3452 $widget->{w} = $w;
3122 $widget->{h} = $h; 3453 $widget->{h} = $h;
3454
3123 $widget->emit (size_allocate => $w, $h); 3455 $widget->emit (size_allocate => $w, $h);
3456 }
3124 } 3457 }
3125 } 3458 }
3126 3459
3127 while ($self->{post_alloc_hook}) { 3460 while ($self->{post_alloc_hook}) {
3128 $_->() 3461 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3462 for values %{delete $self->{post_alloc_hook}};
3130 } 3463 }
3464
3131 3465
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
3135 3469

Diff Legend

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