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.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 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 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
88 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
89 103
90 $GRAB = $widget; 104 $GRAB = $widget;
91 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
92 106
93 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
94 } 108 }
95 109
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 111
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
99 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
188 203
189 } 204 }
190 } 205 }
191 206
192 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
193} 216}
194 217
195############################################################################# 218#############################################################################
196 219
197package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $self->{x} = List::Util::max 0, int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
333} 355}
334 356
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
338} 364}
339 365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
… …
366 392
367 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
368 } 394 }
369} 395}
370 396
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
376} 403}
377 404
378sub set_max_size { 405sub set_max_size {
379 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
380 407
381 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
382 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
383} 412}
384 413
385sub set_tooltip { 414sub set_tooltip {
386 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
387 416
… …
392 421
393 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
394 423
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
398 } 427 }
399} 428}
400 429
401# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
402sub coord2local { 431sub coord2local {
… …
410 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
411 440
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 442}
414 443
415sub focus_in { 444sub invoke_focus_in {
416 my ($self) = @_; 445 my ($self) = @_;
417 446
418 return if $FOCUS == $self; 447 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
420 449
421 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
422 451
423 $self->_emit (focus_in => $focus); 452 $self->update;
424 453
425 $focus->update if $focus; 454 0
426 $FOCUS->update;
427} 455}
428 456
429sub focus_out { 457sub invoke_focus_out {
430 my ($self) = @_; 458 my ($self) = @_;
431 459
432 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
433 461
434 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
435 463
436 $self->_emit (focus_out => $focus); 464 $self->update;
437 465
438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 467 unless $FOCUS;
442}
443 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
444sub mouse_motion { } 479sub invoke_mouse_motion { 0 }
445sub button_up { } 480sub invoke_button_up { 0 }
446sub key_down { } 481sub invoke_key_down { 0 }
447sub key_up { } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
448 484
449sub button_down { 485sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
451 487
452 $self->focus_in; 488 $self->grab_focus;
489
490 0
491}
492
493sub connect {
494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
453} 513}
454 514
455sub find_widget { 515sub find_widget {
456 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
457 517
… …
467sub set_parent { 527sub set_parent {
468 my ($self, $parent) = @_; 528 my ($self, $parent) = @_;
469 529
470 Scalar::Util::weaken ($self->{parent} = $parent); 530 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 531 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495} 532}
496 533
497sub realloc { 534sub realloc {
498 my ($self) = @_; 535 my ($self) = @_;
499 536
… …
532 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
533 570
534 # update screen rectangle 571 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539 574
540 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 578
544 glPushMatrix; 579 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 580 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 581
549 if ($self == $HOVER && $self->{can_hover}) { 582 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 584 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 586 glBegin GL_QUADS;
556 glVertex $x , $y; 587 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 588 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 589 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 590 glVertex 0 , $self->{h};
560 glEnd; 591 glEnd;
561 glDisable GL_BLEND; 592 glDisable GL_BLEND;
562 } 593 }
563 594
564 if ($ENV{CFPLUS_DEBUG} & 1) { 595 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 596 glPushMatrix;
566 glColor 1, 1, 0, 1; 597 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 598 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 599 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 600 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 601 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 602 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 603 glVertex 0 , $self->{h} - 1;
573 glEnd; 604 glEnd;
574 glPopMatrix; 605 glPopMatrix;
575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
576 } 607 }
608
609 $self->_draw;
610 glPopMatrix;
577} 611}
578 612
579sub _draw { 613sub _draw {
580 my ($self) = @_; 614 my ($self) = @_;
581 615
… …
583} 617}
584 618
585sub DESTROY { 619sub DESTROY {
586 my ($self) = @_; 620 my ($self) = @_;
587 621
622 return if CFClient::in_destruct;
623
588 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
589 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590} 628}
591 629
592############################################################################# 630#############################################################################
593 631
594package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
619 657
620 if ($color && (@$color < 4 || $color->[3])) { 658 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
622 660
623 glEnable GL_BLEND; 661 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 663 glColor_premultiply @$color;
626 664
627 glBegin GL_QUADS; 665 glBegin GL_QUADS;
628 glVertex 0 , 0; 666 glVertex 0 , 0;
629 glVertex 0 , $h; 667 glVertex 0 , $h;
630 glVertex $w, $h; 668 glVertex $w, $h;
… …
661our @ISA = CFClient::UI::Base::; 699our @ISA = CFClient::UI::Base::;
662 700
663sub new { 701sub new {
664 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
665 703
666 my $children = delete $arg{children} || []; 704 my $children = delete $arg{children};
667 705
668 my $self = $class->SUPER::new ( 706 my $self = $class->SUPER::new (
669 children => [], 707 children => [],
670 can_events => 0, 708 can_events => 0,
671 %arg, 709 %arg,
672 ); 710 );
711
673 $self->add ($_) for @$children; 712 $self->add (@$children)
713 if $children;
674 714
675 $self 715 $self
676} 716}
677 717
678sub add { 718sub add {
… …
726 $x -= $self->{x}; 766 $x -= $self->{x};
727 $y -= $self->{y}; 767 $y -= $self->{y};
728 768
729 my $res; 769 my $res;
730 770
731 for (reverse @{ $self->{children} }) { 771 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 772 $res = $_->find_widget ($x, $y)
733 and return $res; 773 and return $res;
734 } 774 }
735 775
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757} 797}
758 798
759sub add { 799sub add {
760 my ($self, $child) = @_; 800 my ($self, $child) = @_;
761 801
762 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
763
764 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
765} 804}
766 805
767sub remove { 806sub remove {
768 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
777 816
778sub size_request { 817sub size_request {
779 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
780} 819}
781 820
782sub size_allocate { 821sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
784 823
785 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
786} 827}
787 828
788############################################################################# 829#############################################################################
830
831# back-buffered drawing area
789 832
790package CFClient::UI::Window; 833package CFClient::UI::Window;
791 834
792our @ISA = CFClient::UI::Bin::; 835our @ISA = CFClient::UI::Bin::;
793 836
… …
804 847
805 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
806 $self->SUPER::update; 849 $self->SUPER::update;
807} 850}
808 851
809sub size_allocate { 852sub invoke_size_allocate {
810 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
811 854
812 $self->SUPER::size_allocate ($w, $h);
813 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
814} 858}
815 859
816sub _render { 860sub _render {
817 my ($self) = @_; 861 my ($self) = @_;
818 862
… …
845 my $tex = $self->{texture} 889 my $tex = $self->{texture}
846 or return; 890 or return;
847 891
848 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 894 glColor 0, 0, 0, 1;
851 895
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 897
854 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
855} 899}
… …
879 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
880 924
881 ($w, $h) 925 ($w, $h)
882} 926}
883 927
884sub size_allocate { 928sub invoke_size_allocate {
885 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
886 930
887 my $child = $self->child; 931 my $child = $self->child;
888 932
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891 935
892 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
893 $self->update; 937 $self->update;
938
939 1
894} 940}
895 941
896sub set_offset { 942sub set_offset {
897 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
898 944
… …
946package CFClient::UI::ScrolledWindow; 992package CFClient::UI::ScrolledWindow;
947 993
948our @ISA = CFClient::UI::HBox::; 994our @ISA = CFClient::UI::HBox::;
949 995
950sub new { 996sub new {
951 my $class = shift; 997 my ($class, %arg) = @_;
998
999 my $child = delete $arg{child};
952 1000
953 my $self; 1001 my $self;
954 1002
955 my $slider = new CFClient::UI::Slider 1003 my $slider = new CFClient::UI::Slider
956 vertical => 1, 1004 vertical => 1,
… …
959 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
960 }, 1008 },
961 ; 1009 ;
962 1010
963 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
965 slider => $slider, 1014 slider => $slider,
966 @_, 1015 %arg,
967 ); 1016 );
968 1017
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
1019 $self->add ($child) if $child;
972 1020
973 $self 1021 $self
974} 1022}
975 1023
1024#TODO# update range on size_allocate depending on child
1025
1026sub add {
1027 my ($self, $widget) = @_;
1028
1029 $self->{vp}->add ($self->{child} = $widget);
1030}
1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
976sub update { 1048sub update {
977 my ($self) = @_; 1049 my ($self) = @_;
978 1050
979 $self->SUPER::update; 1051 $self->SUPER::update;
980 1052
981 # todo: overwrite size_allocate of child 1053 $self->update_slider;
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984} 1054}
985 1055
986sub size_allocate { 1056sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
988 1058
1059 $self->update_slider;
1060
989 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1062}
994
995#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll
997 1063
998############################################################################# 1064#############################################################################
999 1065
1000package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1001 1067
… …
1017 1083
1018 if ($self->{bg}) { 1084 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
1020 1086
1021 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
1024 1090
1025 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1092 glVertex 0 , 0;
1027 glVertex 0 , $h; 1093 glVertex 0 , $h;
1028 glVertex $w, $h; 1094 glVertex $w, $h;
… …
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1119
1054sub new { 1120sub new {
1055 my ($class, %arg) = @_; 1121 my ($class, %arg) = @_;
1056 1122
1057 my $title = delete $arg{title};
1058
1059 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1126 border => 0.6,
1063 can_events => 1, 1127 can_events => 1,
1064 min_w => 16, 1128 min_w => 64,
1065 min_h => 16, 1129 min_h => 32,
1066 %arg, 1130 %arg,
1067 ); 1131 );
1068 1132
1069 $self->{title} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1070 align => 0, 1134 align => 0,
1071 valign => 1, 1135 valign => 1,
1072 text => $title, 1136 text => $self->{title},
1073 fontsize => $self->{border} 1137 fontsize => $self->{border},
1074 if defined $title; 1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
1075 1148
1076 $self 1149 $self
1077} 1150}
1078 1151
1079sub add { 1152sub add {
1080 my ($self, @widgets) = @_; 1153 my ($self, @widgets) = @_;
1081 1154
1082 $self->SUPER::add (@widgets); 1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1158}
1085 1159
1086sub border { 1160sub border {
1087 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1088} 1162}
1089 1163
1090sub size_request { 1164sub size_request {
1091 my ($self) = @_; 1165 my ($self) = @_;
1092 1166
1093 $self->{title}->size_request 1167 $self->{title_widget}->size_request
1094 if $self->{title}; 1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1095 1172
1096 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1097 1174
1098 ( 1175 (
1099 $w + $self->border * 2, 1176 $w + $self->border * 2,
1100 $h + $self->border * 2, 1177 $h + $self->border * 2,
1101 ) 1178 )
1102} 1179}
1103 1180
1104sub size_allocate { 1181sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1106 1183
1107 if ($self->{title}) { 1184 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1185 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1186 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1188 }
1112 1189
1113 my $border = $self->border; 1190 my $border = $self->border;
1114 1191
1115 $h -= List::Util::max 0, $border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1116 $w -= List::Util::max 0, $border * 2; 1193 $w -= List::Util::max 0, $border * 2;
1194
1195 $self->child->configure ($border, $border, $w, $h);
1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1117 1207
1118 $self->child->configure ($border, $border, $w, $h); 1208 1
1119} 1209}
1120 1210
1121sub button_down { 1211sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1123 1213
1124 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1215 my $border = $self->border;
1126 1216
… …
1142 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
1143 1233
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1236
1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1238 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1239 };
1150 1240
1151 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
1157 1247
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1249
1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1251 # HACK: the next line is required to enforce placement
1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1161 }; 1253 };
1254 } else {
1255 return 0;
1256 }
1257
1162 } 1258 1
1163} 1259}
1164 1260
1165sub button_up { 1261sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1167 1263
1168 delete $self->{motion}; 1264 ! ! delete $self->{motion}
1169} 1265}
1170 1266
1171sub mouse_motion { 1267sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1173 1269
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271
1272 ! ! $self->{motion}
1175} 1273}
1176 1274
1177sub _draw { 1275sub _draw {
1178 my ($self) = @_; 1276 my ($self) = @_;
1179 1277
… …
1205 1303
1206 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1207 1305
1208 $child->draw; 1306 $child->draw;
1209 1307
1210 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1213 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1214} 1317}
1215 1318
1216############################################################################# 1319#############################################################################
1217 1320
1218package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1241 1344
1242 $child->set_parent ($self); 1345 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1244 1347
1245 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1246} 1355}
1247 1356
1248# TODO: move to container class maybe? send children a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1249sub clear { 1358sub clear {
1250 my ($self) = @_; 1359 my ($self) = @_;
… …
1291 (sum @$ws), 1400 (sum @$ws),
1292 (sum @$hs), 1401 (sum @$hs),
1293 ) 1402 )
1294} 1403}
1295 1404
1296sub size_allocate { 1405sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1298 1407
1299 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1300 1409
1301 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1333 } 1442 }
1334 1443
1335 $y += $row_h; 1444 $y += $row_h;
1336 } 1445 }
1337 1446
1447 1
1338} 1448}
1339 1449
1340sub find_widget { 1450sub find_widget {
1341 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1342 1452
… …
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 ) 1491 )
1382} 1492}
1383 1493
1384sub size_allocate { 1494sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1386 1496
1387 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1389 1499
1390 my @req; 1500 my @req;
1391 1501
1392 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1394 } else { 1504 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1397 1507
1398 if ($req > $space) { 1508 if ($req > $space) {
1399 # ah well, not enough space 1509 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1401 } else { 1511 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1513
1404 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1405 1515
1406 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1517 for 0 .. $#children;
1408 } 1518 }
1409 } 1519 }
1410 1520
1411 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1412 1522
1413 my $pos = 0; 1523 my $pos = 0;
1414 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1417 1527
1418 $pos += $alloc; 1528 $pos += $alloc;
1419 } 1529 }
1420 1530
1421 1 1531 1
… …
1511 1621
1512 delete $self->{texture}; 1622 delete $self->{texture};
1513 $self->SUPER::update; 1623 $self->SUPER::update;
1514} 1624}
1515 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1516sub set_text { 1633sub set_text {
1517 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1518 1635
1519 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1521 1638
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1524 1640
1641 delete $self->{size_req};
1525 $self->realloc; 1642 $self->realloc;
1526 $self->update; 1643 $self->update;
1527} 1644}
1528 1645
1529sub set_markup { 1646sub set_markup {
… …
1532 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1533 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1534 1651
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1653
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1539 1655
1656 delete $self->{size_req};
1540 $self->realloc; 1657 $self->realloc;
1541 $self->update; 1658 $self->update;
1542} 1659}
1543 1660
1544sub size_request { 1661sub size_request {
1545 my ($self) = @_; 1662 my ($self) = @_;
1546 1663
1664 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1670
1553 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1554 1672
1555 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1556 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1677
1559 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1560 1679
1561 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1563 } 1685 };
1564 1686
1565 ($w, $h) 1687 @{ $self->{size_req} }
1566} 1688}
1567 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1568sub size_allocate { 1694sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1570 1696
1571 delete $self->{ox}; 1697 delete $self->{ox};
1572 1698
1573 delete $self->{texture} 1699 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1575} 1703}
1576 1704
1577sub set_fontsize { 1705sub set_fontsize {
1578 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1579 1707
1580 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1581 delete $self->{texture}; 1710 delete $self->{texture};
1582 1711
1583 $self->realloc; 1712 $self->realloc;
1584} 1713}
1585 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1586sub _draw { 1724sub _draw {
1587 my ($self) = @_; 1725 my ($self) = @_;
1588 1726
1589 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1590 1728
1591 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1593 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1594 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1736
1599 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1600 }; 1738 };
1601 1739
1602 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1606 1744
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1610 }; 1748 };
1611 1749
1612 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1614 1752
1615 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1616 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1621
1622 glDisable GL_TEXTURE_2D;
1623} 1754}
1624 1755
1625############################################################################# 1756#############################################################################
1626 1757
1627package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1641 can_hover => 1, 1772 can_hover => 1,
1642 can_focus => 1, 1773 can_focus => 1,
1643 valign => 0, 1774 valign => 0,
1644 can_events => 1, 1775 can_events => 1,
1645 #text => ... 1776 #text => ...
1777 #hidden => "*",
1646 @_ 1778 @_
1647 ) 1779 )
1648} 1780}
1649 1781
1650sub _set_text { 1782sub _set_text {
… …
1652 1784
1653 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1654 1786
1655 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1656 1788
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1790 $self->{text} = $text;
1661 1791
1662 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1664 1795
1665 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1666} 1800}
1667 1801
1668sub set_text { 1802sub set_text {
1669 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1670 1804
1671 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1806 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1807}
1676 1808
1677sub get_text { 1809sub get_text {
1678 $_[0]{text} 1810 $_[0]{text}
1679} 1811}
… …
1684 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1685 1817
1686 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1687} 1819}
1688 1820
1689sub key_down { 1821sub invoke_key_down {
1690 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1691 1823
1692 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1706 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1707 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1709 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1843 $self->emit ('escape');
1712 } elsif ($uni) { 1844 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else {
1847 return 0;
1714 } 1848 }
1715 1849
1716 $self->_set_text ($text); 1850 $self->_set_text ($text);
1717 1851
1718 $self->realloc; 1852 $self->realloc;
1719}
1720 1853
1854 1
1855}
1856
1721sub focus_in { 1857sub invoke_focus_in {
1722 my ($self) = @_; 1858 my ($self) = @_;
1723 1859
1724 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1725 1861
1726 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1727} 1863}
1728 1864
1729sub button_down { 1865sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1731 1867
1732 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 1869
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 1871
1736 # byte-index to char-index 1872 # byte-index to char-index
1737 my $text = $self->{text}; 1873 my $text = $self->{text};
1738 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1740 1876
1741 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1742 $self->update; 1878 $self->update;
1879
1880 1
1743} 1881}
1744 1882
1745sub mouse_motion { 1883sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1747# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1886
1887 1
1748} 1888}
1749 1889
1750sub _draw { 1890sub _draw {
1751 my ($self) = @_; 1891 my ($self) = @_;
1752 1892
1753 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1754 1894
1755 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1758 } else { 1898 } else {
1759 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1760 } 1900 }
1761 1901
1762 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1905 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1793 1933
1794our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1795 1935
1796use CFClient::OpenGL; 1936use CFClient::OpenGL;
1797 1937
1798sub key_down { 1938sub invoke_key_down {
1799 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1800 1940
1801 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1802 1942
1803 if ($sym == 13) { 1943 if ($sym == 13) {
1804 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1806 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1809 $self->update; 1950 $self->update;
1810 1951
1811 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1829 } else { 1970 } else {
1830 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1831 } 1972 }
1832 1973
1833 } else { 1974 } else {
1834 $self->SUPER::key_down ($ev); 1975 return $self->SUPER::invoke_key_down ($ev)
1976 }
1977
1835 } 1978 1
1836
1837} 1979}
1838 1980
1839############################################################################# 1981#############################################################################
1840 1982
1841package CFClient::UI::Button; 1983package CFClient::UI::Button;
… …
1862 can_events => 1, 2004 can_events => 1,
1863 @_ 2005 @_
1864 ) 2006 )
1865} 2007}
1866 2008
1867sub activate { }
1868
1869sub button_up { 2009sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1871 2011
1872 $self->emit ("activate") 2012 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
2015
2016 1
1875} 2017}
1876 2018
1877sub _draw { 2019sub _draw {
1878 my ($self) = @_; 2020 my ($self) = @_;
1879 2021
1880 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 2023
1886 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1889 2027
1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1891 2029
1892 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1893 2031
1894 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
2033}
2034
2035#############################################################################
2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
1895} 2069}
1896 2070
1897############################################################################# 2071#############################################################################
1898 2072
1899package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1926 my ($self) = @_; 2100 my ($self) = @_;
1927 2101
1928 (6) x 2 2102 (6) x 2
1929} 2103}
1930 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1931sub button_down { 2113sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1933 2115
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2118 $self->toggle;
1937 $self->_emit (changed => $self->{state}); 2119 } else {
2120 return 0
2121 }
2122
1938 } 2123 1
1939} 2124}
1940 2125
1941sub _draw { 2126sub _draw {
1942 my ($self) = @_; 2127 my ($self) = @_;
1943 2128
… …
1963package CFClient::UI::Image; 2148package CFClient::UI::Image;
1964 2149
1965our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1966 2151
1967use CFClient::OpenGL; 2152use CFClient::OpenGL;
1968use Carp qw/confess/;
1969 2153
1970our %loaded_images; 2154our %texture_cache;
1971 2155
1972sub new { 2156sub new {
1973 my $class = shift; 2157 my $class = shift;
1974 2158
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
1976 2163
1977 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
1978 2166
1979 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1980 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1981 2169
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
1983 2171
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2173
1988 $self 2174 $self
1989} 2175}
1990 2176
1991sub size_request { 2177sub size_request {
1992 my ($self) = @_; 2178 my ($self) = @_;
1993 2179
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1995} 2181}
1996 2182
1997sub _draw { 2183sub _draw {
1998 my ($self) = @_; 2184 my ($self) = @_;
1999 2185
… …
2108 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2109 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2110 2296
2111 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2112 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2113 2302
2114 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2115 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2308
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
2135 2325
2136 if ($t3) { 2326 if ($t3) {
2137 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2138 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2139 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143 glEnd; 2333 glEnd;
2144 } 2334 }
2145 2335
2146 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2234 $self->update; 2424 $self->update;
2235 2425
2236 $self 2426 $self
2237} 2427}
2238 2428
2239sub changed { }
2240
2241sub set_range { 2429sub set_range {
2242 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2243 2431
2244 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2245 2433
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2248} 2438}
2249 2439
2250sub set_value { 2440sub set_value {
2251 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2252 2442
… …
2263 if $unit; 2453 if $unit;
2264 2454
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 2456
2267 if ($value != $old_value) { 2457 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2269 $self->update; 2459 $self->update;
2270 } 2460 }
2271} 2461}
2272 2462
2273sub size_request { 2463sub size_request {
2274 my ($self) = @_; 2464 my ($self) = @_;
2275 2465
2276 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2277} 2467}
2278 2468
2279sub button_down { 2469sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2281 2471
2282 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 2473
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2475
2286 $self->mouse_motion ($ev, $x, $y); 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2287} 2477}
2288 2478
2289sub mouse_motion { 2479sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2291 2481
2292 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 2484
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2485 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2486
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2487 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2488
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2489 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2490 } else {
2491 return 0;
2492 }
2493
2300 } 2494 1
2495}
2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2301} 2505}
2302 2506
2303sub update { 2507sub update {
2304 my ($self) = @_; 2508 my ($self) = @_;
2305 2509
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2510 delete $self->{knob_w};
2511 $self->SUPER::update;
2512}
2513
2514sub _draw {
2515 my ($self) = @_;
2516
2517 unless ($self->{knob_w}) {
2307 $self->set_value ($self->{range}[0]); 2518 $self->set_value ($self->{range}[0]);
2308 2519
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2521 my $range = ($hi - $page - $lo) || 1e-100;
2311 2522
… …
2317 $value = ($value - $lo) / $range; 2528 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2529 $value = $value * $self->{scale} + $self->{offset};
2319 2530
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2532 $self->{knob_w} = $knob_w;
2322 }); 2533 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2534
2330 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2331 2536
2332 glScale $self->{w}, $self->{h}; 2537 glScale $self->{w}, $self->{h};
2333 2538
… …
2394sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2396 2601
2397############################################################################# 2602#############################################################################
2398 2603
2399package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2400 2605
2401our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2402 2607
2403use CFClient::OpenGL; 2608use CFClient::OpenGL;
2404 2609
2405sub new { 2610sub new {
2406 my $class = shift; 2611 my $class = shift;
2407 2612
2408 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2409 fontsize => 1, 2614 fontsize => 1,
2410 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2411 #font => default_font 2617 #font => default_font
2412 @_, 2618 @_,
2413 2619
2414 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2415 par => [], 2621 par => [],
2416 height => 0, 2622 height => 0,
2417 children => [ 2623 children => [
2418 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2419 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2430 2636
2431 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2432 $self->reflow; 2638 $self->reflow;
2433} 2639}
2434 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2435sub size_allocate { 2650sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2437 2652
2438 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 2655
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2443 2660
2444 $self->reflow; 2661 $self->reflow;
2445}
2446 2662
2447sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2448 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2449 2679
2450 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2451 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2454 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2455 2693 );
2694
2456 $layout->size 2695 $layout
2457} 2696}
2458 2697
2459sub reflow { 2698sub reflow {
2460 my ($self) = @_; 2699 my ($self) = @_;
2461 2700
… …
2470 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2471} 2710}
2472 2711
2473sub clear { 2712sub clear {
2474 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2475 2717
2476 $self->{par} = []; 2718 $self->{par} = [];
2477 $self->{height} = 0; 2719 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 2721}
2480 2722
2481sub add_paragraph { 2723sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2483 2725
2484 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2485 my ($w, $h) = $self->text_size ($line); 2727
2486 $self->{height} += $h; 2728 $para = {
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2488 } 2735 };
2489 2736
2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2491} 2749}
2492 2750
2493sub update { 2751sub update {
2494 my ($self) = @_; 2752 my ($self) = @_;
2495 2753
… …
2497 2755
2498 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2499 2757
2500 delete $self->{texture}; 2758 delete $self->{texture};
2501 2759
2502 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 2762
2505 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2506 my $height = 0; 2764 my $height = 0;
2507 2765
2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2514 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3]; 2770
2518 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2519 } 2774 }
2520 2775
2521 $height += $_->[1]; 2776 $height += $para->{h};
2522 } 2777 }
2523 2778
2524 $self->{height} = $height; 2779 $self->{height} = $height;
2525 2780
2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2527 2782
2528 delete $self->{texture}; 2783 delete $self->{texture};
2529 } 2784 }
2530 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2534 2793
2535 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2536 2795
2537 my $y0 = $top; 2796 my $y0 = $top;
2538 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2539 2798
2540 my $y = 0; 2799 my $y = 0;
2541 2800
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2550 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 2802 my $h = $para->{h};
2552 2803
2553 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2556 $layout->set_markup ($par->[4]);
2557 2805
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2559 2807
2560 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2562 } 2822 }
2563 2823
2564 $y += $h; 2824 $y += $h;
2565 } 2825 }
2566
2567 glDisable GL_BLEND;
2568 }; 2826 };
2569 }); 2827 });
2570} 2828}
2571 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2572sub _draw { 2839sub _draw {
2573 my ($self) = @_; 2840 my ($self) = @_;
2574 2841
2575 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2580 2847
2581 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2582
2583} 2849}
2584 2850
2585############################################################################# 2851#############################################################################
2586 2852
2587package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2678 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2679 2948
2680 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2681 markup => $tooltip, 2950 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 2963
2695 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2696} 2965}
2697 2966
2698sub size_allocate { 2967sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2700 2969
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 2971}
2703 2972
2704sub visibility_change { 2973sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2706 2975
2707 return unless $visible; 2976 return unless $visible;
2708 2977
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2711 or return; 2980 or return;
2712 2981
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 2983
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2717 2986
2718 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2719 }); 2988 });
2720} 2989}
2721 2990
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 3080
2812 if ($tex) { 3081 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2818 } 3087 }
2819} 3088}
2820 3089
2821sub DESTROY { 3090sub destroy {
2822 my ($self) = @_; 3091 my ($self) = @_;
2823 3092
2824 $self->{timer}->cancel 3093 $self->{timer}->cancel
2825 if $self->{timer}; 3094 if $self->{timer};
2826 3095
2827 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2828} 3097}
3098
3099#############################################################################
3100
3101package CFClient::UI::Buttonbar;
3102
3103our @ISA = CFClient::UI::HBox::;
3104
3105# TODO: should actualyl wrap buttons and other goodies.
2829 3106
2830############################################################################# 3107#############################################################################
2831 3108
2832package CFClient::UI::Menu; 3109package CFClient::UI::Menu;
2833 3110
… …
2845 ); 3122 );
2846 3123
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 3125
2849 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2851 3128
2852 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2853 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2854 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2855 can_hover => 1, 3146 can_hover => 1,
2856 can_events => 1, 3147 can_events => 1,
2857 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2858 } 3151 }
2859 3152
2860 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2861 3154
2862 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2867 3160
2868# popup given the event (must be a mouse button down event currently) 3161# popup given the event (must be a mouse button down event currently)
2869sub popup { 3162sub popup {
2870 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2871 3164
2872 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2873 3166
2874 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3168 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2877 3170
2878 $self->show; 3171 $self->show;
2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 3173}
2881 3174
2882sub mouse_motion { 3175sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2884 3177
2885 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3181
3182 0
3183}
3184
2890sub button_up { 3185sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2892 3187
2893 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3189 undef $GRAB;
2895 $self->hide; 3190 $self->hide;
2896 3191
2897 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
3194 } else {
3195 return 0
3196 }
3197
2899 } 3198 1
2900} 3199}
2901 3200
2902############################################################################# 3201#############################################################################
2903 3202
2904package CFClient::UI::Statusbox; 3203package CFClient::UI::Multiplexer;
2905 3204
2906our @ISA = CFClient::UI::VBox::; 3205our @ISA = CFClient::UI::Container::;
2907 3206
2908sub new { 3207sub new {
2909 my $class = shift; 3208 my $class = shift;
2910 3209
2911 $class->SUPER::new ( 3210 my $self = $class->SUPER::new (
3211 @_,
3212 );
3213
3214 $self->{current} = $self->{children}[0]
3215 if @{ $self->{children} };
3216
3217 $self
3218}
3219
3220sub add {
3221 my ($self, @widgets) = @_;
3222
3223 $self->SUPER::add (@widgets);
3224
3225 $self->{current} = $self->{children}[0]
3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
3235sub set_current_page {
3236 my ($self, $page_or_widget) = @_;
3237
3238 my $widget = ref $page_or_widget
3239 ? $page_or_widget
3240 : $self->{children}[$page_or_widget];
3241
3242 $self->{current} = $widget;
3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3244
3245 $self->emit (page_changed => $self->{current});
3246
3247 $self->realloc;
3248}
3249
3250sub visible_children {
3251 $_[0]{current}
3252}
3253
3254sub size_request {
3255 my ($self) = @_;
3256
3257 $self->{current}->size_request
3258}
3259
3260sub invoke_size_allocate {
3261 my ($self, $w, $h) = @_;
3262
3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3266}
3267
3268sub _draw {
3269 my ($self) = @_;
3270
3271 $self->{current}->draw;
3272}
3273
3274#############################################################################
3275
3276package CFClient::UI::Notebook;
3277
3278our @ISA = CFClient::UI::VBox::;
3279
3280sub new {
3281 my $class = shift;
3282
3283 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self
3287 @_,
3288 );
3289
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3291 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3292
3293 $self
3294}
3295
3296sub add {
3297 my ($self, $title, $widget, $tooltip) = @_;
3298
3299 Scalar::Util::weaken $self;
3300
3301 $self->{buttonbar}->add (new CFClient::UI::Button
3302 markup => $title,
3303 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) },
3305 );
3306
3307 $self->{multiplexer}->add ($widget);
3308}
3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3316sub set_current_page {
3317 my ($self, $page) = @_;
3318
3319 $self->{multiplexer}->set_current_page ($page);
3320 $self->emit (page_changed => $self->{multiplexer}{current});
3321}
3322
3323#############################################################################
3324
3325package CFClient::UI::Combobox;
3326
3327use utf8;
3328
3329our @ISA = CFClient::UI::Button::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3377}
3378
3379#############################################################################
3380
3381package CFClient::UI::Statusbox;
3382
3383our @ISA = CFClient::UI::VBox::;
3384
3385sub new {
3386 my $class = shift;
3387
3388 my $self = $class->SUPER::new (
2912 fontsize => 0.8, 3389 fontsize => 0.8,
2913 @_, 3390 @_,
2914 ) 3391 );
3392
3393 Scalar::Util::weaken (my $this = $self);
3394
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396
3397 $self
2915} 3398}
2916 3399
2917sub reorder { 3400sub reorder {
2918 my ($self) = @_; 3401 my ($self) = @_;
2919 my $NOW = time; 3402 my $NOW = Time::HiRes::time;
3403
3404 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} };
2920 3408
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3411 }
2924 3412
… …
2927 my @items = sort { 3415 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
2931 3419
3420 $self->{timer}->interval (1);
3421
2932 my $count = 10 + 1; 3422 my $count = 10 + 1;
2933 for my $item (@items) { 3423 for my $item (@items) {
2934 last unless --$count; 3424 last unless --$count;
2935 3425
2936 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3430 : $item->{text};
2941 3431
… …
2949 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3445 can_events => 1,
2956 can_hover => 1 3446 can_hover => 1
2957 }; 3447 };
3448
3449 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3450 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3451 $label->update;
3452 $label->set_max_size (undef, $label->{req_h} * $diff)
3453 if $diff < 1;
3454 $self->{timer}->interval (1/30);
3455 } else {
3456 $label->{fg}[3] = $item->{fg}[3] || 1;
3457 }
3458
3459 push @widgets, $label;
2958 } 3460 }
2959 3461
2960 $self->clear; 3462 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
2962} 3464}
… …
2967 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
2969 3471
2970 return unless $text; 3472 return unless $text;
2971 3473
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3475
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3477
2976 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
2978 $item->{count}++; 3480 $item->{count}++;
2979 } else { 3481 } else {
2980 $item->{count} = 1; 3482 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
2982 } 3484 }
2983 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3487 delete $item->{label};
2986 } else { 3488 } else {
2987 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
2994 count => 1, 3496 count => 1,
2995 %arg, 3497 %arg,
2996 }; 3498 };
2997 } 3499 }
2998 3500
3501 $ROOT->on_refresh (reorder => sub {
2999 $self->reorder; 3502 $self->reorder;
3503 });
3000} 3504}
3001 3505
3002sub reconfigure { 3506sub reconfigure {
3003 my ($self) = @_; 3507 my ($self) = @_;
3004 3508
… …
3007 3511
3008 $self->reorder; 3512 $self->reorder;
3009 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3010} 3514}
3011 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
3012############################################################################# 3524#############################################################################
3013 3525
3014package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3015 3527
3016our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3017 3529
3018sub new { 3530sub new {
3019 my $class = shift; 3531 my $class = shift;
3020 3532
3021 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3023 @_, 3535 @_,
3024 ); 3536 );
3025 3537
3026 $self 3538 $self
3027} 3539}
3028 3540
3029sub set_items { 3541sub set_items {
3030 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3031 3543
3032 $self->{scrolled}->clear; 3544 $self->clear;
3033 return unless $items; 3545 return unless $items;
3034 3546
3035 my @items = sort { 3547 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3038 } @$items; 3550 } values %$items;
3039 3551
3040 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3041 3553
3042 my $row = 0; 3554 my $row = 0;
3043 for my $item (@items) { 3555 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3045 3557
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3049 3561
3050 $row++; 3562 $row++;
3051 } 3563 }
3052} 3564}
3053 3565
3054############################################################################# 3566#############################################################################
3055 3567
3056package CFClient::UI::BindEditor; 3568package CFClient::UI::SpellList;
3057 3569
3058our @ISA = CFClient::UI::FancyFrame::; 3570our @ISA = CFClient::UI::Table::;
3059 3571
3060sub new { 3572sub new {
3061 my $class = shift; 3573 my $class = shift;
3062 3574
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3575 my $self = $class->SUPER::new (
3576 binding => [],
3577 commands => [],
3578 @_,
3579 )
3580}
3064 3581
3065 $self->add (my $vb = new CFClient::UI::VBox); 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3066 3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3067 3594
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3595sub rebuild_spell_list {
3069 text => "start recording", 3596 my ($self) = @_;
3070 tooltip => "Start/Stops recording of actions." 3597
3071 ."All subsequent actions after the recording started will be captured." 3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3072 ."The actions are displayed after the record was stopped." 3599 $self->clear;
3073 ."To bind the action you have to click on the 'Bind' button", 3600
3074 on_activate => sub { 3601 return unless $::CONN;
3075 unless ($self->{recording}) { 3602
3076 $self->start; 3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3077 } else { 3630 } else {
3078 $self->stop; 3631 return 0;
3632 }
3633
3634 1
3079 } 3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3080 }); 3663 }
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 }); 3664 });
3171} 3665}
3172 3666
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3180
3181 $self->clear_command_list;
3182 $self->{recording} = 0;
3183 $self->{rec_btn}->set_text ("start recording");
3184
3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
3203
3204sub update_binding_widgets {
3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell { 3667sub add_spell {
3270 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3271 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3272 3671 $self->rebuild_spell_list;
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300} 3672}
3301 3673
3302sub remove_spell { 3674sub remove_spell {
3303 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3304 delete $self->{spells}->{$spell->{name}}; 3677 delete $self->{spell}->{$spell->{name}};
3305 $self->rebuild_spell_list; 3678 $self->rebuild_spell_list;
3306} 3679}
3307 3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3308############################################################################# 3688#############################################################################
3309 3689
3310package CFClient::UI::Root; 3690package CFClient::UI::Root;
3311 3691
3312our @ISA = CFClient::UI::Container::; 3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3313 3695
3314use CFClient::OpenGL; 3696use CFClient::OpenGL;
3315 3697
3316sub new { 3698sub new {
3317 my $class = shift; 3699 my $class = shift;
… …
3344 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3345 3727
3346 int $coord + 0.5 3728 int $coord + 0.5
3347} 3729}
3348 3730
3349sub size_allocate { 3731sub invoke_size_allocate {
3350 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3351 3733
3352 for my $child ($self->children) { 3734 for my $child ($self->children) {
3353 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3354 3736
… …
3358 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3360 3742
3361 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3362 } 3744 }
3745
3746 1
3363} 3747}
3364 3748
3365sub coord2local { 3749sub coord2local {
3366 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3367 3751
… …
3452 3836
3453 delete $queue{$widget+0}; 3837 delete $queue{$widget+0};
3454 3838
3455 my ($w, $h) = $widget->size_request; 3839 my ($w, $h) = $widget->size_request;
3456 3840
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3842 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3843
3844 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3845 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3459 3846
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 3847 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 3848 $h = $widget->{force_h} if exists $widget->{force_h};
3462 3849
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3489 3876
3490 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3491 3878
3492 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3493 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3494 3887
3495 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3496 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3497 3890
3498 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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