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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 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 {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $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 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
183 } 189 }
184 } 190 }
185 191
186 reconfigure_widgets; 192 reconfigure_widgets;
187} 193}
196 202
197sub new { 203sub new {
198 my $class = shift; 204 my $class = shift;
199 205
200 my $self = bless { 206 my $self = bless {
201 x => 0, 207 x => "center",
202 y => 0, 208 y => "center",
203 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
204 can_events => 1, 212 can_events => 1,
205 @_ 213 @_
206 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 217
208 for (keys %$self) { 218 for (keys %$self) {
209 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
211 } 221 }
212 } 222 }
213 223
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $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; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
221 } 234 }
222 235
223 $self 236 $self
224} 237}
225 238
236 return if $self->{parent}; 249 return if $self->{parent};
237 250
238 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
239} 252}
240 253
241sub center {
242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible { 254sub set_visible {
254 my ($self) = @_; 255 my ($self) = @_;
255 256
256 return if $self->{visible}; 257 return if $self->{visible};
257 258
258 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
260 261
261 $self->emit (visibility_change => 1); 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
262} 267}
263 268
264sub set_invisible { 269sub set_invisible {
265 my ($self) = @_; 270 my ($self) = @_;
266 271
267 return unless $self->{visible}; 272 return unless $self->{visible};
268 273
269 # broken show/hide model 274 $_->set_invisible for $self->children;
270 275
271 delete $self->{root}; 276 delete $self->{root};
272 delete $self->{visible}; 277 delete $self->{visible};
273 278
274 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
275 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
276 281
277 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
278 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
279 284
280 $self->focus_out; 285 $self->focus_out;
281 286
282 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
283} 288}
306 311
307 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
308 if $self->{parent}; 313 if $self->{parent};
309} 314}
310 315
311sub move { 316sub move_abs {
312 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
313 318
314 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
315 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
316 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
317 322
318 $self->update; 323 $self->update;
319} 324}
320 325
321sub set_size { 326sub set_size {
322 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
323 328
324 $self->{def_w} = $w; 329 $self->{force_w} = $w;
325 $self->{def_h} = $h; 330 $self->{force_h} = $h;
326 331
327 $self->check_size; 332 $self->realloc;
328} 333}
329 334
330sub size_request { 335sub size_request {
331 require Carp; 336 require Carp;
332 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
334 339
335sub configure { 340sub configure {
336 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
337 342
338 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
339 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
340 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
341 348
342 # use alignment to adjust x, y 349 # use alignment to adjust x, y
343 350
344 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
345 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
346
347 ($w, $h) = ($w2, $h2);
348 } 353 }
349 354
350 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
351 $self->{x} = $x; 356 $self->{x} = $x;
352 $self->{y} = $y; 357 $self->{y} = $y;
353 $self->update; 358 $self->update;
354 } 359 }
355 360
356 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
358 } 368 }
359} 369}
360 370
361sub size_allocate { 371sub size_allocate {
362 # nothing to be done 372 # nothing to be done
363} 373}
364 374
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
372sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
373} 381}
374 382
375sub set_max_size { 383sub set_max_size {
376 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
377 385
436 444
437 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438 unless $FOCUS; 446 unless $FOCUS;
439} 447}
440 448
441sub mouse_motion { } 449sub mouse_motion { 0 }
442sub button_up { } 450sub button_up { 0 }
443sub key_down { } 451sub key_down { 0 }
444sub key_up { } 452sub key_up { 0 }
445 453
446sub button_down { 454sub button_down {
447 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
448 456
449 $self->focus_in; 457 $self->focus_in;
450}
451 458
452sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
453sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
454sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
455sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
456sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
457 535
458sub draw { 536sub draw {
459 my ($self) = @_; 537 my ($self) = @_;
460 538
461 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
462 550
463 glPushMatrix; 551 glPushMatrix;
464 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
465 $self->_draw; 553 $self->_draw;
466 glPopMatrix; 554 glPopMatrix;
478 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
479 glEnd; 567 glEnd;
480 glDisable GL_BLEND; 568 glDisable GL_BLEND;
481 } 569 }
482 570
483 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
484 glPushMatrix; 572 glPushMatrix;
485 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
487 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
488 glVertex 0 , 0; 576 glVertex 0 , 0;
499 my ($self) = @_; 587 my ($self) = @_;
500 588
501 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
502} 590}
503 591
504sub find_widget {
505 my ($self, $x, $y) = @_;
506
507 return () unless $self->{can_events};
508
509 return $self
510 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513 ()
514}
515
516sub set_parent {
517 my ($self, $parent) = @_;
518
519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
524}
525
526sub check_size {
527 my ($self, $forced) = @_;
528
529 $self->{force_alloc} = 1 if $forced;
530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
531}
532
533sub update {
534 my ($self) = @_;
535
536 $self->{parent}->update
537 if $self->{parent};
538}
539
540sub connect {
541 my ($self, $signal, $cb) = @_;
542
543 push @{ $self->{signal_cb}{$signal} }, $cb;
544}
545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
552sub emit {
553 my ($self, $signal, @args) = @_;
554
555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
561}
562
563sub DESTROY { 592sub DESTROY {
564 my ($self) = @_; 593 my ($self) = @_;
565 594
566 delete $WIDGET{$self+0}; 595 delete $WIDGET{$self+0};
567 #$self->deactivate; 596 #$self->deactivate;
623 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
624 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
625} 654}
626 655
627sub size_request { 656sub size_request {
628 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
629} 660}
630 661
631sub draw { } 662sub draw { }
632 663
633############################################################################# 664#############################################################################
637our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
638 669
639sub new { 670sub new {
640 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
641 672
642 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
643 674
644 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
645 children => [], 676 children => [],
646 can_events => 0, 677 can_events => 0,
647 %arg, 678 %arg,
648 ); 679 );
680
649 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
650 683
651 $self 684 $self
652} 685}
653 686
654sub add { 687sub add {
662 $self->{children} = [ 695 $self->{children} = [
663 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
664 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
665 ]; 698 ];
666 699
667 $self->check_size (1); 700 $self->realloc;
668 $self->update;
669} 701}
670 702
671sub children { 703sub children {
672 @{ $_[0]{children} } 704 @{ $_[0]{children} }
673} 705}
678 delete $child->{parent}; 710 delete $child->{parent};
679 $child->hide; 711 $child->hide;
680 712
681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682 714
683 $self->check_size (1); 715 $self->realloc;
684 $self->update;
685} 716}
686 717
687sub clear { 718sub clear {
688 my ($self) = @_; 719 my ($self) = @_;
689 720
693 for (@$children) { 724 for (@$children) {
694 delete $_->{parent}; 725 delete $_->{parent};
695 $_->hide; 726 $_->hide;
696 } 727 }
697 728
698 $self->check_size; 729 $self->realloc;
699 $self->update;
700} 730}
701 731
702sub find_widget { 732sub find_widget {
703 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
704 734
705 $x -= $self->{x}; 735 $x -= $self->{x};
706 $y -= $self->{y}; 736 $y -= $self->{y};
707 737
708 my $res; 738 my $res;
709 739
710 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
711 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
712 and return $res; 742 and return $res;
713 } 743 }
714 744
715 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
791 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
792 $self->update; 822 $self->update;
793} 823}
794 824
795sub _render { 825sub _render {
826 my ($self) = @_;
827
796 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
797} 829}
798 830
799sub render_child { 831sub render_child {
800 my ($self) = @_; 832 my ($self) = @_;
801 833
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
805 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
806 $self->_render; 845 $self->_render;
807 }; 846 };
808} 847}
809 848
810sub _draw { 849sub _draw {
811 my ($self) = @_; 850 my ($self) = @_;
812 851
813 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
814 853
815 my $tex = $self->{texture} 854 my $tex = $self->{texture}
816 or return; 855 or return;
817 856
818 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
841} 880}
842 881
843sub size_request { 882sub size_request {
844 my ($self) = @_; 883 my ($self) = @_;
845 884
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 886
848 $w = 10 if $self->{scroll_x}; 887 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
850 889
851 ($w, $h) 890 ($w, $h)
852} 891}
853 892
854sub size_allocate { 893sub size_allocate {
855 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
856 895
896 my $child = $self->child;
897
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 900
860 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
861 $self->update; 902 $self->update;
862} 903}
863 904
898 } 939 }
899} 940}
900 941
901sub _render { 942sub _render {
902 my ($self) = @_; 943 my ($self) = @_;
944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
903 947
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 949
906 $self->SUPER::_render; 950 $self->SUPER::_render;
907} 951}
1006 1050
1007our @ISA = CFClient::UI::Bin::; 1051our @ISA = CFClient::UI::Bin::;
1008 1052
1009use CFClient::OpenGL; 1053use CFClient::OpenGL;
1010 1054
1011my @tex = 1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1062
1015sub new { 1063sub new {
1016 my $class = shift; 1064 my ($class, %arg) = @_;
1065
1066 my $title = delete $arg{title};
1017 1067
1018 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1071 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1072 can_events => 1,
1024 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
1025 ); 1076 );
1026 1077
1027 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
1028 align => 0, 1079 align => 0,
1029 valign => 1, 1080 valign => 1,
1030 text => $self->{title}, 1081 text => $title,
1031 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
1032 1084
1033 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034} 1093}
1035 1094
1036sub border { 1095sub border {
1037 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
1038} 1097}
1039 1098
1040sub size_request { 1099sub size_request {
1041 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
1042 1104
1043 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
1044 1106
1045 ( 1107 (
1046 $w + $self->border * 2, 1108 $w + $self->border * 2,
1049} 1111}
1050 1112
1051sub size_allocate { 1113sub size_allocate {
1052 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
1053 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
1054 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
1056 1126
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1127 $self->child->configure ($border, $border, $w, $h);
1061} 1128}
1062 1129
1063sub button_down { 1130sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
1065 1132
1081 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
1082 1149
1083 my $dx = $ev->{x} - $ox; 1150 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1151 my $dy = $ev->{y} - $oy;
1085 1152
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1155
1091 $self->check_size; 1156 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 }; 1158 };
1093 1159
1094 } elsif ($lr ^ $td) { 1160 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
1098 $self->{motion} = sub { 1164 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
1100 1166
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1168
1103 $self->{user_x} = $bx + $x - $ox; 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->update;
1108 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
1109 } 1175 1
1110} 1176}
1111 1177
1112sub button_up { 1178sub button_up {
1113 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
1114 1180
1115 delete $self->{motion}; 1181 !!delete $self->{motion}
1116} 1182}
1117 1183
1118sub mouse_motion { 1184sub mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
1120 1186
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
1122} 1190}
1123 1191
1124sub _draw { 1192sub _draw {
1125 my ($self) = @_; 1193 my ($self) = @_;
1126 1194
1195 my $child = $self->{children}[0];
1196
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1199
1130 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1202
1133 my $border = $self->border; 1203 my $border = $self->border;
1134 1204
1135 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140 1210
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 my $bg = $tex[0]; 1212 glColor @{ $self->{bg} };
1143 1213
1144 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
1215 # solve this better(?)
1145 my $rep_x = $cw / $bg->{w}; 1216 $bg->{s} = $cw / $bg->{w};
1146 my $rep_y = $ch / $bg->{h}; 1217 $bg->{t} = $ch / $bg->{h};
1147
1148 glColor @{ $self->{bg} };
1149
1150 $bg->{s} = $rep_x;
1151 $bg->{t} = $rep_y;
1152 $bg->{wrap_mode} = 1;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1219 }
1155 1220
1156 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1157 1222
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1161} 1229}
1162 1230
1163############################################################################# 1231#############################################################################
1164 1232
1165package CFClient::UI::Table; 1233package CFClient::UI::Table;
1187 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
1188 1256
1189 $child->set_parent ($self); 1257 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
1191 1259
1192 $self->check_size (1); 1260 $self->realloc;
1193} 1261}
1194 1262
1195# TODO: move to container class maybe? send children a signal on removal? 1263# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1264sub clear {
1197 my ($self) = @_; 1265 my ($self) = @_;
1202 for (@children) { 1270 for (@children) {
1203 delete $_->{parent}; 1271 delete $_->{parent};
1204 $_->hide; 1272 $_->hide;
1205 } 1273 }
1206 1274
1207 $self->check_size (1); 1275 $self->realloc;
1208 $self->update;
1209} 1276}
1210 1277
1211sub get_wh { 1278sub get_wh {
1212 my ($self) = @_; 1279 my ($self) = @_;
1213 1280
1421 ellipsise => 3, # end 1488 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1489 layout => (new CFClient::Layout),
1423 fontsize => 1, 1490 fontsize => 1,
1424 align => -1, 1491 align => -1,
1425 valign => -1, 1492 valign => -1,
1426 padding => 2, 1493 padding_x => 2,
1494 padding_y => 2,
1427 can_events => 0, 1495 can_events => 0,
1428 %arg 1496 %arg
1429 ); 1497 );
1430 1498
1431 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
1467 $self->{text} = "T$text"; 1535 $self->{text} = "T$text";
1468 1536
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1471 1539
1540 $self->realloc;
1472 $self->update; 1541 $self->update;
1473 $self->check_size;
1474} 1542}
1475 1543
1476sub set_markup { 1544sub set_markup {
1477 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1478 1546
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1551
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1486 1554
1555 $self->realloc;
1487 $self->update; 1556 $self->update;
1488 $self->check_size;
1489} 1557}
1490 1558
1491sub size_request { 1559sub size_request {
1492 my ($self) = @_; 1560 my ($self) = @_;
1493 1561
1507 1575
1508 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1510 } 1578 }
1511 1579
1512 ( 1580 ($w, $h)
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1581}
1517 1582
1518sub size_allocate { 1583sub size_allocate {
1519 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1520 1585
1586 delete $self->{ox};
1587
1521 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1590}
1523 1591
1524sub set_fontsize { 1592sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1526 1594
1527 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1596 delete $self->{texture};
1529 1597
1530 $self->update; 1598 $self->realloc;
1531 $self->check_size;
1532} 1599}
1533 1600
1534sub _draw { 1601sub _draw {
1535 my ($self) = @_; 1602 my ($self) = @_;
1536 1603
1542 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1613
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1548 1616
1617 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1552 1621
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1625 };
1559 1626
1560 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 1629
1616sub set_text { 1683sub set_text {
1617 my ($self, $text) = @_; 1684 my ($self, $text) = @_;
1618 1685
1619 $self->{cursor} = length $text; 1686 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1687 $self->_set_text ($text);
1621 $self->update; 1688
1622 $self->check_size; 1689 $self->realloc;
1623} 1690}
1624 1691
1625sub get_text { 1692sub get_text {
1626 $_[0]{text} 1693 $_[0]{text}
1627} 1694}
1657 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1726 $self->_emit ('escape');
1660 } elsif ($uni) { 1727 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1662 } 1731 }
1663 1732
1664 $self->_set_text ($text); 1733 $self->_set_text ($text);
1665 $self->update; 1734
1666 $self->check_size; 1735 $self->realloc;
1736
1737 1
1667} 1738}
1668 1739
1669sub focus_in { 1740sub focus_in {
1670 my ($self) = @_; 1741 my ($self) = @_;
1671 1742
1686 utf8::encode $text; 1757 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1688 1759
1689 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1690 $self->update; 1761 $self->update;
1762
1763 1
1691} 1764}
1692 1765
1693sub mouse_motion { 1766sub mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1696} 1771}
1697 1772
1698sub _draw { 1773sub _draw {
1699 my ($self) = @_; 1774 my ($self) = @_;
1700 1775
1777 } else { 1852 } else {
1778 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1779 } 1854 }
1780 1855
1781 } else { 1856 } else {
1782 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1783 } 1860 1
1784
1785} 1861}
1786 1862
1787############################################################################# 1863#############################################################################
1788 1864
1789package CFClient::UI::Button; 1865package CFClient::UI::Button;
1798 1874
1799sub new { 1875sub new {
1800 my $class = shift; 1876 my $class = shift;
1801 1877
1802 $class->SUPER::new ( 1878 $class->SUPER::new (
1803 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1804 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1806 can_hover => 1, 1883 can_hover => 1,
1807 align => 0, 1884 align => 0,
1808 valign => 0, 1885 valign => 0,
1817 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1818 1895
1819 $self->emit ("activate") 1896 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1898 && $y >= 0 && $y < $self->{h};
1899
1900 1
1822} 1901}
1823 1902
1824sub _draw { 1903sub _draw {
1825 my ($self) = @_; 1904 my ($self) = @_;
1826 1905
1855 1934
1856sub new { 1935sub new {
1857 my $class = shift; 1936 my $class = shift;
1858 1937
1859 $class->SUPER::new ( 1938 $class->SUPER::new (
1860 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1861 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1943 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1944 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1945 state => 0,
1869} 1949}
1870 1950
1871sub size_request { 1951sub size_request {
1872 my ($self) = @_; 1952 my ($self) = @_;
1873 1953
1874 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1875} 1955}
1876 1956
1877sub button_down { 1957sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1879 1959
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1884 } 1968 1
1885} 1969}
1886 1970
1887sub _draw { 1971sub _draw {
1888 my ($self) = @_; 1972 my ($self) = @_;
1889 1973
1890 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1891 1975
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 1977
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1978 my ($w, $h) = @$self{qw(w h)};
1979
1980 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 1981
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 1983
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 1985
2164 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2252 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2253 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2254 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2255 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2256 min_h => $::WIDTH / 80,
2171 vertical => 0, 2257 vertical => 0,
2172 can_hover => 1, 2258 can_hover => 1,
2173 inner_pad => 0.02, 2259 inner_pad => 0.02,
2174 @_ 2260 @_
2175 ); 2261 );
2178 $self->update; 2264 $self->update;
2179 2265
2180 $self 2266 $self
2181} 2267}
2182 2268
2269sub changed { }
2270
2183sub set_range { 2271sub set_range {
2184 my ($self, $range) = @_; 2272 my ($self, $range) = @_;
2185 2273
2186 ($range, $self->{range}) = ($self->{range}, $range); 2274 ($range, $self->{range}) = ($self->{range}, $range);
2187 2275
2213} 2301}
2214 2302
2215sub size_request { 2303sub size_request {
2216 my ($self) = @_; 2304 my ($self) = @_;
2217 2305
2218 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
2219 my $h = $self->{req_h};
2220
2221 $self->{vertical} ? ($h, $w) : ($w, $h)
2222} 2307}
2223 2308
2224sub button_down { 2309sub button_down {
2225 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
2226 2311
2227 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2228 2313
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230 2315
2231 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2232} 2317}
2233 2318
2234sub mouse_motion { 2319sub mouse_motion {
2235 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2236 2321
2240 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241 2326
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243 2328
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2245 } 2334 1
2246} 2335}
2247 2336
2248sub update { 2337sub update {
2249 my ($self) = @_; 2338 my ($self) = @_;
2250 2339
2611} 2700}
2612 2701
2613sub set_tooltip_from { 2702sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2703 my ($self, $widget) = @_;
2615 2704
2705 my $tooltip = $widget->{tooltip};
2706
2707 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}";
2712 }
2713
2616 $self->add (new CFClient::UI::Label 2714 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2715 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2717 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2718 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2719 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
2633 2731
2634sub size_allocate { 2732sub size_allocate {
2635 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2636 2734
2637 $self->SUPER::size_allocate ($w - 4, $h - 4); 2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2736}
2737
2738sub visibility_change {
2739 my ($self, $visible) = @_;
2740
2741 return unless $visible;
2742
2743 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner}
2745 or return;
2746
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH;
2751
2752 $self->move_abs ($x, $y);
2753 });
2638} 2754}
2639 2755
2640sub _draw { 2756sub _draw {
2641 my ($self) = @_; 2757 my ($self) = @_;
2642 2758
2659 glVertex $w, $h; 2775 glVertex $w, $h;
2660 glVertex $w, 0; 2776 glVertex $w, 0;
2661 glEnd; 2777 glEnd;
2662 2778
2663 glTranslate 2 - 0.375, 2 - 0.375; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2780
2664 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2665} 2782}
2666 2783
2667############################################################################# 2784#############################################################################
2668 2785
2744 $self->SUPER::DESTROY; 2861 $self->SUPER::DESTROY;
2745} 2862}
2746 2863
2747############################################################################# 2864#############################################################################
2748 2865
2749package CFClient::UI::Inventory; 2866package CFClient::UI::Buttonbar;
2750 2867
2751our @ISA = CFClient::UI::ScrolledWindow::; 2868our @ISA = CFClient::UI::HBox::;
2752 2869
2753sub new { 2870# TODO: should actualyl wrap buttons and other goodies.
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2786 }
2787}
2788 2871
2789############################################################################# 2872#############################################################################
2790 2873
2791package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2792 2875
2833 # maybe save $GRAB? must be careful about events... 2916 # maybe save $GRAB? must be careful about events...
2834 $GRAB = $self; 2917 $GRAB = $self;
2835 $self->{button} = $ev->{button}; 2918 $self->{button} = $ev->{button};
2836 2919
2837 $self->show; 2920 $self->show;
2838 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839} 2922}
2840 2923
2841sub mouse_motion { 2924sub mouse_motion {
2842 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2843 2926
2844 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2847} 2932}
2848 2933
2849sub button_up { 2934sub button_up {
2850 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2851 2936
2853 undef $GRAB; 2938 undef $GRAB;
2854 $self->hide; 2939 $self->hide;
2855 2940
2856 $self->_emit ("popdown"); 2941 $self->_emit ("popdown");
2857 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2858 } 2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
2859} 3054}
2860 3055
2861############################################################################# 3056#############################################################################
2862 3057
2863package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
2968 $self->SUPER::reconfigure; 3163 $self->SUPER::reconfigure;
2969} 3164}
2970 3165
2971############################################################################# 3166#############################################################################
2972 3167
2973package CFClient::UI::Root; 3168package CFClient::UI::Inventory;
2974 3169
2975our @ISA = CFClient::UI::Container::; 3170our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977use CFClient::OpenGL;
2978 3171
2979sub new { 3172sub new {
2980 my $class = shift; 3173 my $class = shift;
2981 3174
2982 $class->SUPER::new ( 3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
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
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_,
3419 )
3420}
3421
3422# XXX: Do sorting? Argl...
3423sub add_spell {
3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
3426
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root;
3465
3466our @ISA = CFClient::UI::Container::;
3467
3468use CFClient::OpenGL;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
2983 visible => 1, 3474 visible => 1,
2984 @_, 3475 @_,
2985 ) 3476 );
2986}
2987 3477
2988sub configure { 3478 Scalar::Util::weaken ($self->{root} = $self);
2989 my ($self, $x, $y, $w, $h) = @_;
2990 3479
2991 $self->{w} = $w; 3480 $self
2992 $self->{h} = $h;
2993}
2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000} 3481}
3001 3482
3002sub size_request { 3483sub size_request {
3003 my ($self) = @_; 3484 my ($self) = @_;
3004 3485
3005 ($self->{w}, $self->{h}) 3486 ($self->{w}, $self->{h})
3487}
3488
3489sub _to_pixel {
3490 my ($coord, $size, $max) = @_;
3491
3492 $coord =
3493 $coord eq "center" ? ($max - $size) * 0.5
3494 : $coord eq "max" ? $max
3495 : $coord;
3496
3497 $coord = 0 if $coord < 0;
3498 $coord = $max - $size if $coord > $max - $size;
3499
3500 int $coord + 0.5
3006} 3501}
3007 3502
3008sub size_allocate { 3503sub size_allocate {
3009 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
3010 3505
3011 for my $child ($self->children) { 3506 for my $child ($self->children) {
3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013 3508
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3509 $X = $child->{force_x} if exists $child->{force_x};
3015 if exists $child->{req_x}; 3510 $Y = $child->{force_y} if exists $child->{force_y};
3016 3511
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3512 $X = _to_pixel $X, $W, $self->{w};
3018 if exists $child->{req_y}; 3513 $Y = _to_pixel $Y, $H, $self->{h};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024 3514
3025 $child->configure ($X, $Y, $W, $H); 3515 $child->configure ($X, $Y, $W, $H);
3026 } 3516 }
3027} 3517}
3028 3518
3039} 3529}
3040 3530
3041sub update { 3531sub update {
3042 my ($self) = @_; 3532 my ($self) = @_;
3043 3533
3044 $self->check_size;
3045 $::WANT_REFRESH++; 3534 $::WANT_REFRESH++;
3046} 3535}
3047 3536
3048sub add { 3537sub add {
3049 my ($self, @children) = @_; 3538 my ($self, @children) = @_;
3050 3539
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1; 3540 $_->{is_toplevel} = 1
3053 3541 for @children;
3054 # integerise window positions
3055 $child->{x} = int $child->{x};
3056 $child->{y} = int $child->{y};
3057 }
3058 3542
3059 $self->SUPER::add (@children); 3543 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066} 3544}
3067 3545
3068sub remove { 3546sub remove {
3069 my ($self, @children) = @_; 3547 my ($self, @children) = @_;
3070 3548
3071 $self->SUPER::remove (@children); 3549 $self->SUPER::remove (@children);
3550
3551 delete $self->{is_toplevel}
3552 for @children;
3072 3553
3073 while (@children) { 3554 while (@children) {
3074 my $w = pop @children; 3555 my $w = pop @children;
3075 push @children, $w->children; 3556 push @children, $w->children;
3076 $w->set_invisible; 3557 $w->set_invisible;
3095 while ($self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
3096 $_->() 3577 $_->()
3097 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
3098 } 3579 }
3099 3580
3100 if ($self->{check_size}) { 3581 if ($self->{realloc}) {
3582 my %queue;
3101 my @queue; 3583 my @queue;
3584 my $widget;
3102 3585
3586 outer:
3103 while () { 3587 while () {
3104 if ($self->{check_size}) { 3588 if (my $realloc = delete $self->{realloc}) {
3105 #TODO use array-of-depth approach 3589 for $widget (values %$realloc) {
3590 $widget->{visible} or next; # do not resize invisible widgets
3106 3591
3107 @queue = sort { $a->{visible} <=> $b->{visible} } 3592 $queue{$widget+0}++ and next; # duplicates are common
3108 @queue, values %{delete $self->{check_size}}; 3593
3594 push @{ $queue[$widget->{visible}] }, $widget;
3595 }
3109 } 3596 }
3110 3597
3598 while () {
3599 @queue or last outer;
3600
3111 my $widget = pop @queue || last; 3601 $widget = pop @{ $queue[-1] || [] }
3112 3602 and last;
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122 3603
3604 pop @queue;
3605 }
3606
3607 delete $queue{$widget+0};
3608
3609 my ($w, $h) = $widget->size_request;
3610
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3613
3614 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h};
3616
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3618 || delete $widget->{force_realloc}) {
3123 $widget->{req_w} = $w; 3619 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
3125 3621
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3622 $self->{size_alloc}{$widget+0} = $widget;
3127 3623
3128 $widget->{parent}->check_size
3129 if $widget->{parent}; 3624 if (my $parent = $widget->{parent}) {
3625 $self->{realloc}{$parent+0} = $parent
3626 unless $queue{$parent+0};
3627
3628 $parent->{force_size_alloc} = 1;
3629 $self->{size_alloc}{$parent+0} = $parent;
3630 }
3130 } 3631 }
3632
3633 delete $self->{realloc}{$widget+0};
3131 } 3634 }
3132 } 3635 }
3133 3636
3134 while (my $size_alloc = delete $self->{size_alloc}) { 3637 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
3136 values %$size_alloc; 3639 values %$size_alloc;
3137 3640
3138 while () { 3641 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last }; 3642 my $widget = pop @queue || last;
3643
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140 3645
3141 $w = 0 if $w < 0; 3646 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0; 3647 $h = 0 if $h < 0;
3143 3648
3649 $w = int $w + 0.5;
3650 $h = int $h + 0.5;
3651
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
3144 $widget->{w} = $w; 3656 $widget->{w} = $w;
3145 $widget->{h} = $h; 3657 $widget->{h} = $h;
3658
3146 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3660 }
3147 } 3661 }
3148 } 3662 }
3149 3663
3150 while ($self->{post_alloc_hook}) { 3664 while ($self->{post_alloc_hook}) {
3151 $_->() 3665 $_->()
3152 for values %{delete $self->{post_alloc_hook}}; 3666 for values %{delete $self->{post_alloc_hook}};
3153 } 3667 }
3668
3154 3669
3155 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
3158 3673
3160 glLoadIdentity; 3675 glLoadIdentity;
3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
3163 glLoadIdentity; 3678 glLoadIdentity;
3164 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
3165 $self->_draw; 3687 $self->_draw;
3166} 3688}
3167 3689
3168############################################################################# 3690#############################################################################
3169 3691

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines