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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.263 by elmex, Wed May 31 14:04:52 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 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};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
40 if (!$GRAB) { 45 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
43 48
44 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
45 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
46 53
47 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
48 55
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 57
51 $TOOLTIP->set_tooltip_from ($widget); 58 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 59 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 60 }
63 61
64 return; 62 return;
65 } 63 }
66 } 64 }
… …
172sub rescale_widgets { 170sub rescale_widgets {
173 my ($sx, $sy) = @_; 171 my ($sx, $sy) = @_;
174 172
175 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $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};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
185 } 188 }
186 } 189 }
187 190
188 reconfigure_widgets; 191 reconfigure_widgets;
189} 192}
… …
198 201
199sub new { 202sub new {
200 my $class = shift; 203 my $class = shift;
201 204
202 my $self = bless { 205 my $self = bless {
203 x => 0, 206 x => "center",
204 y => 0, 207 y => "center",
205 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
206 can_events => 1, 211 can_events => 1,
207 @_ 212 @_
208 }, $class; 213 }, $class;
209 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
210 for (keys %$self) { 217 for (keys %$self) {
211 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
213 } 220 }
214 } 221 }
215 222
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
223 } 233 }
224 234
225 $self 235 $self
226} 236}
227 237
… …
232 %$self = (); 242 %$self = ();
233} 243}
234 244
235sub show { 245sub show {
236 my ($self) = @_; 246 my ($self) = @_;
247
237 return if $self->{parent}; 248 return if $self->{parent};
238 249
239 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
240} 251}
241 252
242sub show_centered { 253sub set_visible {
243 my ($self) = @_; 254 my ($self) = @_;
255
244 return if $self->{parent}; 256 return if $self->{visible};
245 257
246 $self->show; 258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
247 260
248 $CFClient::UI::ROOT->on_post_alloc ( 261 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 262
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 263 $self->realloc if !exists $self->{req_w};
251 }, 264
252 ); 265 $_->set_visible for $self->children;
253} 266}
254 267
255sub set_invisible { 268sub set_invisible {
256 my ($self) = @_; 269 my ($self) = @_;
257 270
258 # broken show/hide model 271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
259 274
260 delete $self->{root}; 275 delete $self->{root};
261 delete $self->{visible}; 276 delete $self->{visible};
262 277
263 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
265 280
266 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
268 283
269 $self->focus_out; 284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
270} 304}
271 305
272sub hide { 306sub hide {
273 my ($self) = @_; 307 my ($self) = @_;
274 308
… …
276 310
277 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
278 if $self->{parent}; 312 if $self->{parent};
279} 313}
280 314
281sub move { 315sub move_abs {
282 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
283 317
284 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
287 321
288 $self->update; 322 $self->update;
289} 323}
290 324
291sub set_size { 325sub set_size {
292 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
293 327
294 $self->{user_w} = $w; 328 $self->{force_w} = $w;
295 $self->{user_h} = $h; 329 $self->{force_h} = $h;
296 330
297 $self->check_size; 331 $self->realloc;
298} 332}
299 333
300sub size_request { 334sub size_request {
301 require Carp; 335 require Carp;
302 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
304 338
305sub configure { 339sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
307 341
308 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
311 347
312 # use alignment to adjust x, y 348 # use alignment to adjust x, y
313 349
314 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 352 }
319 353
320 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 355 $self->{x} = $x;
322 $self->{y} = $y; 356 $self->{y} = $y;
323 $self->update; 357 $self->update;
324 } 358 }
325 359
326 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
328 } 367 }
329} 368}
330 369
331sub size_allocate { 370sub size_allocate {
332 # nothing to be done 371 # nothing to be done
333}
334
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340} 372}
341 373
342sub children { 374sub children {
343} 375}
344 376
… …
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
426sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
427 529
428sub draw { 530sub draw {
429 my ($self) = @_; 531 my ($self) = @_;
430 532
431 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
448 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
449 glEnd; 551 glEnd;
450 glDisable GL_BLEND; 552 glDisable GL_BLEND;
451 } 553 }
452 554
453 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 556 glPushMatrix;
455 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
469 my ($self) = @_; 571 my ($self) = @_;
470 572
471 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
472} 574}
473 575
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 576sub DESTROY {
535 my ($self) = @_; 577 my ($self) = @_;
536 578
537 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
538 #$self->deactivate; 580 #$self->deactivate;
… …
594 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
596} 638}
597 639
598sub size_request { 640sub size_request {
599 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
600} 644}
601 645
602sub draw { } 646sub draw { }
603 647
604############################################################################# 648#############################################################################
… …
633 $self->{children} = [ 677 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
636 ]; 680 ];
637 681
638 $self->check_size (1); 682 $self->realloc;
639 $self->update;
640} 683}
641 684
642sub children { 685sub children {
643 @{ $_[0]{children} } 686 @{ $_[0]{children} }
644} 687}
… …
649 delete $child->{parent}; 692 delete $child->{parent};
650 $child->hide; 693 $child->hide;
651 694
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 696
654 $self->check_size (1); 697 $self->realloc;
655 $self->update;
656} 698}
657 699
658sub clear { 700sub clear {
659 my ($self) = @_; 701 my ($self) = @_;
660 702
… …
664 for (@$children) { 706 for (@$children) {
665 delete $_->{parent}; 707 delete $_->{parent};
666 $_->hide; 708 $_->hide;
667 } 709 }
668 710
669 $self->check_size; 711 $self->realloc;
670 $self->update;
671} 712}
672 713
673sub find_widget { 714sub find_widget {
674 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
675 716
… …
812} 853}
813 854
814sub size_request { 855sub size_request {
815 my ($self) = @_; 856 my ($self) = @_;
816 857
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 859
819 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
820} 864}
821 865
822sub size_allocate { 866sub size_allocate {
823 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
824 868
869 my $child = $self->child;
870
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 873
828 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
829 $self->update; 875 $self->update;
830} 876}
831 877
… …
884 my $class = shift; 930 my $class = shift;
885 931
886 my $self; 932 my $self;
887 933
888 my $slider = new CFClient::UI::Slider 934 my $slider = new CFClient::UI::Slider
889 vertical => 1, 935 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix 936 range => [0, 0, 1, 0.01], # HACK fix
891 connect_changed => sub { 937 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]); 938 $self->{vp}->set_offset (0, $_[1]);
893 }, 939 },
894 ; 940 ;
895 941
896 $self = $class->SUPER::new ( 942 $self = $class->SUPER::new (
… …
974 1020
975our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
976 1022
977use CFClient::OpenGL; 1023use CFClient::OpenGL;
978 1024
979my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1032
983sub new { 1033sub new {
984 my $class = shift; 1034 my $class = shift;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1035
988 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1039 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
994 @_ 1043 @_
995 ); 1044 );
996 1045
997 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
998 align => 0, 1047 align => 0,
… …
1051 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1052 1101
1053 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1055 1104
1056 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
1108 $self->realloc;
1058 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059 $self->check_size;
1060 }; 1110 };
1061 1111
1062 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1063 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1066 $self->{motion} = sub { 1116 $self->{motion} = sub {
1067 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1068 1118
1069 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1070 1120
1071 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072 $self->update;
1073 }; 1122 };
1074 } 1123 }
1075} 1124}
1076 1125
1077sub button_up { 1126sub button_up {
… …
1096 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097 1146
1098 my $border = $self->border; 1147 my $border = $self->border;
1099 1148
1100 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1101 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1102 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105 1154
1106 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1108 1157
1109 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1110 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1111 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1112
1113 glColor @{ $self->{bg} };
1114
1115 $bg->{s} = $rep_x;
1116 $bg->{t} = $rep_y;
1117 $bg->{wrap_mode} = 1;
1118 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119 } 1163 }
1120 1164
1121 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1122 1166
… …
1152 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1153 1197
1154 $child->set_parent ($self); 1198 $child->set_parent ($self);
1155 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1156 1200
1157 $self->check_size (1); 1201 $self->realloc;
1158} 1202}
1159 1203
1160# TODO: move to container class maybe? send children a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
1161sub clear { 1205sub clear {
1162 my ($self) = @_; 1206 my ($self) = @_;
… …
1167 for (@children) { 1211 for (@children) {
1168 delete $_->{parent}; 1212 delete $_->{parent};
1169 $_->hide; 1213 $_->hide;
1170 } 1214 }
1171 1215
1172 $self->check_size (1); 1216 $self->realloc;
1173 $self->update;
1174} 1217}
1175 1218
1176sub get_wh { 1219sub get_wh {
1177 my ($self) = @_; 1220 my ($self) = @_;
1178 1221
… …
1274 } 1317 }
1275} 1318}
1276 1319
1277############################################################################# 1320#############################################################################
1278 1321
1279package CFClient::UI::HBox; 1322package CFClient::UI::Box;
1280
1281# TODO: wrap into common Box base class
1282 1323
1283our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
1284 1325
1285sub size_request { 1326sub size_request {
1286 my ($self) = @_; 1327 my ($self) = @_;
1287 1328
1288 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
1289 1330 ? (
1290 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1291 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292 (List::Util::max map $_->[1], @alloc), 1333 )
1293 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1294} 1338}
1295 1339
1296sub size_allocate { 1340sub size_allocate {
1297 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1298 1342
1299 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1300
1301 my $children = $self->{children}; 1344 my $children = $self->{children};
1302 1345
1303 my @h = map $_->{req_w}, @$children; 1346 my @req;
1304 1347
1305 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1306 1349 @req = ($space / (@$children || 1)) x @$children;
1307 if ($req_h > $h) {
1308 # ah well, not enough space
1309 $_ *= $h / $req_h for @h;
1310 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1311 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312 $exp ||= 1;
1313 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1314 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1315 my $child = $children->[$_];
1316
1317 my $alloc_h = $h[$_];
1318 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319 $h[$_] = $alloc_h;
1320 } 1364 }
1321 } 1365 }
1322 1366
1323 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1324 1368
1325 my $y = 0; 1369 my $pos = 0;
1326 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1329 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330 1373
1331 $y += $h; 1374 $pos += $alloc;
1332 } 1375 }
1333 1376
1334 1 1377 1
1335} 1378}
1336 1379
1337############################################################################# 1380#############################################################################
1338 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1339package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1340 1398
1341# TODO: wrap into common Box base class
1342
1343our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1344 1400
1345sub size_request { 1401sub new {
1346 my ($self) = @_; 1402 my $class = shift;
1347 1403
1348 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1349 1405 vertical => 1,
1350 ( 1406 @_,
1351 (List::Util::max map $_->[0], @alloc),
1352 (List::Util::sum map $_->[1], @alloc),
1353 ) 1407 )
1354}
1355
1356sub size_allocate {
1357 my ($self, $w, $h) = @_;
1358
1359 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361 my $children = $self->{children};
1362
1363 my @h = map $_->{req_h}, @$children;
1364
1365 my $req_h = List::Util::sum @h;
1366
1367 if ($req_h > $h) {
1368 # ah well, not enough space
1369 $_ *= $h / $req_h for @h;
1370 } else {
1371 my $exp = List::Util::sum map $_->{expand}, @$children;
1372 $exp ||= 1;
1373
1374 for (0 .. $#$children) {
1375 my $child = $children->[$_];
1376
1377 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378 }
1379 }
1380
1381 CFClient::UI::harmonize \@h;
1382
1383 my $y = 0;
1384 for (0 .. $#$children) {
1385 my $child = $children->[$_];
1386 my $h = $h[$_];
1387 $child->configure (0, $y, $w, $h);
1388
1389 $y += $h;
1390 }
1391
1392 1
1393} 1408}
1394 1409
1395############################################################################# 1410#############################################################################
1396 1411
1397package CFClient::UI::Label; 1412package CFClient::UI::Label;
… …
1414 ellipsise => 3, # end 1429 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1416 fontsize => 1, 1431 fontsize => 1,
1417 align => -1, 1432 align => -1,
1418 valign => -1, 1433 valign => -1,
1419 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1420 can_events => 0, 1436 can_events => 0,
1421 %arg 1437 %arg
1422 ); 1438 );
1423 1439
1424 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1460 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1461 1477
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1464 1480
1481 $self->realloc;
1465 $self->update; 1482 $self->update;
1466 $self->check_size;
1467} 1483}
1468 1484
1469sub set_markup { 1485sub set_markup {
1470 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1471 1487
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1492
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1479 1495
1496 $self->realloc;
1480 $self->update; 1497 $self->update;
1481 $self->check_size;
1482} 1498}
1483 1499
1484sub size_request { 1500sub size_request {
1485 my ($self) = @_; 1501 my ($self) = @_;
1486 1502
… …
1500 1516
1501 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1503 } 1519 }
1504 1520
1505 ( 1521 ($w, $h)
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1522}
1510 1523
1511sub size_allocate { 1524sub size_allocate {
1512 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1513 1526
… …
1518 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1519 1532
1520 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1534 delete $self->{texture};
1522 1535
1523 $self->update; 1536 $self->realloc;
1524 $self->check_size;
1525} 1537}
1526 1538
1527sub _draw { 1539sub _draw {
1528 my ($self) = @_; 1540 my ($self) = @_;
1529 1541
… …
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1551
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1541 1553
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1545 1557
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1549 1561
1550 $tex 1562 $tex
1551 }; 1563 };
1552 1564
… …
1609sub set_text { 1621sub set_text {
1610 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1611 1623
1612 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1625 $self->_set_text ($text);
1614 $self->update; 1626
1615 $self->check_size; 1627 $self->realloc;
1616} 1628}
1617 1629
1618sub get_text { 1630sub get_text {
1619 $_[0]{text} 1631 $_[0]{text}
1620} 1632}
… …
1653 } elsif ($uni) { 1665 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1655 } 1667 }
1656 1668
1657 $self->_set_text ($text); 1669 $self->_set_text ($text);
1658 $self->update; 1670
1659 $self->check_size; 1671 $self->realloc;
1660} 1672}
1661 1673
1662sub focus_in { 1674sub focus_in {
1663 my ($self) = @_; 1675 my ($self) = @_;
1664 1676
… …
1791 1803
1792sub new { 1804sub new {
1793 my $class = shift; 1805 my $class = shift;
1794 1806
1795 $class->SUPER::new ( 1807 $class->SUPER::new (
1796 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1797 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1799 can_hover => 1, 1812 can_hover => 1,
1800 align => 0, 1813 align => 0,
1801 valign => 0, 1814 valign => 0,
… …
1848 1861
1849sub new { 1862sub new {
1850 my $class = shift; 1863 my $class = shift;
1851 1864
1852 $class->SUPER::new ( 1865 $class->SUPER::new (
1853 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1854 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1872 state => 0,
… …
1862} 1876}
1863 1877
1864sub size_request { 1878sub size_request {
1865 my ($self) = @_; 1879 my ($self) = @_;
1866 1880
1867 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1868} 1882}
1869 1883
1870sub button_down { 1884sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1872 1886
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1877 } 1891 }
1878} 1892}
1879 1893
1880sub _draw { 1894sub _draw {
1881 my ($self) = @_; 1895 my ($self) = @_;
1882 1896
1883 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1884 1898
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 1900
1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888 1904
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 1906
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 1908
… …
2157 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2177 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2164 vertical => 0, 2180 vertical => 0,
2165 can_hover => 1, 2181 can_hover => 1,
2166 inner_pad => 0.02, 2182 inner_pad => 0.02,
2167 @_ 2183 @_
2168 ); 2184 );
… …
2171 $self->update; 2187 $self->update;
2172 2188
2173 $self 2189 $self
2174} 2190}
2175 2191
2192sub changed { }
2193
2176sub set_range { 2194sub set_range {
2177 my ($self, $range) = @_; 2195 my ($self, $range) = @_;
2178 2196
2179 ($range, $self->{range}) = ($self->{range}, $range); 2197 ($range, $self->{range}) = ($self->{range}, $range);
2180 2198
… …
2206} 2224}
2207 2225
2208sub size_request { 2226sub size_request {
2209 my ($self) = @_; 2227 my ($self) = @_;
2210 2228
2211 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2230}
2216 2231
2217sub button_down { 2232sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2219 2234
… …
2570 2585
2571sub new { 2586sub new {
2572 my $class = shift; 2587 my $class = shift;
2573 2588
2574 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2575 state => 0, 2590 state => 0,
2576 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2577 @_ 2592 @_
2578 ); 2593 );
2579 2594
2580 if ($self->{state}) {
2581 $self->{state} = 0;
2582 $self->toggle_flopper;
2583 }
2584
2585 $self 2595 $self
2586} 2596}
2587 2597
2588sub toggle_flopper { 2598sub toggle_flopper {
2589 my ($self) = @_; 2599 my ($self) = @_;
2590 2600
2591 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2592 if ($self->{state} = !$self->{state}) {
2593 $CFClient::UI::ROOT->add ($self->{other});
2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2595 $self->_emit ("open");
2596 } else {
2597 $CFClient::UI::ROOT->remove ($self->{other});
2598 $self->_emit ("close");
2599 }
2600
2601 $self->_emit (changed => $self->{state});
2602} 2602}
2603 2603
2604############################################################################# 2604#############################################################################
2605 2605
2606package CFClient::UI::Tooltip; 2606package CFClient::UI::Tooltip;
… …
2619} 2619}
2620 2620
2621sub set_tooltip_from { 2621sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2623 2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2624 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2636 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2638 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2641 2650
2642sub size_allocate { 2651sub size_allocate {
2643 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2644 2653
2645 $self->SUPER::size_allocate ($w - 4, $h - 4); 2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2646} 2673}
2647 2674
2648sub _draw { 2675sub _draw {
2649 my ($self) = @_; 2676 my ($self) = @_;
2650 2677
… …
2667 glVertex $w, $h; 2694 glVertex $w, $h;
2668 glVertex $w, 0; 2695 glVertex $w, 0;
2669 glEnd; 2696 glEnd;
2670 2697
2671 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2672 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2673} 2701}
2674 2702
2675############################################################################# 2703#############################################################################
2676 2704
… …
2792 2820
2793 $row++; 2821 $row++;
2794 } 2822 }
2795} 2823}
2796 2824
2797sub size_request {
2798 my ($self) = @_;
2799 ($self->{req_w}, $self->{req_h});
2800}
2801
2802############################################################################# 2825#############################################################################
2803 2826
2804package CFClient::UI::Menu; 2827package CFClient::UI::Menu;
2805 2828
2806our @ISA = CFClient::UI::FancyFrame::; 2829our @ISA = CFClient::UI::FancyFrame::;
… …
2846 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2847 $GRAB = $self; 2870 $GRAB = $self;
2848 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2849 2872
2850 $self->show; 2873 $self->show;
2851 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2852} 2875}
2853 2876
2854sub mouse_motion { 2877sub mouse_motion {
2855 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2856 2879
… …
2990use CFClient::OpenGL; 3013use CFClient::OpenGL;
2991 3014
2992sub new { 3015sub new {
2993 my $class = shift; 3016 my $class = shift;
2994 3017
2995 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
2996 visible => 1, 3019 visible => 1,
2997 @_, 3020 @_,
2998 ) 3021 );
2999}
3000 3022
3001sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
3002 my ($self, $x, $y, $w, $h) = @_;
3003 3024
3004 $self->{w} = $w; 3025 $self
3005 $self->{h} = $h;
3006}
3007
3008sub check_size {
3009 my ($self) = @_;
3010
3011 $self->size_allocate ($self->{w}, $self->{h})
3012 if $self->{w};
3013} 3026}
3014 3027
3015sub size_request { 3028sub size_request {
3016 my ($self) = @_; 3029 my ($self) = @_;
3017 3030
3018 ($self->{w}, $self->{h}) 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
3019} 3046}
3020 3047
3021sub size_allocate { 3048sub size_allocate {
3022 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
3023 3050
3024 for my $child ($self->children) { 3051 for my $child ($self->children) {
3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026 3053
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
3029 3056
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3059
3036 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
3037 } 3061 }
3038} 3062}
3039 3063
… …
3050} 3074}
3051 3075
3052sub update { 3076sub update {
3053 my ($self) = @_; 3077 my ($self) = @_;
3054 3078
3055 $self->check_size;
3056 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
3057} 3080}
3058 3081
3059sub add { 3082sub add {
3060 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
3061 3084
3062 for (my @widgets = @children; my $w = pop @widgets; ) {
3063 push @widgets, $w->children;
3064 $w->{root} = $self;
3065 $w->{visible} = $self->{visible} + 1;
3066 }
3067
3068 for my $child (@children) {
3069 $child->{is_toplevel} = 1; 3085 $_->{is_toplevel} = 1
3070 3086 for @children;
3071 # integerise window positions
3072 $child->{x} = int $child->{x};
3073 $child->{y} = int $child->{y};
3074 }
3075 3087
3076 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3077} 3089}
3078 3090
3079sub remove { 3091sub remove {
3080 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3081 3093
3082 $self->SUPER::remove (@children); 3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3083 3098
3084 while (@children) { 3099 while (@children) {
3085 my $w = pop @children; 3100 my $w = pop @children;
3086 push @children, $w->children; 3101 push @children, $w->children;
3087 $w->set_invisible; 3102 $w->set_invisible;
… …
3106 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
3107 $_->() 3122 $_->()
3108 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3109 } 3124 }
3110 3125
3111 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
3112 my @queue = ([], []); 3127 my @queue;
3113 3128
3114 for (;;) { 3129 while () {
3115 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
3116 # heuristic: check containers last 3131 #TODO use array-of-depth approach
3117 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3132
3118 for values %{delete $self->{check_size}} 3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3119 } 3137 }
3120 3138
3121 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3139 my $widget = pop @queue || last;
3122 3140
3123 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3141 $widget->{visible} or last; # do not resize invisible widgets
3124 ? @$widget{qw(user_w user_h)} 3142
3125 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
3126 3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3127 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
3128 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130
3131 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
3132 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
3133 3155
3134 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
3135 3157
3136 $widget->{parent}->check_size
3137 if $widget->{parent}; 3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3138 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3139 } 3167 }
3140 } 3168 }
3141 3169
3142 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3143 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3144 my ($widget, $w, $h) = @$_; 3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145 3178
3146 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3147 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3148 3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3149 $widget->{w} = $w; 3186 $widget->{w} = $w;
3150 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3151 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3152 } 3191 }
3153 } 3192 }
3154 3193
3155 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3156 $_->() 3195 $_->()
3157 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3158 } 3197 }
3198
3159 3199
3160 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3163 3203
… …
3170 $self->_draw; 3210 $self->_draw;
3171} 3211}
3172 3212
3173############################################################################# 3213#############################################################################
3174 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440
3441 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3443 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3444 expand => 1);
3445
3446 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3447 text => "bind to key",
3448 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3449}
3450
3451sub rebuild_spell_list {
3452 my ($self) = @_;
3453 $self->{tbl_idx} = 0;
3454 $self->add_spell ($_) for values %{$self->{spells}};
3455}
3456
3457sub remove_spell {
3458 my ($self, $spell) = @_;
3459 delete $self->{spells}->{$spell->{name}};
3460 $self->rebuild_spell_list;
3461}
3462
3463#############################################################################
3464
3175package CFClient::UI; 3465package CFClient::UI;
3176 3466
3177$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
3178$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3179 3469

Diff Legend

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