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.246 by root, Sun May 28 00:40:51 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->{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.]+$/;
181 $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};
182 $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
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
183 } 188 }
184 } 189 }
185 190
186 reconfigure_widgets; 191 reconfigure_widgets;
187} 192}
… …
196 201
197sub new { 202sub new {
198 my $class = shift; 203 my $class = shift;
199 204
200 my $self = bless { 205 my $self = bless {
201 x => 0, 206 x => "center",
202 y => 0, 207 y => "center",
203 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
204 can_events => 1, 211 can_events => 1,
205 @_ 212 @_
206 }, $class; 213 }, $class;
214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 216
208 for (keys %$self) { 217 for (keys %$self) {
209 if (/^on_(.*)$/) { 218 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
211 } 220 }
212 } 221 }
213 222
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_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};
221 } 233 }
222 234
223 $self 235 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 236}
235 237
236sub destroy { 238sub destroy {
237 my ($self) = @_; 239 my ($self) = @_;
238 240
… …
240 %$self = (); 242 %$self = ();
241} 243}
242 244
243sub show { 245sub show {
244 my ($self) = @_; 246 my ($self) = @_;
247
245 return if $self->{parent}; 248 return if $self->{parent};
246 249
247 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
248}
249
250sub show_centered {
251 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255
256 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259 },
260 );
261} 251}
262 252
263sub set_visible { 253sub set_visible {
264 my ($self) = @_; 254 my ($self) = @_;
265 255
266 return if $self->{visible}; 256 return if $self->{visible};
267 257
268 $self->{root} = $self->{parent}{root}; 258 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 259 $self->{visible} = $self->{parent}{visible} + 1;
270 260
271 $self->emit (visibility_change => 1) 261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
272} 266}
273 267
274sub set_invisible { 268sub set_invisible {
275 my ($self) = @_; 269 my ($self) = @_;
276 270
277 return unless $self->{visible}; 271 return unless $self->{visible};
278 272
279 # broken show/hide model 273 $_->set_invisible for $self->children;
280 274
281 delete $self->{root}; 275 delete $self->{root};
282 delete $self->{visible}; 276 delete $self->{visible};
283 277
284 undef $GRAB if $GRAB == $self; 278 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 279 undef $HOVER if $HOVER == $self;
286 280
287 CFClient::UI::check_tooltip 281 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 282 if $TOOLTIP->{owner} == $self;
289 283
290 $self->focus_out; 284 $self->focus_out;
291 285
292 $self->emit (visibility_change => 0); 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;
293} 304}
294 305
295sub hide { 306sub hide {
296 my ($self) = @_; 307 my ($self) = @_;
297 308
… …
299 310
300 $self->{parent}->remove ($self) 311 $self->{parent}->remove ($self)
301 if $self->{parent}; 312 if $self->{parent};
302} 313}
303 314
304sub move { 315sub move_abs {
305 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
306 317
307 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
308 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
309 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
310 321
311 $self->update; 322 $self->update;
312} 323}
313 324
314sub set_size { 325sub set_size {
315 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
316 327
317 $self->{def_w} = $w; 328 $self->{force_w} = $w;
318 $self->{def_h} = $h; 329 $self->{force_h} = $h;
319 330
320 $self->check_size; 331 $self->realloc;
321} 332}
322 333
323sub size_request { 334sub size_request {
324 require Carp; 335 require Carp;
325 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
327 338
328sub configure { 339sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
330 341
331 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
334 347
335 # use alignment to adjust x, y 348 # use alignment to adjust x, y
336 349
337 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 352 }
342 353
343 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 355 $self->{x} = $x;
345 $self->{y} = $y; 356 $self->{y} = $y;
346 $self->update; 357 $self->update;
347 } 358 }
348 359
349 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $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;
351 } 367 }
352} 368}
353 369
354sub size_allocate { 370sub size_allocate {
355 # nothing to be done 371 # nothing to be done
356}
357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363} 372}
364 373
365sub children { 374sub children {
366} 375}
367 376
… …
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
449sub 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}
450 529
451sub draw { 530sub draw {
452 my ($self) = @_; 531 my ($self) = @_;
453 532
454 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
471 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
472 glEnd; 551 glEnd;
473 glDisable GL_BLEND; 552 glDisable GL_BLEND;
474 } 553 }
475 554
476 if ($ENV{PCLIENT_DEBUG}) { 555 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 556 glPushMatrix;
478 glColor 1, 1, 0, 1; 557 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480 glBegin GL_LINE_LOOP; 559 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 560 glVertex 0 , 0;
… …
492 my ($self) = @_; 571 my ($self) = @_;
493 572
494 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
495} 574}
496 575
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible;
515
516 $self->check_size;
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 576sub DESTROY {
558 my ($self) = @_; 577 my ($self) = @_;
559 578
560 delete $WIDGET{$self+0}; 579 delete $WIDGET{$self+0};
561 #$self->deactivate; 580 #$self->deactivate;
… …
617 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
619} 638}
620 639
621sub size_request { 640sub size_request {
622 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
623} 644}
624 645
625sub draw { } 646sub draw { }
626 647
627############################################################################# 648#############################################################################
… …
656 $self->{children} = [ 677 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 679 @{$self->{children}}, @widgets
659 ]; 680 ];
660 681
661 $self->check_size (1); 682 $self->realloc;
662 $self->update;
663} 683}
664 684
665sub children { 685sub children {
666 @{ $_[0]{children} } 686 @{ $_[0]{children} }
667} 687}
… …
672 delete $child->{parent}; 692 delete $child->{parent};
673 $child->hide; 693 $child->hide;
674 694
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 696
677 $self->check_size (1); 697 $self->realloc;
678 $self->update;
679} 698}
680 699
681sub clear { 700sub clear {
682 my ($self) = @_; 701 my ($self) = @_;
683 702
… …
687 for (@$children) { 706 for (@$children) {
688 delete $_->{parent}; 707 delete $_->{parent};
689 $_->hide; 708 $_->hide;
690 } 709 }
691 710
692 $self->check_size; 711 $self->realloc;
693 $self->update;
694} 712}
695 713
696sub find_widget { 714sub find_widget {
697 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
698 716
… …
835} 853}
836 854
837sub size_request { 855sub size_request {
838 my ($self) = @_; 856 my ($self) = @_;
839 857
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 859
842 @$self{qw(child_w child_h)} 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
843} 864}
844 865
845sub size_allocate { 866sub size_allocate {
846 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
847 868
869 my $child = $self->child;
870
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 873
851 $self->child->configure (0, 0, $w, $h); 874 $self->child->configure (0, 0, $w, $h);
852 $self->update; 875 $self->update;
853} 876}
854 877
… …
997 1020
998our @ISA = CFClient::UI::Bin::; 1021our @ISA = CFClient::UI::Bin::;
999 1022
1000use CFClient::OpenGL; 1023use CFClient::OpenGL;
1001 1024
1002my @tex = 1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 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);
1005 1032
1006sub new { 1033sub new {
1007 my $class = shift; 1034 my $class = shift;
1008 1035
1009 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
1010 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
1011 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
1012 border => 0.6, 1039 border => 0.6,
1013 is_toplevel => 1,
1014 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1015 @_ 1043 @_
1016 ); 1044 );
1017 1045
1018 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
1019 align => 0, 1047 align => 0,
… …
1072 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1073 1101
1074 my $dx = $ev->{x} - $ox; 1102 my $dx = $ev->{x} - $ox;
1075 my $dy = $ev->{y} - $oy; 1103 my $dy = $ev->{y} - $oy;
1076 1104
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081 $self->move ($self->{user_x}, $self->{user_y}); 1107
1082 $self->check_size; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1083 }; 1110 };
1084 1111
1085 } elsif ($lr ^ $td) { 1112 } elsif ($lr ^ $td) {
1086 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1089 $self->{motion} = sub { 1116 $self->{motion} = sub {
1090 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
1091 1118
1092 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
1093 1120
1094 $self->{user_x} = $bx + $x - $ox; 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095 $self->{user_y} = $by + $y - $oy;
1096
1097 $self->move ($self->{user_x}, $self->{user_y});
1098 $self->update;
1099 }; 1122 };
1100 } 1123 }
1101} 1124}
1102 1125
1103sub button_up { 1126sub button_up {
… …
1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123 1146
1124 my $border = $self->border; 1147 my $border = $self->border;
1125 1148
1126 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131 1154
1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133 my $bg = $tex[0]; 1156 glColor @{ $self->{bg} };
1134 1157
1135 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
1159 # solve this better(?)
1136 my $rep_x = $cw / $bg->{w}; 1160 $bg->{s} = $cw / $bg->{w};
1137 my $rep_y = $ch / $bg->{h}; 1161 $bg->{t} = $ch / $bg->{h};
1138
1139 glColor @{ $self->{bg} };
1140
1141 $bg->{s} = $rep_x;
1142 $bg->{t} = $rep_y;
1143 $bg->{wrap_mode} = 1;
1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 } 1163 }
1146 1164
1147 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
1148 1166
… …
1178 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
1179 1197
1180 $child->set_parent ($self); 1198 $child->set_parent ($self);
1181 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
1182 1200
1183 $self->check_size (1); 1201 $self->realloc;
1184} 1202}
1185 1203
1186# 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?
1187sub clear { 1205sub clear {
1188 my ($self) = @_; 1206 my ($self) = @_;
… …
1193 for (@children) { 1211 for (@children) {
1194 delete $_->{parent}; 1212 delete $_->{parent};
1195 $_->hide; 1213 $_->hide;
1196 } 1214 }
1197 1215
1198 $self->check_size (1); 1216 $self->realloc;
1199 $self->update;
1200} 1217}
1201 1218
1202sub get_wh { 1219sub get_wh {
1203 my ($self) = @_; 1220 my ($self) = @_;
1204 1221
… …
1324 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
1325 1342
1326 my $space = $self->{vertical} ? $h : $w; 1343 my $space = $self->{vertical} ? $h : $w;
1327 my $children = $self->{children}; 1344 my $children = $self->{children};
1328 1345
1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1346 my @req;
1330 my $req = List::Util::sum @req;
1331 1347
1332 if ($req > $space) { 1348 if ($self->{homogeneous}) {
1333 # ah well, not enough space 1349 @req = ($space / (@$children || 1)) x @$children;
1334 $_ *= $space / $req for @req;
1335 } 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 {
1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand 1362 $req[$_] += $space * $children->[$_]{expand}
1339 for 0 .. $#$children; 1363 for 0 .. $#$children;
1364 }
1340 } 1365 }
1341 1366
1342 CFClient::UI::harmonize \@req; 1367 CFClient::UI::harmonize \@req;
1343 1368
1344 my $pos = 0; 1369 my $pos = 0;
… …
1404 ellipsise => 3, # end 1429 ellipsise => 3, # end
1405 layout => (new CFClient::Layout), 1430 layout => (new CFClient::Layout),
1406 fontsize => 1, 1431 fontsize => 1,
1407 align => -1, 1432 align => -1,
1408 valign => -1, 1433 valign => -1,
1409 padding => 2, 1434 padding_x => 2,
1435 padding_y => 2,
1410 can_events => 0, 1436 can_events => 0,
1411 %arg 1437 %arg
1412 ); 1438 );
1413 1439
1414 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
… …
1450 $self->{text} = "T$text"; 1476 $self->{text} = "T$text";
1451 1477
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1454 1480
1481 $self->realloc;
1455 $self->update; 1482 $self->update;
1456 $self->check_size;
1457} 1483}
1458 1484
1459sub set_markup { 1485sub set_markup {
1460 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1461 1487
… …
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466 1492
1467 $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;
1468 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1469 1495
1496 $self->realloc;
1470 $self->update; 1497 $self->update;
1471 $self->check_size;
1472} 1498}
1473 1499
1474sub size_request { 1500sub size_request {
1475 my ($self) = @_; 1501 my ($self) = @_;
1476 1502
… …
1490 1516
1491 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1492 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1493 } 1519 }
1494 1520
1495 ( 1521 ($w, $h)
1496 $w + $self->{padding} * 2,
1497 $h + $self->{padding} * 2,
1498 )
1499} 1522}
1500 1523
1501sub size_allocate { 1524sub size_allocate {
1502 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1503 1526
… …
1508 my ($self, $fontsize) = @_; 1531 my ($self, $fontsize) = @_;
1509 1532
1510 $self->{fontsize} = $fontsize; 1533 $self->{fontsize} = $fontsize;
1511 delete $self->{texture}; 1534 delete $self->{texture};
1512 1535
1513 $self->update; 1536 $self->realloc;
1514 $self->check_size;
1515} 1537}
1516 1538
1517sub _draw { 1539sub _draw {
1518 my ($self) = @_; 1540 my ($self) = @_;
1519 1541
… …
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1551
1530 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1531 1553
1532 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534 : ($self->{w} - $tex->{w}) * 0.5); 1556 : ($self->{w} - $tex->{w}) * 0.5);
1535 1557
1536 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538 : ($self->{h} - $tex->{h}) * 0.5); 1560 : ($self->{h} - $tex->{h}) * 0.5);
1539 1561
1540 $tex 1562 $tex
1541 }; 1563 };
1542 1564
… …
1599sub set_text { 1621sub set_text {
1600 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1601 1623
1602 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1603 $self->_set_text ($text); 1625 $self->_set_text ($text);
1604 $self->update; 1626
1605 $self->check_size; 1627 $self->realloc;
1606} 1628}
1607 1629
1608sub get_text { 1630sub get_text {
1609 $_[0]{text} 1631 $_[0]{text}
1610} 1632}
… …
1643 } elsif ($uni) { 1665 } elsif ($uni) {
1644 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1645 } 1667 }
1646 1668
1647 $self->_set_text ($text); 1669 $self->_set_text ($text);
1648 $self->update; 1670
1649 $self->check_size; 1671 $self->realloc;
1650} 1672}
1651 1673
1652sub focus_in { 1674sub focus_in {
1653 my ($self) = @_; 1675 my ($self) = @_;
1654 1676
… …
1781 1803
1782sub new { 1804sub new {
1783 my $class = shift; 1805 my $class = shift;
1784 1806
1785 $class->SUPER::new ( 1807 $class->SUPER::new (
1786 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1787 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1788 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1789 can_hover => 1, 1812 can_hover => 1,
1790 align => 0, 1813 align => 0,
1791 valign => 0, 1814 valign => 0,
… …
1838 1861
1839sub new { 1862sub new {
1840 my $class = shift; 1863 my $class = shift;
1841 1864
1842 $class->SUPER::new ( 1865 $class->SUPER::new (
1843 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1844 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1845 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2], 1870 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5], 1871 active_bg => [1, 1, 1, 0.5],
1848 state => 0, 1872 state => 0,
… …
1852} 1876}
1853 1877
1854sub size_request { 1878sub size_request {
1855 my ($self) = @_; 1879 my ($self) = @_;
1856 1880
1857 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1858} 1882}
1859 1883
1860sub button_down { 1884sub button_down {
1861 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1862 1886
1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1866 $self->_emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1867 } 1891 }
1868} 1892}
1869 1893
1870sub _draw { 1894sub _draw {
1871 my ($self) = @_; 1895 my ($self) = @_;
1872 1896
1873 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1874 1898
1875 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876 1900
1877 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;
1878 1904
1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880 1906
1881 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882 1908
… …
2147 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
2148 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2], 2175 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5], 2176 active_bg => [1, 1, 1, 0.5],
2151 range => [0, 0, 100, 10, 0], 2177 range => [0, 0, 100, 10, 0],
2152 req_w => $::WIDTH / 80, 2178 min_w => $::WIDTH / 80,
2153 req_h => $::WIDTH / 80, 2179 min_h => $::WIDTH / 80,
2154 vertical => 0, 2180 vertical => 0,
2155 can_hover => 1, 2181 can_hover => 1,
2156 inner_pad => 0.02, 2182 inner_pad => 0.02,
2157 @_ 2183 @_
2158 ); 2184 );
… …
2161 $self->update; 2187 $self->update;
2162 2188
2163 $self 2189 $self
2164} 2190}
2165 2191
2192sub changed { }
2193
2166sub set_range { 2194sub set_range {
2167 my ($self, $range) = @_; 2195 my ($self, $range) = @_;
2168 2196
2169 ($range, $self->{range}) = ($self->{range}, $range); 2197 ($range, $self->{range}) = ($self->{range}, $range);
2170 2198
… …
2196} 2224}
2197 2225
2198sub size_request { 2226sub size_request {
2199 my ($self) = @_; 2227 my ($self) = @_;
2200 2228
2201 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
2202 my $h = $self->{req_h};
2203
2204 $self->{vertical} ? ($h, $w) : ($w, $h)
2205} 2230}
2206 2231
2207sub button_down { 2232sub button_down {
2208 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
2209 2234
… …
2594} 2619}
2595 2620
2596sub set_tooltip_from { 2621sub set_tooltip_from {
2597 my ($self, $widget) = @_; 2622 my ($self, $widget) = @_;
2598 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
2599 $self->add (new CFClient::UI::Label 2633 $self->add (new CFClient::UI::Label
2600 markup => $widget->{tooltip}, 2634 markup => $tooltip,
2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8, 2636 fontsize => 0.8,
2603 fg => [0, 0, 0, 1], 2637 fg => [0, 0, 0, 1],
2604 ellipsise => 0, 2638 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP), 2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2616 2650
2617sub size_allocate { 2651sub size_allocate {
2618 my ($self, $w, $h) = @_; 2652 my ($self, $w, $h) = @_;
2619 2653
2620 $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 });
2621} 2673}
2622 2674
2623sub _draw { 2675sub _draw {
2624 my ($self) = @_; 2676 my ($self) = @_;
2625 2677
… …
2642 glVertex $w, $h; 2694 glVertex $w, $h;
2643 glVertex $w, 0; 2695 glVertex $w, 0;
2644 glEnd; 2696 glEnd;
2645 2697
2646 glTranslate 2 - 0.375, 2 - 0.375; 2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2647 $self->SUPER::_draw; 2700 $self->SUPER::_draw;
2648} 2701}
2649 2702
2650############################################################################# 2703#############################################################################
2651 2704
… …
2816 # maybe save $GRAB? must be careful about events... 2869 # maybe save $GRAB? must be careful about events...
2817 $GRAB = $self; 2870 $GRAB = $self;
2818 $self->{button} = $ev->{button}; 2871 $self->{button} = $ev->{button};
2819 2872
2820 $self->show; 2873 $self->show;
2821 $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);
2822} 2875}
2823 2876
2824sub mouse_motion { 2877sub mouse_motion {
2825 my ($self, $ev, $x, $y) = @_; 2878 my ($self, $ev, $x, $y) = @_;
2826 2879
… …
2960use CFClient::OpenGL; 3013use CFClient::OpenGL;
2961 3014
2962sub new { 3015sub new {
2963 my $class = shift; 3016 my $class = shift;
2964 3017
2965 $class->SUPER::new ( 3018 my $self = $class->SUPER::new (
2966 visible => 1, 3019 visible => 1,
2967 @_, 3020 @_,
2968 ) 3021 );
2969}
2970 3022
2971sub configure { 3023 Scalar::Util::weaken ($self->{root} = $self);
2972 my ($self, $x, $y, $w, $h) = @_;
2973 3024
2974 $self->{w} = $w; 3025 $self
2975 $self->{h} = $h;
2976}
2977
2978sub check_size {
2979 my ($self) = @_;
2980
2981 $self->size_allocate ($self->{w}, $self->{h})
2982 if $self->{w};
2983} 3026}
2984 3027
2985sub size_request { 3028sub size_request {
2986 my ($self) = @_; 3029 my ($self) = @_;
2987 3030
2988 ($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
2989} 3046}
2990 3047
2991sub size_allocate { 3048sub size_allocate {
2992 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2993 3050
2994 for my $child ($self->children) { 3051 for my $child ($self->children) {
2995 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)};
2996 3053
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3054 $X = $child->{force_x} if exists $child->{force_x};
2998 if exists $child->{req_x}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2999 3056
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3057 $X = _to_pixel $X, $W, $self->{w};
3001 if exists $child->{req_y}; 3058 $Y = _to_pixel $Y, $H, $self->{h};
3002
3003 delete @$child{qw(req_x req_y)};
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 3059
3008 $child->configure ($X, $Y, $W, $H); 3060 $child->configure ($X, $Y, $W, $H);
3009 } 3061 }
3010} 3062}
3011 3063
… …
3022} 3074}
3023 3075
3024sub update { 3076sub update {
3025 my ($self) = @_; 3077 my ($self) = @_;
3026 3078
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3079 $::WANT_REFRESH++;
3029} 3080}
3030 3081
3031sub add { 3082sub add {
3032 my ($self, @children) = @_; 3083 my ($self, @children) = @_;
3033 3084
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1; 3085 $_->{is_toplevel} = 1
3036 3086 for @children;
3037 # integerise window positions
3038 $child->{x} = int $child->{x};
3039 $child->{y} = int $child->{y};
3040 }
3041 3087
3042 $self->SUPER::add (@children); 3088 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049} 3089}
3050 3090
3051sub remove { 3091sub remove {
3052 my ($self, @children) = @_; 3092 my ($self, @children) = @_;
3053 3093
3054 $self->SUPER::remove (@children); 3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3055 3098
3056 while (@children) { 3099 while (@children) {
3057 my $w = pop @children; 3100 my $w = pop @children;
3058 push @children, $w->children; 3101 push @children, $w->children;
3059 $w->set_invisible; 3102 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
3079 $_->() 3122 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3123 for values %{delete $self->{refresh_hook}};
3081 } 3124 }
3082 3125
3083 if ($self->{check_size}) { 3126 if ($self->{realloc}) {
3084 my @queue; 3127 my @queue;
3085 3128
3086 for (;;) { 3129 while () {
3087 if ($self->{check_size}) { 3130 if ($self->{realloc}) {
3088 #TODO use array-of-depth approach 3131 #TODO use array-of-depth approach
3089 3132
3133 use sort 'stable';
3134
3090 @queue = sort { $a->{visible} <=> $b->{visible} } 3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3091 @queue, values %{delete $self->{check_size}}; 3136 @queue, values %{delete $self->{realloc}};
3092 } 3137 }
3093 3138
3094 my $widget = pop @queue || last; 3139 my $widget = pop @queue || last;
3095 3140
3096 defined $widget->{visible} or last; # do not resize invisible widgets 3141 $widget->{visible} or last; # do not resize invisible widgets
3097 3142
3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099 ? @$widget{qw(def_w def_h)}
3100 : $widget->size_request; 3143 my ($w, $h) = $widget->size_request;
3101 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
3102 if (delete $widget->{force_alloc} 3152 || delete $widget->{force_realloc}) {
3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105
3106 $widget->{req_w} = $w; 3153 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h; 3154 $widget->{req_h} = $h;
3108 3155
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3156 $self->{size_alloc}{$widget+0} = $widget;
3110 3157
3111 $widget->{parent}->check_size
3112 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 }
3113 } 3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3114 } 3167 }
3115 } 3168 }
3116 3169
3117 while ($self->{size_alloc}) { 3170 while (my $size_alloc = delete $self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) { 3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3119 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)};
3120 3178
3121 $w = 0 if $w < 0; 3179 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0; 3180 $h = 0 if $h < 0;
3123 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}) {
3124 $widget->{w} = $w; 3186 $widget->{w} = $w;
3125 $widget->{h} = $h; 3187 $widget->{h} = $h;
3188
3126 $widget->emit (size_allocate => $w, $h); 3189 $widget->emit (size_allocate => $w, $h);
3190 }
3127 } 3191 }
3128 } 3192 }
3129 3193
3130 while ($self->{post_alloc_hook}) { 3194 while ($self->{post_alloc_hook}) {
3131 $_->() 3195 $_->()
3132 for values %{delete $self->{post_alloc_hook}}; 3196 for values %{delete $self->{post_alloc_hook}};
3133 } 3197 }
3198
3134 3199
3135 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
3138 3203
… …
3145 $self->_draw; 3210 $self->_draw;
3146} 3211}
3147 3212
3148############################################################################# 3213#############################################################################
3149 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
3150package CFClient::UI; 3465package CFClient::UI;
3151 3466
3152$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
3153$TOOLTIP = new CFClient::UI::Tooltip z => 900; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3154 3469

Diff Legend

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