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.259 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
287} 288}
288 289
289sub set_visibility { 290sub set_visibility {
290 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
313} 314}
314 315
315sub move_abs { 316sub move_abs {
316 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
317 318
318 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
321 322
322 $self->update; 323 $self->update;
323} 324}
324 325
… …
332} 333}
333 334
334sub size_request { 335sub size_request {
335 require Carp; 336 require Carp;
336 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
337} 342}
338 343
339sub configure { 344sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
341 346
… …
365 370
366 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
367 } 372 }
368} 373}
369 374
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
375} 381}
376 382
377sub set_max_size { 383sub set_max_size {
378 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
379 385
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
382} 390}
383 391
384sub set_tooltip { 392sub set_tooltip {
385 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
386 394
… …
391 399
392 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
393 401
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 405 }
398} 406}
399 407
400# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
401sub coord2local { 409sub coord2local {
… …
409 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
410 418
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 420}
413 421
414sub focus_in { 422sub invoke_focus_in {
415 my ($self) = @_; 423 my ($self) = @_;
416 424
417 return if $FOCUS == $self; 425 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
419 427
420 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
421 429
422 $self->_emit (focus_in => $focus);
423
424 $focus->update if $focus; 430 $focus->update if $focus;
425 $FOCUS->update; 431 $FOCUS->update;
426}
427 432
433 0
434}
435
428sub focus_out { 436sub invoke_focus_out {
429 my ($self) = @_; 437 my ($self) = @_;
430 438
431 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
432 440
433 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
434 442
435 $self->_emit (focus_out => $focus);
436
437 $focus->update if $focus; #? 443 $focus->update if $focus; #?
438 444
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 446 unless $FOCUS;
441}
442 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
443sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
444sub button_up { } 458sub invoke_button_up { 1 }
445sub key_down { } 459sub invoke_key_down { 1 }
446sub key_up { } 460sub invoke_key_up { 1 }
447 461
448sub button_down { 462sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
450 464
451 $self->focus_in; 465 $self->grab_focus;
452}
453 466
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
459 484
460sub find_widget { 485sub find_widget {
461 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
462 487
463 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
472sub set_parent { 497sub set_parent {
473 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
474 499
475 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 501 $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} 502}
501 503
502sub realloc { 504sub realloc {
503 my ($self) = @_; 505 my ($self) = @_;
504 506
… …
525 527
526 $self->realloc; 528 $self->realloc;
527 $self->update; 529 $self->update;
528} 530}
529 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
535
530sub draw { 536sub draw {
531 my ($self) = @_; 537 my ($self) = @_;
532 538
533 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);
534 550
535 glPushMatrix; 551 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 553
540 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 556 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 558 glBegin GL_QUADS;
547 glVertex $x , $y; 559 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
551 glEnd; 563 glEnd;
552 glDisable GL_BLEND; 564 glDisable GL_BLEND;
553 } 565 }
554 566
555 if ($ENV{CFPLUS_DEBUG} & 1) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 568 glPushMatrix;
557 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 572 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
564 glEnd; 576 glEnd;
565 glPopMatrix; 577 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
568} 583}
569 584
570sub _draw { 585sub _draw {
571 my ($self) = @_; 586 my ($self) = @_;
572 587
… …
575 590
576sub DESTROY { 591sub DESTROY {
577 my ($self) = @_; 592 my ($self) = @_;
578 593
579 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
580 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 598}
582 599
583############################################################################# 600#############################################################################
584 601
585package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
610 627
611 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
613 630
614 glEnable GL_BLEND; 631 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 633 glColor_premultiply @$color;
617 634
618 glBegin GL_QUADS; 635 glBegin GL_QUADS;
619 glVertex 0 , 0; 636 glVertex 0 , 0;
620 glVertex 0 , $h; 637 glVertex 0 , $h;
621 glVertex $w, $h; 638 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
653 670
654sub new { 671sub new {
655 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
656 673
657 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
658 675
659 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
660 children => [], 677 children => [],
661 can_events => 0, 678 can_events => 0,
662 %arg, 679 %arg,
663 ); 680 );
681
664 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
665 684
666 $self 685 $self
667} 686}
668 687
669sub add { 688sub add {
… …
717 $x -= $self->{x}; 736 $x -= $self->{x};
718 $y -= $self->{y}; 737 $y -= $self->{y};
719 738
720 my $res; 739 my $res;
721 740
722 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
724 and return $res; 743 and return $res;
725 } 744 }
726 745
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748} 767}
749 768
750sub add { 769sub add {
751 my ($self, $child) = @_; 770 my ($self, $child) = @_;
752 771
753 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
756} 774}
757 775
758sub remove { 776sub remove {
759 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
768 786
769sub size_request { 787sub size_request {
770 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
771} 789}
772 790
773sub size_allocate { 791sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
775 793
776 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
777} 797}
778 798
779############################################################################# 799#############################################################################
800
801# back-buffered drawing area
780 802
781package CFClient::UI::Window; 803package CFClient::UI::Window;
782 804
783our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
784 806
… …
795 817
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 819 $self->SUPER::update;
798} 820}
799 821
800sub size_allocate { 822sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
802 824
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
805} 828}
806 829
807sub _render { 830sub _render {
831 my ($self) = @_;
832
808 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
809} 834}
810 835
811sub render_child { 836sub render_child {
812 my ($self) = @_; 837 my ($self) = @_;
813 838
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
817 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
818 $self->_render; 850 $self->_render;
819 }; 851 };
820} 852}
821 853
822sub _draw { 854sub _draw {
823 my ($self) = @_; 855 my ($self) = @_;
824 856
825 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
826 858
827 my $tex = $self->{texture} 859 my $tex = $self->{texture}
828 or return; 860 or return;
829 861
830 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
833 865
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 867
836 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
837} 869}
… …
861 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
862 894
863 ($w, $h) 895 ($w, $h)
864} 896}
865 897
866sub size_allocate { 898sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
868 900
869 my $child = $self->child; 901 my $child = $self->child;
870 902
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 905
874 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
875 $self->update; 907 $self->update;
908
909 1
876} 910}
877 911
878sub set_offset { 912sub set_offset {
879 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
880 914
… …
913} 947}
914 948
915sub _render { 949sub _render {
916 my ($self) = @_; 950 my ($self) = @_;
917 951
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
954
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 956
920 $self->SUPER::_render; 957 $self->SUPER::_render;
921} 958}
922 959
… …
925package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
926 963
927our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
928 965
929sub new { 966sub new {
930 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
931 970
932 my $self; 971 my $self;
933 972
934 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
935 vertical => 1, 974 vertical => 1,
… …
940 ; 979 ;
941 980
942 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 982 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider, 983 slider => $slider,
945 @_, 984 %arg,
946 ); 985 );
947 986
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
951 989
952 $self 990 $self
991}
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
953} 997}
954 998
955sub update { 999sub update {
956 my ($self) = @_; 1000 my ($self) = @_;
957 1001
… …
960 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1007}
964 1008
965sub size_allocate { 1009sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1010 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969 1011
970 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
972} 1016}
973 1017
974#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll 1019# update viewport offset on scroll
976 1020
… …
996 1040
997 if ($self->{bg}) { 1041 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
999 1043
1000 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
1003 1047
1004 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1049 glVertex 0 , 0;
1006 glVertex 0 , $h; 1050 glVertex 0 , $h;
1007 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1029my @border = 1073my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1076
1033sub new { 1077sub new {
1034 my $class = shift; 1078 my ($class, %arg) = @_;
1035 1079
1036 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1083 border => 0.6,
1040 can_events => 1, 1084 can_events => 1,
1041 min_w => 16, 1085 min_w => 16,
1042 min_h => 16, 1086 min_h => 16,
1043 @_ 1087 %arg,
1044 ); 1088 );
1045 1089
1046 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1091 align => 0,
1048 valign => 1, 1092 valign => 1,
1049 text => $self->{title}, 1093 text => $self->{title},
1050 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1051 1105
1052 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1115}
1054 1116
1055sub border { 1117sub border {
1056 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1057} 1119}
1058 1120
1059sub size_request { 1121sub size_request {
1060 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1061 1129
1062 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1063 1131
1064 ( 1132 (
1065 $w + $self->border * 2, 1133 $w + $self->border * 2,
1066 $h + $self->border * 2, 1134 $h + $self->border * 2,
1067 ) 1135 )
1068} 1136}
1069 1137
1070sub size_allocate { 1138sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1072 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
1073 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1075 1151
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1082sub button_down { 1160sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1084 1162
1085 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1164 my $border = $self->border;
1087 1165
… …
1103 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1104 1182
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1187 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1188 };
1111 1189
1112 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1118 1196
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1198
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1123 } 1207 1
1124} 1208}
1125 1209
1126sub button_up { 1210sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1128 1212
1129 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1130} 1214}
1131 1215
1132sub mouse_motion { 1216sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1134 1218
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1136} 1222}
1137 1223
1138sub _draw { 1224sub _draw {
1139 my ($self) = @_; 1225 my ($self) = @_;
1140 1226
1227 my $child = $self->{children}[0];
1228
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1231
1144 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1234
1147 my $border = $self->border; 1235 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1251 }
1164 1252
1165 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1166 1254
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1170} 1266}
1171 1267
1172############################################################################# 1268#############################################################################
1173 1269
1174package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1197 1293
1198 $child->set_parent ($self); 1294 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1200 1296
1201 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1202} 1304}
1203 1305
1204# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1307sub clear {
1206 my ($self) = @_; 1308 my ($self) = @_;
… …
1247 (sum @$ws), 1349 (sum @$ws),
1248 (sum @$hs), 1350 (sum @$hs),
1249 ) 1351 )
1250} 1352}
1251 1353
1252sub size_allocate { 1354sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1254 1356
1255 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1256 1358
1257 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1289 } 1391 }
1290 1392
1291 $y += $row_h; 1393 $y += $row_h;
1292 } 1394 }
1293 1395
1396 1
1294} 1397}
1295 1398
1296sub find_widget { 1399sub find_widget {
1297 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1298 1401
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1440 )
1338} 1441}
1339 1442
1340sub size_allocate { 1443sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1342 1445
1343 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1345 1448
1346 my @req; 1449 my @req;
1347 1450
1348 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1350 } else { 1453 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1353 1456
1354 if ($req > $space) { 1457 if ($req > $space) {
1355 # ah well, not enough space 1458 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1357 } else { 1460 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1462
1360 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1361 1464
1362 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1466 for 0 .. $#children;
1364 } 1467 }
1365 } 1468 }
1366 1469
1367 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1368 1471
1369 my $pos = 0; 1472 my $pos = 0;
1370 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1476
1374 $pos += $alloc; 1477 $pos += $alloc;
1375 } 1478 }
1376 1479
1377 1 1480 1
… …
1467 1570
1468 delete $self->{texture}; 1571 delete $self->{texture};
1469 $self->SUPER::update; 1572 $self->SUPER::update;
1470} 1573}
1471 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1472sub set_text { 1582sub set_text {
1473 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1474 1584
1475 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1477 1587
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1480 1590
1591 delete $self->{size_req};
1481 $self->realloc; 1592 $self->realloc;
1482 $self->update; 1593 $self->update;
1483} 1594}
1484 1595
1485sub set_markup { 1596sub set_markup {
… …
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1603
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1495 1606
1607 delete $self->{size_req};
1496 $self->realloc; 1608 $self->realloc;
1497 $self->update; 1609 $self->update;
1498} 1610}
1499 1611
1500sub size_request { 1612sub size_request {
1501 my ($self) = @_; 1613 my ($self) = @_;
1502 1614
1615 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1621
1509 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1510 1623
1511 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1627
1515 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1516 1629
1517 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1519 } 1635 };
1520 1636
1521 ($w, $h) 1637 @{ $self->{size_req} }
1522} 1638}
1523 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1524sub size_allocate { 1644sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1526 1646
1647 delete $self->{ox};
1648
1527 delete $self->{texture}; 1649 delete $self->{texture}
1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1528} 1653}
1529 1654
1530sub set_fontsize { 1655sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1532 1657
1533 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1534 delete $self->{texture}; 1659 delete $self->{texture};
1535 1660
1536 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1537} 1670}
1538 1671
1539sub _draw { 1672sub _draw {
1540 my ($self) = @_; 1673 my ($self) = @_;
1541 1674
… …
1547 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1684
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1553 1687
1688 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1557 1692
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1563 }; 1696 };
1564 1697
1565 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1567 1702
1568 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1569 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1571 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1573 } 1710 }
1574 1711
1575 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1576} 1713}
1577 1714
… …
1594 can_hover => 1, 1731 can_hover => 1,
1595 can_focus => 1, 1732 can_focus => 1,
1596 valign => 0, 1733 valign => 0,
1597 can_events => 1, 1734 can_events => 1,
1598 #text => ... 1735 #text => ...
1736 #hidden => "*",
1599 @_ 1737 @_
1600 ) 1738 )
1601} 1739}
1602 1740
1603sub _set_text { 1741sub _set_text {
… …
1605 1743
1606 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1607 1745
1608 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1609 1747
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1749 $self->{text} = $text;
1614 1750
1615 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1617 1754
1618 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1619} 1759}
1620 1760
1621sub set_text { 1761sub set_text {
1622 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1623 1763
1624 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1765 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1766}
1629 1767
1630sub get_text { 1768sub get_text {
1631 $_[0]{text} 1769 $_[0]{text}
1632} 1770}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1638 1776
1639 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1640} 1778}
1641 1779
1642sub key_down { 1780sub invoke_key_down {
1643 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1644 1782
1645 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1659 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1660 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1802 $self->emit ('escape');
1665 } elsif ($uni) { 1803 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1667 } 1807 }
1668 1808
1669 $self->_set_text ($text); 1809 $self->_set_text ($text);
1670 1810
1671 $self->realloc; 1811 $self->realloc;
1672}
1673 1812
1813 1
1814}
1815
1674sub focus_in { 1816sub invoke_focus_in {
1675 my ($self) = @_; 1817 my ($self) = @_;
1676 1818
1677 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1678 1820
1679 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1680} 1822}
1681 1823
1682sub button_down { 1824sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1684 1826
1685 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 1828
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 1830
1689 # byte-index to char-index 1831 # byte-index to char-index
1690 my $text = $self->{text}; 1832 my $text = $self->{text};
1691 utf8::encode $text; 1833 utf8::encode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1693 1835
1694 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1695 $self->update; 1837 $self->update;
1838
1839 1
1696} 1840}
1697 1841
1698sub mouse_motion { 1842sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1701} 1847}
1702 1848
1703sub _draw { 1849sub _draw {
1704 my ($self) = @_; 1850 my ($self) = @_;
1705 1851
1706 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1707 1853
1708 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1711 } else { 1857 } else {
1712 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1713 } 1859 }
1714 1860
1715 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1864 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1746 1892
1747our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1748 1894
1749use CFClient::OpenGL; 1895use CFClient::OpenGL;
1750 1896
1751sub key_down { 1897sub invoke_key_down {
1752 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1753 1899
1754 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1755 1901
1756 if ($sym == 13) { 1902 if ($sym == 13) {
1757 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1759 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1762 $self->update; 1909 $self->update;
1763 1910
1764 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1782 } else { 1929 } else {
1783 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1784 } 1931 }
1785 1932
1786 } else { 1933 } else {
1787 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1788 } 1937 1
1789
1790} 1938}
1791 1939
1792############################################################################# 1940#############################################################################
1793 1941
1794package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1815 can_events => 1, 1963 can_events => 1,
1816 @_ 1964 @_
1817 ) 1965 )
1818} 1966}
1819 1967
1820sub activate { }
1821
1822sub button_up { 1968sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1824 1970
1825 $self->emit ("activate") 1971 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1828} 1976}
1829 1977
1830sub _draw { 1978sub _draw {
1831 my ($self) = @_; 1979 my ($self) = @_;
1832 1980
1833 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 1982
1839 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1842 1986
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844 1988
1845 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1846 1990
1847 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1848} 2028}
1849 2029
1850############################################################################# 2030#############################################################################
1851 2031
1852package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1879 my ($self) = @_; 2059 my ($self) = @_;
1880 2060
1881 (6) x 2 2061 (6) x 2
1882} 2062}
1883 2063
1884sub button_down { 2064sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1886 2066
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1890 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1891 } 2075 1
1892} 2076}
1893 2077
1894sub _draw { 2078sub _draw {
1895 my ($self) = @_; 2079 my ($self) = @_;
1896 2080
… …
1916package CFClient::UI::Image; 2100package CFClient::UI::Image;
1917 2101
1918our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1919 2103
1920use CFClient::OpenGL; 2104use CFClient::OpenGL;
1921use Carp qw/confess/;
1922 2105
1923our %loaded_images; 2106our %texture_cache;
1924 2107
1925sub new { 2108sub new {
1926 my $class = shift; 2109 my $class = shift;
1927 2110
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1929 2115
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1931 2118
1932 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1934 2121
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1936 2123
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2125
1941 $self 2126 $self
1942} 2127}
1943 2128
1944sub size_request { 2129sub size_request {
1945 my ($self) = @_; 2130 my ($self) = @_;
1946 2131
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1948} 2133}
1949 2134
1950sub _draw { 2135sub _draw {
1951 my ($self) = @_; 2136 my ($self) = @_;
1952 2137
… …
2063 2248
2064 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2066 2251
2067 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2257
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2187 $self->update; 2373 $self->update;
2188 2374
2189 $self 2375 $self
2190} 2376}
2191 2377
2192sub changed { }
2193
2194sub set_range { 2378sub set_range {
2195 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2196 2380
2197 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2198 2382
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2201} 2387}
2202 2388
2203sub set_value { 2389sub set_value {
2204 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2205 2391
… …
2216 if $unit; 2402 if $unit;
2217 2403
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2405
2220 if ($value != $old_value) { 2406 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2222 $self->update; 2408 $self->update;
2223 } 2409 }
2224} 2410}
2225 2411
2226sub size_request { 2412sub size_request {
2227 my ($self) = @_; 2413 my ($self) = @_;
2228 2414
2229 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2230} 2416}
2231 2417
2232sub button_down { 2418sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2234 2420
2235 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2422
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2424
2239 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2426}
2241 2427
2242sub mouse_motion { 2428sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2244 2430
2245 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2433
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2435
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2437
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2253 } 2443 1
2254} 2444}
2255 2445
2256sub update { 2446sub update {
2257 my ($self) = @_; 2447 my ($self) = @_;
2258 2448
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2261 2458
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2264 2461
… …
2270 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2272 2469
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2275 }); 2472 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2473
2283 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2284 2475
2285 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2286 2477
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2349 2540
2350############################################################################# 2541#############################################################################
2351 2542
2352package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2353 2544
2354our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2355 2546
2356use CFClient::OpenGL; 2547use CFClient::OpenGL;
2357 2548
… …
2359 my $class = shift; 2550 my $class = shift;
2360 2551
2361 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2362 fontsize => 1, 2553 fontsize => 1,
2363 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2364 #font => default_font 2556 #font => default_font
2365 @_, 2557 @_,
2366 2558
2367 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2368 par => [], 2560 par => [],
… …
2383 2575
2384 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2577 $self->reflow;
2386} 2578}
2387 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2388sub size_allocate { 2586sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2587 my ($self, $w, $h) = @_;
2390 2588
2391 $self->SUPER::size_allocate ($w, $h); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 2591
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2596
2397 $self->reflow; 2597 $self->reflow;
2398}
2399 2598
2400sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2401 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2402 2604
2403 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2404 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2408 2618 );
2619
2409 $layout->size 2620 $layout
2410} 2621}
2411 2622
2412sub reflow { 2623sub reflow {
2413 my ($self) = @_; 2624 my ($self) = @_;
2414 2625
… …
2423 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2424} 2635}
2425 2636
2426sub clear { 2637sub clear {
2427 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2428 2642
2429 $self->{par} = []; 2643 $self->{par} = [];
2430 $self->{height} = 0; 2644 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2646}
2433 2647
2434sub add_paragraph { 2648sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2436 2650
2437 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2652
2439 $self->{height} += $h; 2653 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2441 } 2660 };
2442 2661
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2444} 2674}
2445 2675
2446sub update { 2676sub update {
2447 my ($self) = @_; 2677 my ($self) = @_;
2448 2678
… …
2450 2680
2451 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2452 2682
2453 delete $self->{texture}; 2683 delete $self->{texture};
2454 2684
2455 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2687
2458 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2689 my $height = 0;
2460 2690
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2693 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2694 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2695
2471 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2472 } 2699 }
2473 2700
2474 $height += $_->[1]; 2701 $height += $para->{h};
2475 } 2702 }
2476 2703
2477 $self->{height} = $height; 2704 $self->{height} = $height;
2478 2705
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2707
2481 delete $self->{texture}; 2708 delete $self->{texture};
2482 } 2709 }
2483 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2716 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2487 2718
2488 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2489 2720
2490 my $y0 = $top; 2721 my $y0 = $top;
2491 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2492 2723
2493 my $y = 0; 2724 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498 2725
2499 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502 2729
2503 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2731 my $h = $para->{h};
2505 2732
2506 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2734
2508 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2509 $layout->set_markup ($par->[4]);
2510 2736
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512 2738
2513 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2515 } 2754 }
2516 2755
2517 $y += $h; 2756 $y += $h;
2518 } 2757 }
2519 2758
2520 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2521 }; 2760 };
2522 }); 2761 });
2523} 2762}
2524 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2525sub _draw { 2773sub _draw {
2526 my ($self) = @_; 2774 my ($self) = @_;
2527 2775
2528 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2533 2781
2534 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2535
2536} 2783}
2537 2784
2538############################################################################# 2785#############################################################################
2539 2786
2540package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 2874 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2875 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 2876 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 2877 . "visible $widget->{visible}";
2631 } 2878 }
2879
2880 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//;
2632 2882
2633 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2634 markup => $tooltip, 2884 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 2886 fontsize => 0.8,
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 2897
2648 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2649} 2899}
2650 2900
2651sub size_allocate { 2901sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2653 2903
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 2905}
2656 2906
2657sub visibility_change { 2907sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 2908 my ($self, $visible) = @_;
2659 2909
2660 return unless $visible; 2910 return unless $visible;
2661 2911
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 2912 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2664 or return; 2914 or return;
2665 2915
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 2917
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 2919 if $x + $self->{w} > $self->{root}{w};
2670 2920
2671 $self->move_abs ($x, $y); 2921 $self->move_abs ($x, $y);
2672 }); 2922 });
2673} 2923}
2674 2924
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 3014
2765 if ($tex) { 3015 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2771 } 3021 }
2772} 3022}
2773 3023
2774sub DESTROY { 3024sub destroy {
2775 my ($self) = @_; 3025 my ($self) = @_;
2776 3026
2777 $self->{timer}->cancel 3027 $self->{timer}->cancel
2778 if $self->{timer}; 3028 if $self->{timer};
2779 3029
2780 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2781} 3031}
2782 3032
2783############################################################################# 3033#############################################################################
2784 3034
2785package CFClient::UI::Inventory; 3035package CFClient::UI::Buttonbar;
2786 3036
2787our @ISA = CFClient::UI::ScrolledWindow::; 3037our @ISA = CFClient::UI::HBox::;
2788 3038
2789sub new { 3039# TODO: should actualyl wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 3040
2825############################################################################# 3041#############################################################################
2826 3042
2827package CFClient::UI::Menu; 3043package CFClient::UI::Menu;
2828 3044
… …
2840 ); 3056 );
2841 3057
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843 3059
2844 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2846 3062
2847 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2848 if (!ref $widget) { 3064 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2850 can_hover => 1, 3066 can_hover => 1,
2851 can_events => 1, 3067 can_events => 1,
2852 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2853 } 3070 }
2854 3071
2855 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2856 3073
2857 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
… …
2862 3079
2863# popup given the event (must be a mouse button down event currently) 3080# popup given the event (must be a mouse button down event currently)
2864sub popup { 3081sub popup {
2865 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
2866 3083
2867 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
2868 3085
2869 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3087 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2872 3089
2873 $self->show; 3090 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3092}
2876 3093
2877sub mouse_motion { 3094sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2879 3096
2880 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3100
3101 0
3102}
3103
2885sub button_up { 3104sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2887 3106
2888 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3108 undef $GRAB;
2890 $self->hide; 3109 $self->hide;
2891 3110
2892 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3113 } else {
3114 return 0
3115 }
3116
2894 } 3117 1
2895} 3118}
2896 3119
2897############################################################################# 3120#############################################################################
2898 3121
2899package CFClient::UI::Statusbox; 3122package CFClient::UI::Multiplexer;
2900 3123
2901our @ISA = CFClient::UI::VBox::; 3124our @ISA = CFClient::UI::Container::;
2902 3125
2903sub new { 3126sub new {
2904 my $class = shift; 3127 my $class = shift;
2905 3128
2906 $class->SUPER::new ( 3129 my $self = $class->SUPER::new (
3130 @_,
3131 );
3132
3133 $self->{current} = $self->{children}[0]
3134 if @{ $self->{children} };
3135
3136 $self
3137}
3138
3139sub add {
3140 my ($self, @widgets) = @_;
3141
3142 $self->SUPER::add (@widgets);
3143
3144 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} };
3146}
3147
3148sub set_current_page {
3149 my ($self, $page_or_widget) = @_;
3150
3151 my $widget = ref $page_or_widget
3152 ? $page_or_widget
3153 : $self->{children}[$page_or_widget];
3154
3155 $self->{current} = $widget;
3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3157
3158 $self->emit (page_changed => $self->{current});
3159
3160 $self->realloc;
3161}
3162
3163sub visible_children {
3164 $_[0]{current}
3165}
3166
3167sub size_request {
3168 my ($self) = @_;
3169
3170 $self->{current}->size_request
3171}
3172
3173sub invoke_size_allocate {
3174 my ($self, $w, $h) = @_;
3175
3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3179}
3180
3181sub _draw {
3182 my ($self) = @_;
3183
3184 $self->{current}->draw;
3185}
3186
3187#############################################################################
3188
3189package CFClient::UI::Notebook;
3190
3191our @ISA = CFClient::UI::VBox::;
3192
3193sub new {
3194 my $class = shift;
3195
3196 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self
3200 @_,
3201 );
3202
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3204 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3205
3206 $self
3207}
3208
3209sub add {
3210 my ($self, $title, $widget, $tooltip) = @_;
3211
3212 Scalar::Util::weaken $self;
3213
3214 $self->{buttonbar}->add (new CFClient::UI::Button
3215 markup => $title,
3216 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) },
3218 );
3219
3220 $self->{multiplexer}->add ($widget);
3221}
3222
3223sub set_current_page {
3224 my ($self, $page) = @_;
3225
3226 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current});
3228}
3229
3230#############################################################################
3231
3232package CFClient::UI::Combobox;
3233
3234use utf8;
3235
3236our @ISA = CFClient::UI::Button::;
3237
3238sub new {
3239 my $class = shift;
3240
3241 my $self = $class->SUPER::new (
3242 options => [], # [value, title, longdesc], ...
3243 value => undef,
3244 @_,
3245 );
3246
3247 $self->_set_value ($self->{value});
3248
3249 $self
3250}
3251
3252sub invoke_button_down {
3253 my ($self, $ev) = @_;
3254
3255 my @menu_items;
3256
3257 for (@{ $self->{options} }) {
3258 my ($value, $title, $tooltip) = @$_;
3259
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 }
3262
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264}
3265
3266sub _set_value {
3267 my ($self, $value) = @_;
3268
3269 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3270 or return;
3271
3272 $self->{value} = $item->[0];
3273 $self->set_markup ("$item->[1] ⇓");
3274 $self->set_tooltip ($item->[2]);
3275}
3276
3277sub set_value {
3278 my ($self, $value) = @_;
3279
3280 return unless $self->{value} ne $value;
3281
3282 $self->_set_value ($value);
3283 $self->emit (changed => $value);
3284}
3285
3286#############################################################################
3287
3288package CFClient::UI::Statusbox;
3289
3290our @ISA = CFClient::UI::VBox::;
3291
3292sub new {
3293 my $class = shift;
3294
3295 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3296 fontsize => 0.8,
2908 @_, 3297 @_,
2909 ) 3298 );
3299
3300 Scalar::Util::weaken (my $this = $self);
3301
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303
3304 $self
2910} 3305}
2911 3306
2912sub reorder { 3307sub reorder {
2913 my ($self) = @_; 3308 my ($self) = @_;
2914 my $NOW = time; 3309 my $NOW = Time::HiRes::time;
3310
3311 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} };
2915 3315
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3318 }
2919 3319
… …
2922 my @items = sort { 3322 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3323 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3324 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3325 } values %{ $self->{item} };
2926 3326
3327 $self->{timer}->interval (1);
3328
2927 my $count = 10 + 1; 3329 my $count = 10 + 1;
2928 for my $item (@items) { 3330 for my $item (@items) {
2929 last unless --$count; 3331 last unless --$count;
2930 3332
2931 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3335 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3336 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3337 : $item->{text};
2936 3338
… …
2944 tooltip => $item->{tooltip}, 3346 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3347 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3348 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3349 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3350 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3351 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3352 can_events => 1,
2951 can_hover => 1 3353 can_hover => 1
2952 }; 3354 };
3355
3356 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3357 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3358 $label->update;
3359 $label->set_max_size (undef, $label->{req_h} * $diff)
3360 if $diff < 1;
3361 $self->{timer}->interval (1/30);
3362 } else {
3363 $label->{fg}[3] = $item->{fg}[3] || 1;
3364 }
3365
3366 push @widgets, $label;
2953 } 3367 }
2954 3368
2955 $self->clear; 3369 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3370 $self->SUPER::add (reverse @widgets);
2957} 3371}
… …
2962 $text =~ s/^\s+//; 3376 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3377 $text =~ s/\s+$//;
2964 3378
2965 return unless $text; 3379 return unless $text;
2966 3380
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3381 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3382
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3383 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3384
2971 if (my $item = $self->{item}{$group}) { 3385 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3386 if ($item->{text} eq $text) {
2973 $item->{count}++; 3387 $item->{count}++;
2974 } else { 3388 } else {
2975 $item->{count} = 1; 3389 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
2977 } 3391 }
2978 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3394 delete $item->{label};
2981 } else { 3395 } else {
2982 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3397 id => ++$self->{id},
… …
3002 3416
3003 $self->reorder; 3417 $self->reorder;
3004 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
3005} 3419}
3006 3420
3421sub destroy {
3422 my ($self) = @_;
3423
3424 $self->{timer}->cancel;
3425
3426 $self->SUPER::destroy;
3427}
3428
3007############################################################################# 3429#############################################################################
3008 3430
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
3009package CFClient::UI::Root; 3803package CFClient::UI::Root;
3010 3804
3011our @ISA = CFClient::UI::Container::; 3805our @ISA = CFClient::UI::Container::;
3806
3807use List::Util qw(min max);
3012 3808
3013use CFClient::OpenGL; 3809use CFClient::OpenGL;
3014 3810
3015sub new { 3811sub new {
3016 my $class = shift; 3812 my $class = shift;
… …
3043 $coord = $max - $size if $coord > $max - $size; 3839 $coord = $max - $size if $coord > $max - $size;
3044 3840
3045 int $coord + 0.5 3841 int $coord + 0.5
3046} 3842}
3047 3843
3048sub size_allocate { 3844sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3845 my ($self, $w, $h) = @_;
3050 3846
3051 for my $child ($self->children) { 3847 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3849
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3853 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
3059 3855
3060 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3061 } 3857 }
3858
3859 1
3062} 3860}
3063 3861
3064sub coord2local { 3862sub coord2local {
3065 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3066 3864
… …
3122 $_->() 3920 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3921 for values %{delete $self->{refresh_hook}};
3124 } 3922 }
3125 3923
3126 if ($self->{realloc}) { 3924 if ($self->{realloc}) {
3925 my %queue;
3127 my @queue; 3926 my @queue;
3927 my $widget;
3128 3928
3929 outer:
3129 while () { 3930 while () {
3130 if ($self->{realloc}) { 3931 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3932 for $widget (values %$realloc) {
3933 $widget->{visible} or next; # do not resize invisible widgets
3132 3934
3133 use sort 'stable'; 3935 $queue{$widget+0}++ and next; # duplicates are common
3134 3936
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3937 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3938 }
3137 } 3939 }
3138 3940
3941 while () {
3942 @queue or last outer;
3943
3139 my $widget = pop @queue || last; 3944 $widget = pop @{ $queue[-1] || [] }
3945 and last;
3946
3947 pop @queue;
3948 }
3140 3949
3141 $widget->{visible} or last; # do not resize invisible widgets 3950 delete $queue{$widget+0};
3142 3951
3143 my ($w, $h) = $widget->size_request; 3952 my ($w, $h) = $widget->size_request;
3144 3953
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3954 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3955 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3956
3957 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3958 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3959
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3960 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3961 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3962
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3963 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 3966 $widget->{req_h} = $h;
3155 3967
3156 $self->{size_alloc}{$widget+0} = $widget; 3968 $self->{size_alloc}{$widget+0} = $widget;
3157 3969
3158 if (my $parent = $widget->{parent}) { 3970 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3971 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3972 unless $queue{$parent+0};
3973
3161 $parent->{force_size_alloc} = 1; 3974 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3975 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3976 }
3164 } 3977 }
3165 3978
… …
3181 3994
3182 $w = int $w + 0.5; 3995 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 3996 $h = int $h + 0.5;
3184 3997
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w};
4000 $widget->{old_h} = $widget->{h};
4001
3186 $widget->{w} = $w; 4002 $widget->{w} = $w;
3187 $widget->{h} = $h; 4003 $widget->{h} = $h;
3188 4004
3189 $widget->emit (size_allocate => $w, $h); 4005 $widget->emit (size_allocate => $w, $h);
3190 } 4006 }
… …
3205 glLoadIdentity; 4021 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 4023 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 4024 glLoadIdentity;
3209 4025
4026 {
4027 package CFClient::UI::Base;
4028
4029 ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h});
4031 }
4032
3210 $self->_draw; 4033 $self->_draw;
3211} 4034}
3212 4035
3213############################################################################# 4036#############################################################################
3214 4037

Diff Legend

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