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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.331 by root, Sun Jul 23 04:46:02 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 {
403 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
404 433
434 Carp::confess unless $self->{parent};#d#
435
405 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
406} 437}
407 438
408# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
409sub coord2global { 440sub coord2global {
410 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
411 442
412 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 443 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
413} 444}
414 445
415sub focus_in { 446sub invoke_focus_in {
416 my ($self) = @_; 447 my ($self) = @_;
417 448
418 return if $FOCUS == $self; 449 return if $FOCUS == $self;
419 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
420 451
421 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
422 453
423 $self->_emit (focus_in => $focus); 454 $self->update;
424 455
425 $focus->update if $focus; 456 0
426 $FOCUS->update;
427} 457}
428 458
429sub focus_out { 459sub invoke_focus_out {
430 my ($self) = @_; 460 my ($self) = @_;
431 461
432 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
433 463
434 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
435 465
436 $self->_emit (focus_out => $focus); 466 $self->update;
437 467
438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 469 unless $FOCUS;
442}
443 470
471 0
472}
473
474sub grab_focus {
475 my ($self) = @_;
476
477 $FOCUS->emit ("focus_out") if $FOCUS;
478 $self->emit ("focus_in");
479}
480
444sub mouse_motion { } 481sub invoke_mouse_motion { 0 }
445sub button_up { } 482sub invoke_button_up { 0 }
446sub key_down { } 483sub invoke_key_down { 0 }
447sub key_up { } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
448 486
449sub button_down { 487sub invoke_button_down {
450 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
451 489
452 $self->focus_in; 490 $self->grab_focus;
491
492 0
493}
494
495sub connect {
496 my ($self, $signal, $cb) = @_;
497
498 push @{ $self->{signal_cb}{$signal} }, $cb;
499}
500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
508sub emit {
509 my ($self, $signal, @args) = @_;
510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
518 #d##TODO# stop propagating at first true, do not use sum
519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
453} 522}
454 523
455sub find_widget { 524sub find_widget {
456 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
457 526
… …
467sub set_parent { 536sub set_parent {
468 my ($self, $parent) = @_; 537 my ($self, $parent) = @_;
469 538
470 Scalar::Util::weaken ($self->{parent} = $parent); 539 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible}; 540 $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} 541}
496 542
497sub realloc { 543sub realloc {
498 my ($self) = @_; 544 my ($self) = @_;
499 545
… …
532 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
533 579
534 # update screen rectangle 580 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539 583
540 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543 587
544 glPushMatrix; 588 glPushMatrix;
545 glTranslate $self->{x}, $self->{y}, 0; 589 glTranslate $self->{x}, $self->{y}, 0;
546 $self->_draw;
547 glPopMatrix;
548 590
549 if ($self == $HOVER && $self->{can_hover}) { 591 if ($self == $HOVER && $self->{can_hover}) {
550 my ($x, $y) = @$self{qw(x y)};
551
552 glColor 1, 0.8, 0.5, 0.2; 592 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553 glEnable GL_BLEND; 593 glEnable GL_BLEND;
554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 594 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555 glBegin GL_QUADS; 595 glBegin GL_QUADS;
556 glVertex $x , $y; 596 glVertex 0 , 0;
557 glVertex $x + $self->{w}, $y; 597 glVertex $self->{w}, 0;
558 glVertex $x + $self->{w}, $y + $self->{h}; 598 glVertex $self->{w}, $self->{h};
559 glVertex $x , $y + $self->{h}; 599 glVertex 0 , $self->{h};
560 glEnd; 600 glEnd;
561 glDisable GL_BLEND; 601 glDisable GL_BLEND;
562 } 602 }
563 603
564 if ($ENV{CFPLUS_DEBUG} & 1) { 604 if ($ENV{CFPLUS_DEBUG} & 1) {
565 glPushMatrix; 605 glPushMatrix;
566 glColor 1, 1, 0, 1; 606 glColor 1, 1, 0, 1;
567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 607 glTranslate 0.375, 0.375;
568 glBegin GL_LINE_LOOP; 608 glBegin GL_LINE_LOOP;
569 glVertex 0 , 0; 609 glVertex 0 , 0;
570 glVertex $self->{w} - 1, 0; 610 glVertex $self->{w} - 1, 0;
571 glVertex $self->{w} - 1, $self->{h} - 1; 611 glVertex $self->{w} - 1, $self->{h} - 1;
572 glVertex 0 , $self->{h} - 1; 612 glVertex 0 , $self->{h} - 1;
573 glEnd; 613 glEnd;
574 glPopMatrix; 614 glPopMatrix;
575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 615 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
576 } 616 }
617
618 $self->_draw;
619 glPopMatrix;
577} 620}
578 621
579sub _draw { 622sub _draw {
580 my ($self) = @_; 623 my ($self) = @_;
581 624
… …
583} 626}
584 627
585sub DESTROY { 628sub DESTROY {
586 my ($self) = @_; 629 my ($self) = @_;
587 630
631 return if CFClient::in_destruct;
632
588 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
589 #$self->deactivate; 634
635 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
590} 637}
591 638
592############################################################################# 639#############################################################################
593 640
594package CFClient::UI::DrawBG; 641package CFClient::UI::DrawBG;
… …
619 666
620 if ($color && (@$color < 4 || $color->[3])) { 667 if ($color && (@$color < 4 || $color->[3])) {
621 my ($w, $h) = @$self{qw(w h)}; 668 my ($w, $h) = @$self{qw(w h)};
622 669
623 glEnable GL_BLEND; 670 glEnable GL_BLEND;
624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 671 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625 glColor @$color; 672 glColor_premultiply @$color;
626 673
627 glBegin GL_QUADS; 674 glBegin GL_QUADS;
628 glVertex 0 , 0; 675 glVertex 0 , 0;
629 glVertex 0 , $h; 676 glVertex 0 , $h;
630 glVertex $w, $h; 677 glVertex $w, $h;
… …
661our @ISA = CFClient::UI::Base::; 708our @ISA = CFClient::UI::Base::;
662 709
663sub new { 710sub new {
664 my ($class, %arg) = @_; 711 my ($class, %arg) = @_;
665 712
666 my $children = delete $arg{children} || []; 713 my $children = delete $arg{children};
667 714
668 my $self = $class->SUPER::new ( 715 my $self = $class->SUPER::new (
669 children => [], 716 children => [],
670 can_events => 0, 717 can_events => 0,
671 %arg, 718 %arg,
672 ); 719 );
720
673 $self->add ($_) for @$children; 721 $self->add (@$children)
722 if $children;
674 723
675 $self 724 $self
676} 725}
677 726
678sub add { 727sub add {
… …
726 $x -= $self->{x}; 775 $x -= $self->{x};
727 $y -= $self->{y}; 776 $y -= $self->{y};
728 777
729 my $res; 778 my $res;
730 779
731 for (reverse @{ $self->{children} }) { 780 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 781 $res = $_->find_widget ($x, $y)
733 and return $res; 782 and return $res;
734 } 783 }
735 784
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 785 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757} 806}
758 807
759sub add { 808sub add {
760 my ($self, $child) = @_; 809 my ($self, $child) = @_;
761 810
762 $self->{children} = []; 811 $self->SUPER::remove ($_) for @{ $self->{children} };
763
764 $self->SUPER::add ($child); 812 $self->SUPER::add ($child);
765} 813}
766 814
767sub remove { 815sub remove {
768 my ($self, $widget) = @_; 816 my ($self, $widget) = @_;
… …
777 825
778sub size_request { 826sub size_request {
779 $_[0]{children}[0]->size_request 827 $_[0]{children}[0]->size_request
780} 828}
781 829
782sub size_allocate { 830sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 831 my ($self, $w, $h) = @_;
784 832
785 $self->{children}[0]->configure (0, 0, $w, $h); 833 $self->{children}[0]->configure (0, 0, $w, $h);
834
835 1
786} 836}
787 837
788############################################################################# 838#############################################################################
839
840# back-buffered drawing area
789 841
790package CFClient::UI::Window; 842package CFClient::UI::Window;
791 843
792our @ISA = CFClient::UI::Bin::; 844our @ISA = CFClient::UI::Bin::;
793 845
… …
804 856
805 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 857 $ROOT->on_post_alloc ($self => sub { $self->render_child });
806 $self->SUPER::update; 858 $self->SUPER::update;
807} 859}
808 860
809sub size_allocate { 861sub invoke_size_allocate {
810 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
811 863
812 $self->SUPER::size_allocate ($w, $h);
813 $self->update; 864 $self->update;
865
866 $self->SUPER::invoke_size_allocate ($w, $h)
814} 867}
815 868
816sub _render { 869sub _render {
817 my ($self) = @_; 870 my ($self) = @_;
818 871
… …
845 my $tex = $self->{texture} 898 my $tex = $self->{texture}
846 or return; 899 or return;
847 900
848 glEnable GL_TEXTURE_2D; 901 glEnable GL_TEXTURE_2D;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 902 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850 glColor 1, 1, 1, 1; 903 glColor 0, 0, 0, 1;
851 904
852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 905 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853 906
854 glDisable GL_TEXTURE_2D; 907 glDisable GL_TEXTURE_2D;
855} 908}
… …
879 $h = 10 if $self->{scroll_y}; 932 $h = 10 if $self->{scroll_y};
880 933
881 ($w, $h) 934 ($w, $h)
882} 935}
883 936
884sub size_allocate { 937sub invoke_size_allocate {
885 my ($self, $w, $h) = @_; 938 my ($self, $w, $h) = @_;
886 939
887 my $child = $self->child; 940 my $child = $self->child;
888 941
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 942 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 943 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891 944
892 $self->child->configure (0, 0, $w, $h); 945 $self->child->configure (0, 0, $w, $h);
893 $self->update; 946 $self->update;
947
948 1
894} 949}
895 950
896sub set_offset { 951sub set_offset {
897 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
898 953
… …
946package CFClient::UI::ScrolledWindow; 1001package CFClient::UI::ScrolledWindow;
947 1002
948our @ISA = CFClient::UI::HBox::; 1003our @ISA = CFClient::UI::HBox::;
949 1004
950sub new { 1005sub new {
951 my $class = shift; 1006 my ($class, %arg) = @_;
1007
1008 my $child = delete $arg{child};
952 1009
953 my $self; 1010 my $self;
954 1011
955 my $slider = new CFClient::UI::Slider 1012 my $slider = new CFClient::UI::Slider
956 vertical => 1, 1013 vertical => 1,
… …
959 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
960 }, 1017 },
961 ; 1018 ;
962 1019
963 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
965 slider => $slider, 1023 slider => $slider,
966 @_, 1024 %arg,
967 ); 1025 );
968 1026
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
1028 $self->add ($child) if $child;
972 1029
973 $self 1030 $self
974} 1031}
975 1032
1033#TODO# update range on size_allocate depending on child
1034
1035sub add {
1036 my ($self, $widget) = @_;
1037
1038 $self->{vp}->add ($self->{child} = $widget);
1039}
1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
976sub update { 1057sub update {
977 my ($self) = @_; 1058 my ($self) = @_;
978 1059
979 $self->SUPER::update; 1060 $self->SUPER::update;
980 1061
981 # todo: overwrite size_allocate of child 1062 $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} 1063}
985 1064
986sub size_allocate { 1065sub invoke_size_allocate {
987 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
988 1067
1068 $self->update_slider;
1069
989 $self->SUPER::size_allocate ($w, $h); 1070 $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} 1071}
994
995#TODO# update range on size_allocate depending on child
996# update viewport offset on scroll
997 1072
998############################################################################# 1073#############################################################################
999 1074
1000package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1001 1076
… …
1017 1092
1018 if ($self->{bg}) { 1093 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)}; 1094 my ($w, $h) = @$self{qw(w h)};
1020 1095
1021 glEnable GL_BLEND; 1096 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1097 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} }; 1098 glColor_premultiply @{ $self->{bg} };
1024 1099
1025 glBegin GL_QUADS; 1100 glBegin GL_QUADS;
1026 glVertex 0 , 0; 1101 glVertex 0 , 0;
1027 glVertex 0 , $h; 1102 glVertex 0 , $h;
1028 glVertex $w, $h; 1103 glVertex $w, $h;
… …
1050my @border = 1125my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1126 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1127 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1128
1054sub new { 1129sub new {
1055 my $class = shift; 1130 my ($class, %arg) = @_;
1056 1131
1057 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1058 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1059 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1060 border => 0.6, 1135 border => 0.6,
1061 can_events => 1, 1136 can_events => 1,
1062 min_w => 16, 1137 min_w => 64,
1063 min_h => 16, 1138 min_h => 32,
1064 @_ 1139 %arg,
1065 ); 1140 );
1066 1141
1067 $self->{title} &&= new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1068 align => 0, 1143 align => 0,
1069 valign => 1, 1144 valign => 1,
1070 text => $self->{title}, 1145 text => $self->{title},
1071 fontsize => $self->{border}; 1146 fontsize => $self->{border},
1147 if exists $self->{title};
1148
1149 if ($self->{has_close_button}) {
1150 $self->{close_button} =
1151 new CFClient::UI::ImageButton
1152 path => 'x1_close.png',
1153 on_activate => sub { $self->emit ("delete") };
1154
1155 $self->CFClient::UI::Container::add ($self->{close_button});
1156 }
1072 1157
1073 $self 1158 $self
1159}
1160
1161sub add {
1162 my ($self, @widgets) = @_;
1163
1164 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1074} 1167}
1075 1168
1076sub border { 1169sub border {
1077 int $_[0]{border} * $::FONTSIZE 1170 int $_[0]{border} * $::FONTSIZE
1078} 1171}
1079 1172
1080sub size_request { 1173sub size_request {
1081 my ($self) = @_; 1174 my ($self) = @_;
1175
1176 $self->{title_widget}->size_request
1177 if $self->{title_widget};
1178
1179 $self->{close_button}->size_request
1180 if $self->{close_button};
1082 1181
1083 my ($w, $h) = $self->SUPER::size_request; 1182 my ($w, $h) = $self->SUPER::size_request;
1084 1183
1085 ( 1184 (
1086 $w + $self->border * 2, 1185 $w + $self->border * 2,
1087 $h + $self->border * 2, 1186 $h + $self->border * 2,
1088 ) 1187 )
1089} 1188}
1090 1189
1091sub size_allocate { 1190sub invoke_size_allocate {
1092 my ($self, $w, $h) = @_; 1191 my ($self, $w, $h) = @_;
1093 1192
1193 if ($self->{title_widget}) {
1194 $self->{title_widget}{w} = $w;
1195 $self->{title_widget}{h} = $h;
1196 $self->{title_widget}->invoke_size_allocate ($w, $h);
1197 }
1198
1199 my $border = $self->border;
1200
1094 $h -= List::Util::max 0, $self->border * 2; 1201 $h -= List::Util::max 0, $border * 2;
1095 $w -= List::Util::max 0, $self->border * 2; 1202 $w -= List::Util::max 0, $border * 2;
1096 1203
1097 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1098 if $self->{title};
1099
1100 $self->child->configure ($self->border, $self->border, $w, $h); 1204 $self->child->configure ($border, $border, $w, $h);
1101}
1102 1205
1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1207 if $self->{close_button};
1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1216
1217 1
1218}
1219
1103sub button_down { 1220sub invoke_button_down {
1104 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1105 1222
1106 my ($w, $h) = @$self{qw(w h)}; 1223 my ($w, $h) = @$self{qw(w h)};
1107 my $border = $self->border; 1224 my $border = $self->border;
1108 1225
… …
1124 my $dy = $ev->{y} - $oy; 1241 my $dy = $ev->{y} - $oy;
1125 1242
1126 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1243 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1127 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1244 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128 1245
1246 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129 $self->realloc; 1247 $self->realloc;
1130 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1131 }; 1248 };
1132 1249
1133 } elsif ($lr ^ $td) { 1250 } elsif ($lr ^ $td) {
1134 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1251 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1135 my ($bx, $by) = ($self->{x}, $self->{y}); 1252 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1138 my ($ev, $x, $y) = @_; 1255 my ($ev, $x, $y) = @_;
1139 1256
1140 ($x, $y) = ($ev->{x}, $ev->{y}); 1257 ($x, $y) = ($ev->{x}, $ev->{y});
1141 1258
1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1259 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1260 # HACK: the next line is required to enforce placement
1261 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1143 }; 1262 };
1263 } else {
1264 return 0;
1265 }
1266
1144 } 1267 1
1145} 1268}
1146 1269
1147sub button_up { 1270sub invoke_button_up {
1148 my ($self, $ev, $x, $y) = @_; 1271 my ($self, $ev, $x, $y) = @_;
1149 1272
1150 delete $self->{motion}; 1273 ! ! delete $self->{motion}
1151} 1274}
1152 1275
1153sub mouse_motion { 1276sub invoke_mouse_motion {
1154 my ($self, $ev, $x, $y) = @_; 1277 my ($self, $ev, $x, $y) = @_;
1155 1278
1156 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1279 $self->{motion}->($ev, $x, $y) if $self->{motion};
1280
1281 ! ! $self->{motion}
1157} 1282}
1158 1283
1159sub _draw { 1284sub _draw {
1160 my ($self) = @_; 1285 my ($self) = @_;
1161 1286
1287 my $child = $self->{children}[0];
1288
1162 my ($w, $h ) = ($self->{w}, $self->{h}); 1289 my ($w, $h ) = ($self->{w}, $self->{h});
1163 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1290 my ($cw, $ch) = ($child->{w}, $child->{h});
1164 1291
1165 glEnable GL_TEXTURE_2D; 1292 glEnable GL_TEXTURE_2D;
1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1167 1294
1168 my $border = $self->border; 1295 my $border = $self->border;
… …
1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1310 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184 } 1311 }
1185 1312
1186 glDisable GL_TEXTURE_2D; 1313 glDisable GL_TEXTURE_2D;
1187 1314
1188 $self->{title}->draw if $self->{title};
1189
1190 $self->child->draw; 1315 $child->draw;
1316
1317 if ($self->{title_widget}) {
1318 glTranslate 0, $border - $self->{h};
1319 $self->{title_widget}->_draw;
1320
1321 glTranslate 0, - ($border - $self->{h});
1322 }
1323
1324 $self->{close_button}->draw
1325 if $self->{close_button};
1191} 1326}
1192 1327
1193############################################################################# 1328#############################################################################
1194 1329
1195package CFClient::UI::Table; 1330package CFClient::UI::Table;
… …
1218 1353
1219 $child->set_parent ($self); 1354 $child->set_parent ($self);
1220 $self->{children}[$y][$x] = $child; 1355 $self->{children}[$y][$x] = $child;
1221 1356
1222 $self->realloc; 1357 $self->realloc;
1358}
1359
1360sub remove {
1361 my ($self, $child) = @_;
1362
1363 # TODO: not yet implemented
1223} 1364}
1224 1365
1225# TODO: move to container class maybe? send children a signal on removal? 1366# TODO: move to container class maybe? send children a signal on removal?
1226sub clear { 1367sub clear {
1227 my ($self) = @_; 1368 my ($self) = @_;
… …
1268 (sum @$ws), 1409 (sum @$ws),
1269 (sum @$hs), 1410 (sum @$hs),
1270 ) 1411 )
1271} 1412}
1272 1413
1273sub size_allocate { 1414sub invoke_size_allocate {
1274 my ($self, $w, $h) = @_; 1415 my ($self, $w, $h) = @_;
1275 1416
1276 my ($ws, $hs) = $self->get_wh; 1417 my ($ws, $hs) = $self->get_wh;
1277 1418
1278 my $req_w = (sum @$ws) || 1; 1419 my $req_w = (sum @$ws) || 1;
… …
1310 } 1451 }
1311 1452
1312 $y += $row_h; 1453 $y += $row_h;
1313 } 1454 }
1314 1455
1456 1
1315} 1457}
1316 1458
1317sub find_widget { 1459sub find_widget {
1318 my ($self, $x, $y) = @_; 1460 my ($self, $x, $y) = @_;
1319 1461
… …
1356 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1498 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1499 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1358 ) 1500 )
1359} 1501}
1360 1502
1361sub size_allocate { 1503sub invoke_size_allocate {
1362 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1363 1505
1364 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1365 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1366 1508
1367 my @req; 1509 my @req;
1368 1510
1369 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1370 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1371 } else { 1513 } else {
1372 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1373 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1374 1516
1375 if ($req > $space) { 1517 if ($req > $space) {
1376 # ah well, not enough space 1518 # ah well, not enough space
1377 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1378 } else { 1520 } else {
1379 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1380 1522
1381 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1382 1524
1383 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1384 for 0 .. $#$children; 1526 for 0 .. $#children;
1385 } 1527 }
1386 } 1528 }
1387 1529
1388 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1389 1531
1390 my $pos = 0; 1532 my $pos = 0;
1391 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1392 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1393 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1394 1536
1395 $pos += $alloc; 1537 $pos += $alloc;
1396 } 1538 }
1397 1539
1398 1 1540 1
… …
1488 1630
1489 delete $self->{texture}; 1631 delete $self->{texture};
1490 $self->SUPER::update; 1632 $self->SUPER::update;
1491} 1633}
1492 1634
1635sub realloc {
1636 my ($self) = @_;
1637
1638 delete $self->{ox};
1639 $self->SUPER::realloc;
1640}
1641
1493sub set_text { 1642sub set_text {
1494 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1495 1644
1496 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1497 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1498 1647
1499 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1500 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1501 1649
1650 delete $self->{size_req};
1502 $self->realloc; 1651 $self->realloc;
1503 $self->update; 1652 $self->update;
1504} 1653}
1505 1654
1506sub set_markup { 1655sub set_markup {
… …
1509 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1510 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1511 1660
1512 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513 1662
1514 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1515 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1516 1664
1665 delete $self->{size_req};
1517 $self->realloc; 1666 $self->realloc;
1518 $self->update; 1667 $self->update;
1519} 1668}
1520 1669
1521sub size_request { 1670sub size_request {
1522 my ($self) = @_; 1671 my ($self) = @_;
1523 1672
1673 $self->{size_req} ||= do {
1524 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1674 $self->{layout}->set_font ($self->{font}) if $self->{font};
1525 $self->{layout}->set_width ($self->{max_w} || -1); 1675 $self->{layout}->set_width ($self->{max_w} || -1);
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1676 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1677 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1678 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1679
1530 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1531 1681
1532 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1533 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1534 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1535 1686
1536 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1537 1688
1538 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
1539 $h = List::Util::max $h, $h2; 1690 $h = List::Util::max $h, $h2;
1691 }
1692
1693 [$w, $h]
1540 } 1694 };
1541 1695
1542 ($w, $h) 1696 @{ $self->{size_req} }
1543} 1697}
1544 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1545sub size_allocate { 1703sub invoke_size_allocate {
1546 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1705
1706 delete $self->{ox};
1547 1707
1548 delete $self->{texture} 1708 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1709 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1710
1711 1
1550} 1712}
1551 1713
1552sub set_fontsize { 1714sub set_fontsize {
1553 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1554 1716
1555 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1556 delete $self->{texture}; 1719 delete $self->{texture};
1557 1720
1558 $self->realloc; 1721 $self->realloc;
1559} 1722}
1560 1723
1724sub reconfigure {
1725 my ($self) = @_;
1726
1727 delete $self->{size_req};
1728 delete $self->{texture};
1729
1730 $self->SUPER::reconfigure;
1731}
1732
1561sub _draw { 1733sub _draw {
1562 my ($self) = @_; 1734 my ($self) = @_;
1563 1735
1564 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1565 1737
1566 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1567 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1568 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1569 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1570 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1745
1574 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1746 [$self->{layout}->size]
1747 };
1575 1748
1749 unless (exists $self->{ox}) {
1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1578 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1579 1753
1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1582 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1583
1584 $tex
1585 }; 1757 };
1586 1758
1587 glEnable GL_TEXTURE_2D; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1588 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1589 1761
1590 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1591 glColor @{$self->{fg}};
1592 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1593 } else {
1594 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1595 }
1596
1597 glDisable GL_TEXTURE_2D;
1598} 1763}
1599 1764
1600############################################################################# 1765#############################################################################
1601 1766
1602package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1616 can_hover => 1, 1781 can_hover => 1,
1617 can_focus => 1, 1782 can_focus => 1,
1618 valign => 0, 1783 valign => 0,
1619 can_events => 1, 1784 can_events => 1,
1620 #text => ... 1785 #text => ...
1786 #hidden => "*",
1621 @_ 1787 @_
1622 ) 1788 )
1623} 1789}
1624 1790
1625sub _set_text { 1791sub _set_text {
… …
1627 1793
1628 delete $self->{cur_h}; 1794 delete $self->{cur_h};
1629 1795
1630 return if $self->{text} eq $text; 1796 return if $self->{text} eq $text;
1631 1797
1632 delete $self->{texture};
1633
1634 $self->{last_activity} = $::NOW; 1798 $self->{last_activity} = $::NOW;
1635 $self->{text} = $text; 1799 $self->{text} = $text;
1636 1800
1637 $text =~ s/./*/g if $self->{hidden}; 1801 $text =~ s/./*/g if $self->{hidden};
1638 $self->{layout}->set_text ("$text "); 1802 $self->{layout}->set_text ("$text ");
1803 delete $self->{size_req};
1639 1804
1640 $self->_emit (changed => $self->{text}); 1805 $self->emit (changed => $self->{text});
1806
1807 $self->realloc;
1808 $self->update;
1641} 1809}
1642 1810
1643sub set_text { 1811sub set_text {
1644 my ($self, $text) = @_; 1812 my ($self, $text) = @_;
1645 1813
1646 $self->{cursor} = length $text; 1814 $self->{cursor} = length $text;
1647 $self->_set_text ($text); 1815 $self->_set_text ($text);
1648
1649 $self->realloc;
1650} 1816}
1651 1817
1652sub get_text { 1818sub get_text {
1653 $_[0]{text} 1819 $_[0]{text}
1654} 1820}
… …
1659 my ($w, $h) = $self->SUPER::size_request; 1825 my ($w, $h) = $self->SUPER::size_request;
1660 1826
1661 ($w + 1, $h) # add 1 for cursor 1827 ($w + 1, $h) # add 1 for cursor
1662} 1828}
1663 1829
1664sub key_down { 1830sub invoke_key_down {
1665 my ($self, $ev) = @_; 1831 my ($self, $ev) = @_;
1666 1832
1667 my $mod = $ev->{mod}; 1833 my $mod = $ev->{mod};
1668 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1669 my $uni = $ev->{unicode}; 1835 my $uni = $ev->{unicode};
… …
1681 } elsif ($sym == CFClient::SDLK_HOME) { 1847 } elsif ($sym == CFClient::SDLK_HOME) {
1682 $self->{cursor} = 0; 1848 $self->{cursor} = 0;
1683 } elsif ($sym == CFClient::SDLK_END) { 1849 } elsif ($sym == CFClient::SDLK_END) {
1684 $self->{cursor} = length $text; 1850 $self->{cursor} = length $text;
1685 } elsif ($uni == 27) { 1851 } elsif ($uni == 27) {
1686 $self->_emit ('escape'); 1852 $self->emit ('escape');
1687 } elsif ($uni) { 1853 } elsif ($uni) {
1688 substr $text, $self->{cursor}++, 0, chr $uni; 1854 substr $text, $self->{cursor}++, 0, chr $uni;
1855 } else {
1856 return 0;
1689 } 1857 }
1690 1858
1691 $self->_set_text ($text); 1859 $self->_set_text ($text);
1692 1860
1693 $self->realloc; 1861 $self->realloc;
1694}
1695 1862
1863 1
1864}
1865
1696sub focus_in { 1866sub invoke_focus_in {
1697 my ($self) = @_; 1867 my ($self) = @_;
1698 1868
1699 $self->{last_activity} = $::NOW; 1869 $self->{last_activity} = $::NOW;
1700 1870
1701 $self->SUPER::focus_in; 1871 $self->SUPER::invoke_focus_in
1702} 1872}
1703 1873
1704sub button_down { 1874sub invoke_button_down {
1705 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1706 1876
1707 $self->SUPER::button_down ($ev, $x, $y); 1877 $self->SUPER::invoke_button_down ($ev, $x, $y);
1708 1878
1709 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1710 1880
1711 # byte-index to char-index 1881 # byte-index to char-index
1712 my $text = $self->{text}; 1882 my $text = $self->{text};
1713 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1714 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1715 1885
1716 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1717 $self->update; 1887 $self->update;
1888
1889 1
1718} 1890}
1719 1891
1720sub mouse_motion { 1892sub invoke_mouse_motion {
1721 my ($self, $ev, $x, $y) = @_; 1893 my ($self, $ev, $x, $y) = @_;
1722# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1894# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1895
1896 1
1723} 1897}
1724 1898
1725sub _draw { 1899sub _draw {
1726 my ($self) = @_; 1900 my ($self) = @_;
1727 1901
1728 local $self->{fg} = $self->{fg}; 1902 local $self->{fg} = $self->{fg};
1729 1903
1730 if ($FOCUS == $self) { 1904 if ($FOCUS == $self) {
1731 glColor @{$self->{active_bg}}; 1905 glColor_premultiply @{$self->{active_bg}};
1732 $self->{fg} = $self->{active_fg}; 1906 $self->{fg} = $self->{active_fg};
1733 } else { 1907 } else {
1734 glColor @{$self->{bg}}; 1908 glColor_premultiply @{$self->{bg}};
1735 } 1909 }
1736 1910
1737 glEnable GL_BLEND; 1911 glEnable GL_BLEND;
1738 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1912 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1739 glBegin GL_QUADS; 1913 glBegin GL_QUADS;
1740 glVertex 0 , 0; 1914 glVertex 0 , 0;
1741 glVertex 0 , $self->{h}; 1915 glVertex 0 , $self->{h};
1742 glVertex $self->{w}, $self->{h}; 1916 glVertex $self->{w}, $self->{h};
1743 glVertex $self->{w}, 0; 1917 glVertex $self->{w}, 0;
… …
1768 1942
1769our @ISA = CFClient::UI::EntryBase::; 1943our @ISA = CFClient::UI::EntryBase::;
1770 1944
1771use CFClient::OpenGL; 1945use CFClient::OpenGL;
1772 1946
1773sub key_down { 1947sub invoke_key_down {
1774 my ($self, $ev) = @_; 1948 my ($self, $ev) = @_;
1775 1949
1776 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1777 1951
1778 if ($sym == 13) { 1952 if ($sym == 13) {
1779 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1780 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1781 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1782 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1783 $self->_emit (activate => $txt); 1958 $self->emit (activate => $txt);
1784 $self->update; 1959 $self->update;
1785 1960
1786 } elsif ($sym == CFClient::SDLK_UP) { 1961 } elsif ($sym == CFClient::SDLK_UP) {
1787 if ($self->{history_pointer} < 0) { 1962 if ($self->{history_pointer} < 0) {
1788 $self->{history_saveback} = $self->get_text; 1963 $self->{history_saveback} = $self->get_text;
… …
1804 } else { 1979 } else {
1805 $self->set_text ($self->{history_saveback}); 1980 $self->set_text ($self->{history_saveback});
1806 } 1981 }
1807 1982
1808 } else { 1983 } else {
1809 $self->SUPER::key_down ($ev); 1984 return $self->SUPER::invoke_key_down ($ev)
1985 }
1986
1810 } 1987 1
1811
1812} 1988}
1813 1989
1814############################################################################# 1990#############################################################################
1815 1991
1816package CFClient::UI::Button; 1992package CFClient::UI::Button;
… …
1837 can_events => 1, 2013 can_events => 1,
1838 @_ 2014 @_
1839 ) 2015 )
1840} 2016}
1841 2017
1842sub activate { }
1843
1844sub button_up { 2018sub invoke_button_up {
1845 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
1846 2020
1847 $self->emit ("activate") 2021 $self->emit ("activate")
1848 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
1849 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1850} 2026}
1851 2027
1852sub _draw { 2028sub _draw {
1853 my ($self) = @_; 2029 my ($self) = @_;
1854 2030
1855 local $self->{fg} = $self->{fg}; 2031 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1856
1857 if ($GRAB == $self) {
1858 $self->{fg} = $self->{active_fg};
1859 }
1860 2032
1861 glEnable GL_TEXTURE_2D; 2033 glEnable GL_TEXTURE_2D;
1862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1863 glColor 0, 0, 0, 1; 2035 glColor 0, 0, 0, 1;
1864 2036
1865 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1866 2038
1867 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1868 2040
1869 $self->SUPER::_draw; 2041 $self->SUPER::_draw;
2042}
2043
2044#############################################################################
2045
2046package CFClient::UI::ImageButton;
2047
2048our @ISA = CFClient::UI::Image::;
2049
2050use CFClient::OpenGL;
2051
2052my %textures;
2053
2054sub new {
2055 my $class = shift;
2056
2057 my $self = $class->SUPER::new (
2058 padding_x => 4,
2059 padding_y => 4,
2060 fg => [1, 1, 1],
2061 active_fg => [0, 0, 1],
2062 can_hover => 1,
2063 align => 0,
2064 valign => 0,
2065 can_events => 1,
2066 @_
2067 );
2068}
2069
2070sub invoke_button_up {
2071 my ($self, $ev, $x, $y) = @_;
2072
2073 $self->emit ("activate")
2074 if $x >= 0 && $x < $self->{w}
2075 && $y >= 0 && $y < $self->{h};
2076
2077 1
1870} 2078}
1871 2079
1872############################################################################# 2080#############################################################################
1873 2081
1874package CFClient::UI::CheckBox; 2082package CFClient::UI::CheckBox;
… …
1901 my ($self) = @_; 2109 my ($self) = @_;
1902 2110
1903 (6) x 2 2111 (6) x 2
1904} 2112}
1905 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
1906sub button_down { 2122sub invoke_button_down {
1907 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
1908 2124
1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1911 $self->{state} = !$self->{state}; 2127 $self->toggle;
1912 $self->_emit (changed => $self->{state}); 2128 } else {
2129 return 0
2130 }
2131
1913 } 2132 1
1914} 2133}
1915 2134
1916sub _draw { 2135sub _draw {
1917 my ($self) = @_; 2136 my ($self) = @_;
1918 2137
… …
1938package CFClient::UI::Image; 2157package CFClient::UI::Image;
1939 2158
1940our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
1941 2160
1942use CFClient::OpenGL; 2161use CFClient::OpenGL;
1943use Carp qw/confess/;
1944 2162
1945our %loaded_images; 2163our %texture_cache;
1946 2164
1947sub new { 2165sub new {
1948 my $class = shift; 2166 my $class = shift;
1949 2167
1950 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
1951 2172
1952 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2173 $self->{path} || $self->{tex}
2174 or Carp::croak "'path' or 'tex' attributes required";
1953 2175
1954 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1955 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1956 2178
1957 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
1958 2180
1959 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1960
1961 $self->{aspect} = $tex->{w} / $tex->{h};
1962 2182
1963 $self 2183 $self
1964} 2184}
1965 2185
1966sub size_request { 2186sub size_request {
1967 my ($self) = @_; 2187 my ($self) = @_;
1968 2188
1969 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
1970} 2190}
1971 2191
1972sub _draw { 2192sub _draw {
1973 my ($self) = @_; 2193 my ($self) = @_;
1974 2194
… …
2083 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2084 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2085 2305
2086 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2087 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2088 2311
2089 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2090 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2091 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
2092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2093 2317
2094 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2318 glBindTexture GL_TEXTURE_2D, $t1->{name};
2095 glBegin GL_QUADS; 2319 glBegin GL_QUADS;
… …
2110 2334
2111 if ($t3) { 2335 if ($t3) {
2112 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2113 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2114 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2115 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2116 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2117 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2118 glEnd; 2342 glEnd;
2119 } 2343 }
2120 2344
2121 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2209 $self->update; 2433 $self->update;
2210 2434
2211 $self 2435 $self
2212} 2436}
2213 2437
2214sub changed { }
2215
2216sub set_range { 2438sub set_range {
2217 my ($self, $range) = @_; 2439 my ($self, $range) = @_;
2218 2440
2219 ($range, $self->{range}) = ($self->{range}, $range); 2441 ($range, $self->{range}) = ($self->{range}, $range);
2220 2442
2221 $self->update
2222 if "@$range" ne "@{$self->{range}}"; 2443 if ("@$range" ne "@{$self->{range}}") {
2444 $self->update;
2445 $self->set_value ($self->{range}[0]);
2446 }
2223} 2447}
2224 2448
2225sub set_value { 2449sub set_value {
2226 my ($self, $value) = @_; 2450 my ($self, $value) = @_;
2227 2451
… …
2238 if $unit; 2462 if $unit;
2239 2463
2240 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2464 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2241 2465
2242 if ($value != $old_value) { 2466 if ($value != $old_value) {
2243 $self->_emit (changed => $value); 2467 $self->emit (changed => $value);
2244 $self->update; 2468 $self->update;
2245 } 2469 }
2246} 2470}
2247 2471
2248sub size_request { 2472sub size_request {
2249 my ($self) = @_; 2473 my ($self) = @_;
2250 2474
2251 ($self->{req_w}, $self->{req_h}) 2475 ($self->{req_w}, $self->{req_h})
2252} 2476}
2253 2477
2254sub button_down { 2478sub invoke_button_down {
2255 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2256 2480
2257 $self->SUPER::button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2258 2482
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260 2484
2261 $self->mouse_motion ($ev, $x, $y); 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2262} 2486}
2263 2487
2264sub mouse_motion { 2488sub invoke_mouse_motion {
2265 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2266 2490
2267 if ($GRAB == $self) { 2491 if ($GRAB == $self) {
2268 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2492 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2269 2493
2270 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2494 my (undef, $lo, $hi, $page) = @{$self->{range}};
2271 2495
2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2496 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273 2497
2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2498 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2499 } else {
2500 return 0;
2501 }
2502
2275 } 2503 1
2504}
2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2276} 2514}
2277 2515
2278sub update { 2516sub update {
2279 my ($self) = @_; 2517 my ($self) = @_;
2280 2518
2281 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2519 delete $self->{knob_w};
2520 $self->SUPER::update;
2521}
2522
2523sub _draw {
2524 my ($self) = @_;
2525
2526 unless ($self->{knob_w}) {
2282 $self->set_value ($self->{range}[0]); 2527 $self->set_value ($self->{range}[0]);
2283 2528
2284 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2529 my ($value, $lo, $hi, $page) = @{$self->{range}};
2285 my $range = ($hi - $page - $lo) || 1e-100; 2530 my $range = ($hi - $page - $lo) || 1e-100;
2286 2531
… …
2292 $value = ($value - $lo) / $range; 2537 $value = ($value - $lo) / $range;
2293 $value = $value * $self->{scale} + $self->{offset}; 2538 $value = $value * $self->{scale} + $self->{offset};
2294 2539
2295 $self->{knob_x} = $value - $knob_w * 0.5; 2540 $self->{knob_x} = $value - $knob_w * 0.5;
2296 $self->{knob_w} = $knob_w; 2541 $self->{knob_w} = $knob_w;
2297 }); 2542 }
2298
2299 $self->SUPER::update;
2300}
2301
2302sub _draw {
2303 my ($self) = @_;
2304 2543
2305 $self->SUPER::_draw (); 2544 $self->SUPER::_draw ();
2306 2545
2307 glScale $self->{w}, $self->{h}; 2546 glScale $self->{w}, $self->{h};
2308 2547
… …
2369sub set_range { shift->{slider}->set_range (@_) } 2608sub set_range { shift->{slider}->set_range (@_) }
2370sub set_value { shift->{slider}->set_value (@_) } 2609sub set_value { shift->{slider}->set_value (@_) }
2371 2610
2372############################################################################# 2611#############################################################################
2373 2612
2374package CFClient::UI::TextView; 2613package CFClient::UI::TextScroller;
2375 2614
2376our @ISA = CFClient::UI::HBox::; 2615our @ISA = CFClient::UI::HBox::;
2377 2616
2378use CFClient::OpenGL; 2617use CFClient::OpenGL;
2379 2618
2380sub new { 2619sub new {
2381 my $class = shift; 2620 my $class = shift;
2382 2621
2383 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2384 fontsize => 1, 2623 fontsize => 1,
2385 can_events => 0, 2624 can_events => 1,
2625 indent => 0,
2386 #font => default_font 2626 #font => default_font
2387 @_, 2627 @_,
2388 2628
2389 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2390 par => [], 2630 par => [],
2391 height => 0, 2631 height => 0,
2392 children => [ 2632 children => [
2393 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2394 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2405 2645
2406 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2407 $self->reflow; 2647 $self->reflow;
2408} 2648}
2409 2649
2650sub size_request {
2651 my ($self) = @_;
2652
2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2657}
2658
2410sub size_allocate { 2659sub invoke_size_allocate {
2411 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2412 2661
2413 $self->SUPER::size_allocate ($w, $h); 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2414 2664
2415 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2416 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2417 $self->{layout}->set_width ($self->{children}[0]{w}); 2667 $self->{layout}->set_width ($empty->{w});
2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2418 2669
2419 $self->reflow; 2670 $self->reflow;
2420}
2421 2671
2422sub text_size { 2672 local $self->{children} = [$empty, $slider];
2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2423 my ($self, $text, $indent) = @_; 2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2684}
2685
2686sub get_layout {
2687 my ($self, $para) = @_;
2424 2688
2425 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2426 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2427 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428 $layout->set_width ($self->{children}[0]{w} - $indent); 2694 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2429 $layout->set_markup ($text); 2696 $layout->set_markup ($para->{markup});
2697
2698 $layout->set_shapes (
2699 map
2700 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2701 @{$para->{widget}}
2430 2702 );
2703
2431 $layout->size 2704 $layout
2432} 2705}
2433 2706
2434sub reflow { 2707sub reflow {
2435 my ($self) = @_; 2708 my ($self) = @_;
2436 2709
… …
2445 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2446} 2719}
2447 2720
2448sub clear { 2721sub clear {
2449 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2450 2726
2451 $self->{par} = []; 2727 $self->{par} = [];
2452 $self->{height} = 0; 2728 $self->{height} = 0;
2453 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454} 2730}
2455 2731
2456sub add_paragraph { 2732sub add_paragraph {
2457 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2458 2734
2459 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2460 my ($w, $h) = $self->text_size ($line); 2736
2461 $self->{height} += $h; 2737 $para = {
2462 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2738 w => 1e10,
2739 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2463 } 2744 };
2464 2745
2465 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2746 $self->add (@w) if @w;
2747 push @{$self->{par}}, $para;
2748
2749 $self->{need_reflow}++;
2750 $self->update;
2751}
2752
2753sub scroll_to_bottom {
2754 my ($self) = @_;
2755
2756 $self->{scroll_to_bottom} = 1;
2757 $self->update;
2466} 2758}
2467 2759
2468sub update { 2760sub update {
2469 my ($self) = @_; 2761 my ($self) = @_;
2470 2762
… …
2472 2764
2473 return unless $self->{h} > 0; 2765 return unless $self->{h} > 0;
2474 2766
2475 delete $self->{texture}; 2767 delete $self->{texture};
2476 2768
2477 $ROOT->on_post_alloc ($self, sub { 2769 $ROOT->on_post_alloc ($self => sub {
2478 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479 2771
2480 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2481 my $height = 0; 2773 my $height = 0;
2482 2774
2483 my $layout = $self->{layout};
2484
2485 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2487 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2488 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2489 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2490 $layout->set_markup ($_->[4]);
2491 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2492 $_->[0] = $w + $_->[3]; 2779
2493 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2494 } 2783 }
2495 2784
2496 $height += $_->[1]; 2785 $height += $para->{h};
2497 } 2786 }
2498 2787
2499 $self->{height} = $height; 2788 $self->{height} = $height;
2500 2789
2501 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2790 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2502 2791
2503 delete $self->{texture}; 2792 delete $self->{texture};
2504 } 2793 }
2505 2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2797 }
2798
2506 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2507 glClearColor 0.5, 0.5, 0.5, 0; 2800 glClearColor 0, 0, 0, 0;
2508 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
2509 2802
2510 my $top = int $self->{children}[1]{range}[0]; 2803 my $top = int $self->{children}[1]{range}[0];
2511 2804
2512 my $y0 = $top; 2805 my $y0 = $top;
2513 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2514 2807
2515 my $y = 0; 2808 my $y = 0;
2516 2809
2517 my $layout = $self->{layout};
2518
2519 $layout->set_font ($self->{font}) if $self->{font};
2520
2521 glEnable GL_BLEND;
2522 #TODO# not correct in windows where rgba is forced off
2523 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2524
2525 for my $par (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2526 my $h = $par->[1]; 2811 my $h = $para->{h};
2527 2812
2528 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2529 $layout->set_foreground (@{ $par->[2] });
2530 $layout->set_width ($W - $par->[3]);
2531 $layout->set_markup ($par->[4]);
2532 2814
2533 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2534 2816
2535 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2536 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2818
2819 if (my @w = @{ $para->{widget} }) {
2820 my @s = $layout->get_shapes;
2821
2822 for (@w) {
2823 my ($dx, $dy) = splice @s, 0, 2, ();
2824
2825 $_->{x} = $dx + $para->{indent};
2826 $_->{y} = $dy + $y - $y0;
2827
2828 $_->draw;
2829 }
2830 }
2537 } 2831 }
2538 2832
2539 $y += $h; 2833 $y += $h;
2540 } 2834 }
2541
2542 glDisable GL_BLEND;
2543 }; 2835 };
2544 }); 2836 });
2545} 2837}
2546 2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2846}
2847
2547sub _draw { 2848sub _draw {
2548 my ($self) = @_; 2849 my ($self) = @_;
2549 2850
2550 glEnable GL_TEXTURE_2D; 2851 glEnable GL_TEXTURE_2D;
2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2852 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552 glColor 1, 1, 1, 1; 2853 glColor 0, 0, 0, 1;
2553 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2854 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2554 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2555 2856
2556 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2557
2558} 2858}
2559 2859
2560############################################################################# 2860#############################################################################
2561 2861
2562package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2649 $tooltip .= "\n\n" . (ref $widget) . "\n" 2949 $tooltip .= "\n\n" . (ref $widget) . "\n"
2650 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2950 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651 . "req $widget->{req_w} $widget->{req_h}\n" 2951 . "req $widget->{req_w} $widget->{req_h}\n"
2652 . "visible $widget->{visible}"; 2952 . "visible $widget->{visible}";
2653 } 2953 }
2954
2955 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//;
2654 2957
2655 $self->add (new CFClient::UI::Label 2958 $self->add (new CFClient::UI::Label
2656 markup => $tooltip, 2959 markup => $tooltip,
2657 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2658 fontsize => 0.8, 2961 fontsize => 0.8,
… …
2668 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2971 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2669 2972
2670 ($w + 4, $h + 4) 2973 ($w + 4, $h + 4)
2671} 2974}
2672 2975
2673sub size_allocate { 2976sub invoke_size_allocate {
2674 my ($self, $w, $h) = @_; 2977 my ($self, $w, $h) = @_;
2675 2978
2676 $self->SUPER::size_allocate ($w - 4, $h - 4); 2979 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2677} 2980}
2678 2981
2679sub visibility_change { 2982sub invoke_visibility_change {
2680 my ($self, $visible) = @_; 2983 my ($self, $visible) = @_;
2681 2984
2682 return unless $visible; 2985 return unless $visible;
2683 2986
2684 $self->{root}->on_post_alloc ("move_$self" => sub { 2987 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2686 or return; 2989 or return;
2687 2990
2688 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689 2992
2690 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691 if $x + $self->{w} > $::WIDTH; 2994 if $x + $self->{w} > $self->{root}{w};
2692 2995
2693 $self->move_abs ($x, $y); 2996 $self->move_abs ($x, $y);
2694 }); 2997 });
2695} 2998}
2696 2999
… …
2785 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3088 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2786 3089
2787 if ($tex) { 3090 if ($tex) {
2788 glEnable GL_TEXTURE_2D; 3091 glEnable GL_TEXTURE_2D;
2789 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2790 glColor 1, 1, 1, 1; 3093 glColor 0, 0, 0, 1;
2791 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3094 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2792 glDisable GL_TEXTURE_2D; 3095 glDisable GL_TEXTURE_2D;
2793 } 3096 }
2794} 3097}
2795 3098
2796sub DESTROY { 3099sub destroy {
2797 my ($self) = @_; 3100 my ($self) = @_;
2798 3101
2799 $self->{timer}->cancel 3102 $self->{timer}->cancel
2800 if $self->{timer}; 3103 if $self->{timer};
2801 3104
2802 $self->SUPER::DESTROY; 3105 $self->SUPER::destroy;
2803} 3106}
3107
3108#############################################################################
3109
3110package CFClient::UI::Buttonbar;
3111
3112our @ISA = CFClient::UI::HBox::;
3113
3114# TODO: should actualyl wrap buttons and other goodies.
2804 3115
2805############################################################################# 3116#############################################################################
2806 3117
2807package CFClient::UI::Menu; 3118package CFClient::UI::Menu;
2808 3119
… …
2820 ); 3131 );
2821 3132
2822 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3133 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2823 3134
2824 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2825 my ($widget, $cb) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
2826 3137
2827 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
2828 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
2829 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
2830 can_hover => 1, 3155 can_hover => 1,
2831 can_events => 1, 3156 can_events => 1,
2832 text => $widget; 3157 markup => $widget,
3158 tooltip => $tooltip;
3159 }
2833 } 3160 }
2834 3161
2835 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
2836 3163
2837 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
2842 3169
2843# popup given the event (must be a mouse button down event currently) 3170# popup given the event (must be a mouse button down event currently)
2844sub popup { 3171sub popup {
2845 my ($self, $ev) = @_; 3172 my ($self, $ev) = @_;
2846 3173
2847 $self->_emit ("popdown"); 3174 $self->emit ("popdown");
2848 3175
2849 # maybe save $GRAB? must be careful about events... 3176 # maybe save $GRAB? must be careful about events...
2850 $GRAB = $self; 3177 $GRAB = $self;
2851 $self->{button} = $ev->{button}; 3178 $self->{button} = $ev->{button};
2852 3179
2853 $self->show; 3180 $self->show;
2854 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3181 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2855} 3182}
2856 3183
2857sub mouse_motion { 3184sub invoke_mouse_motion {
2858 my ($self, $ev, $x, $y) = @_; 3185 my ($self, $ev, $x, $y) = @_;
2859 3186
2860 # TODO: should use vbox->find_widget or so 3187 # TODO: should use vbox->find_widget or so
2861 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3188 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2862 $self->{hover} = $self->{item}{$HOVER}; 3189 $self->{hover} = $self->{item}{$HOVER};
2863}
2864 3190
3191 0
3192}
3193
2865sub button_up { 3194sub invoke_button_up {
2866 my ($self, $ev, $x, $y) = @_; 3195 my ($self, $ev, $x, $y) = @_;
2867 3196
2868 if ($ev->{button} == $self->{button}) { 3197 if ($ev->{button} == $self->{button}) {
2869 undef $GRAB; 3198 undef $GRAB;
2870 $self->hide; 3199 $self->hide;
2871 3200
2872 $self->_emit ("popdown"); 3201 $self->emit ("popdown");
2873 $self->{hover}[1]->() if $self->{hover}; 3202 $self->{hover}[1]->() if $self->{hover};
3203 } else {
3204 return 0
3205 }
3206
2874 } 3207 1
2875} 3208}
2876 3209
2877############################################################################# 3210#############################################################################
2878 3211
2879package CFClient::UI::Statusbox; 3212package CFClient::UI::Multiplexer;
2880 3213
2881our @ISA = CFClient::UI::VBox::; 3214our @ISA = CFClient::UI::Container::;
2882 3215
2883sub new { 3216sub new {
2884 my $class = shift; 3217 my $class = shift;
2885 3218
2886 $class->SUPER::new ( 3219 my $self = $class->SUPER::new (
3220 @_,
3221 );
3222
3223 $self->{current} = $self->{children}[0]
3224 if @{ $self->{children} };
3225
3226 $self
3227}
3228
3229sub add {
3230 my ($self, @widgets) = @_;
3231
3232 $self->SUPER::add (@widgets);
3233
3234 $self->{current} = $self->{children}[0]
3235 if @{ $self->{children} };
3236}
3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3242}
3243
3244sub set_current_page {
3245 my ($self, $page_or_widget) = @_;
3246
3247 my $widget = ref $page_or_widget
3248 ? $page_or_widget
3249 : $self->{children}[$page_or_widget];
3250
3251 $self->{current} = $widget;
3252 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3253
3254 $self->emit (page_changed => $self->{current});
3255
3256 $self->realloc;
3257}
3258
3259sub visible_children {
3260 $_[0]{current}
3261}
3262
3263sub size_request {
3264 my ($self) = @_;
3265
3266 $self->{current}->size_request
3267}
3268
3269sub invoke_size_allocate {
3270 my ($self, $w, $h) = @_;
3271
3272 $self->{current}->configure (0, 0, $w, $h);
3273
3274 1
3275}
3276
3277sub _draw {
3278 my ($self) = @_;
3279
3280 $self->{current}->draw;
3281}
3282
3283#############################################################################
3284
3285package CFClient::UI::Notebook;
3286
3287our @ISA = CFClient::UI::VBox::;
3288
3289sub new {
3290 my $class = shift;
3291
3292 my $self = $class->SUPER::new (
3293 buttonbar => (new CFClient::UI::Buttonbar),
3294 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3295 # filter => # will be put between multiplexer and $self
3296 @_,
3297 );
3298
3299 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3300 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3301
3302 $self
3303}
3304
3305sub add {
3306 my ($self, $title, $widget, $tooltip) = @_;
3307
3308 Scalar::Util::weaken $self;
3309
3310 $self->{buttonbar}->add (new CFClient::UI::Button
3311 markup => $title,
3312 tooltip => $tooltip,
3313 on_activate => sub { $self->set_current_page ($widget) },
3314 );
3315
3316 $self->{multiplexer}->add ($widget);
3317}
3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3323}
3324
3325sub set_current_page {
3326 my ($self, $page) = @_;
3327
3328 $self->{multiplexer}->set_current_page ($page);
3329 $self->emit (page_changed => $self->{multiplexer}{current});
3330}
3331
3332#############################################################################
3333
3334package CFClient::UI::Combobox;
3335
3336use utf8;
3337
3338our @ISA = CFClient::UI::Button::;
3339
3340sub new {
3341 my $class = shift;
3342
3343 my $self = $class->SUPER::new (
3344 options => [], # [value, title, longdesc], ...
3345 value => undef,
3346 @_,
3347 );
3348
3349 $self->_set_value ($self->{value});
3350
3351 $self
3352}
3353
3354sub invoke_button_down {
3355 my ($self, $ev) = @_;
3356
3357 my @menu_items;
3358
3359 for (@{ $self->{options} }) {
3360 my ($value, $title, $tooltip) = @$_;
3361
3362 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363 }
3364
3365 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366}
3367
3368sub _set_value {
3369 my ($self, $value) = @_;
3370
3371 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3372 or return;
3373
3374 $self->{value} = $item->[0];
3375 $self->set_markup ("$item->[1] ⇓");
3376 $self->set_tooltip ($item->[2]);
3377}
3378
3379sub set_value {
3380 my ($self, $value) = @_;
3381
3382 return unless $self->{value} ne $value;
3383
3384 $self->_set_value ($value);
3385 $self->emit (changed => $value);
3386}
3387
3388#############################################################################
3389
3390package CFClient::UI::Statusbox;
3391
3392our @ISA = CFClient::UI::VBox::;
3393
3394sub new {
3395 my $class = shift;
3396
3397 my $self = $class->SUPER::new (
2887 fontsize => 0.8, 3398 fontsize => 0.8,
2888 @_, 3399 @_,
2889 ) 3400 );
3401
3402 Scalar::Util::weaken (my $this = $self);
3403
3404 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405
3406 $self
2890} 3407}
2891 3408
2892sub reorder { 3409sub reorder {
2893 my ($self) = @_; 3410 my ($self) = @_;
2894 my $NOW = time; 3411 my $NOW = Time::HiRes::time;
3412
3413 # freeze display when hovering over any label
3414 return if $CFClient::UI::TOOLTIP->{owner}
3415 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3416 values %{ $self->{item} };
2895 3417
2896 while (my ($k, $v) = each %{ $self->{item} }) { 3418 while (my ($k, $v) = each %{ $self->{item} }) {
2897 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3419 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2898 } 3420 }
2899 3421
… …
2902 my @items = sort { 3424 my @items = sort {
2903 $a->{pri} <=> $b->{pri} 3425 $a->{pri} <=> $b->{pri}
2904 or $b->{id} <=> $a->{id} 3426 or $b->{id} <=> $a->{id}
2905 } values %{ $self->{item} }; 3427 } values %{ $self->{item} };
2906 3428
3429 $self->{timer}->interval (1);
3430
2907 my $count = 10 + 1; 3431 my $count = 10 + 1;
2908 for my $item (@items) { 3432 for my $item (@items) {
2909 last unless --$count; 3433 last unless --$count;
2910 3434
2911 push @widgets, $item->{label} ||= do { 3435 my $label = $item->{label} ||= do {
2912 # TODO: doesn't handle markup well (read as: at all) 3436 # TODO: doesn't handle markup well (read as: at all)
2913 my $short = $item->{count} > 1 3437 my $short = $item->{count} > 1
2914 ? "<b>$item->{count} ×</b> $item->{text}" 3438 ? "<b>$item->{count} ×</b> $item->{text}"
2915 : $item->{text}; 3439 : $item->{text};
2916 3440
… …
2924 tooltip => $item->{tooltip}, 3448 tooltip => $item->{tooltip},
2925 tooltip_font => $::FONT_PROP, 3449 tooltip_font => $::FONT_PROP,
2926 tooltip_width => 0.67, 3450 tooltip_width => 0.67,
2927 fontsize => $item->{fontsize} || $self->{fontsize}, 3451 fontsize => $item->{fontsize} || $self->{fontsize},
2928 max_w => $::WIDTH * 0.44, 3452 max_w => $::WIDTH * 0.44,
2929 fg => $item->{fg}, 3453 fg => [@{ $item->{fg} }],
2930 can_events => 1, 3454 can_events => 1,
2931 can_hover => 1 3455 can_hover => 1
2932 }; 3456 };
3457
3458 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3459 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3460 $label->update;
3461 $label->set_max_size (undef, $label->{req_h} * $diff)
3462 if $diff < 1;
3463 $self->{timer}->interval (1/30);
3464 } else {
3465 $label->{fg}[3] = $item->{fg}[3] || 1;
3466 }
3467
3468 push @widgets, $label;
2933 } 3469 }
2934 3470
2935 $self->clear; 3471 $self->clear;
2936 $self->SUPER::add (reverse @widgets); 3472 $self->SUPER::add (reverse @widgets);
2937} 3473}
… …
2942 $text =~ s/^\s+//; 3478 $text =~ s/^\s+//;
2943 $text =~ s/\s+$//; 3479 $text =~ s/\s+$//;
2944 3480
2945 return unless $text; 3481 return unless $text;
2946 3482
2947 my $timeout = time + ((delete $arg{timeout}) || 60); 3483 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2948 3484
2949 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3485 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2950 3486
2951 if (my $item = $self->{item}{$group}) { 3487 if (my $item = $self->{item}{$group}) {
2952 if ($item->{text} eq $text) { 3488 if ($item->{text} eq $text) {
2953 $item->{count}++; 3489 $item->{count}++;
2954 } else { 3490 } else {
2955 $item->{count} = 1; 3491 $item->{count} = 1;
2956 $item->{text} = $item->{tooltip} = $text; 3492 $item->{text} = $item->{tooltip} = $text;
2957 } 3493 }
2958 $item->{id} = ++$self->{id}; 3494 $item->{id} += 0.2;#d#
2959 $item->{timeout} = $timeout; 3495 $item->{timeout} = $timeout;
2960 delete $item->{label}; 3496 delete $item->{label};
2961 } else { 3497 } else {
2962 $self->{item}{$group} = { 3498 $self->{item}{$group} = {
2963 id => ++$self->{id}, 3499 id => ++$self->{id},
… …
2969 count => 1, 3505 count => 1,
2970 %arg, 3506 %arg,
2971 }; 3507 };
2972 } 3508 }
2973 3509
3510 $ROOT->on_refresh (reorder => sub {
2974 $self->reorder; 3511 $self->reorder;
3512 });
2975} 3513}
2976 3514
2977sub reconfigure { 3515sub reconfigure {
2978 my ($self) = @_; 3516 my ($self) = @_;
2979 3517
… …
2982 3520
2983 $self->reorder; 3521 $self->reorder;
2984 $self->SUPER::reconfigure; 3522 $self->SUPER::reconfigure;
2985} 3523}
2986 3524
3525sub destroy {
3526 my ($self) = @_;
3527
3528 $self->{timer}->cancel;
3529
3530 $self->SUPER::destroy;
3531}
3532
2987############################################################################# 3533#############################################################################
2988 3534
2989package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
2990 3536
2991our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
2992 3538
2993sub new { 3539sub new {
2994 my $class = shift; 3540 my $class = shift;
2995 3541
2996 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
2998 @_, 3544 @_,
2999 ); 3545 );
3000 3546
3001 $self 3547 $self
3002} 3548}
3003 3549
3004sub set_items { 3550sub set_items {
3005 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3006 3552
3007 $self->{scrolled}->clear; 3553 $self->clear;
3008 return unless $items; 3554 return unless $items;
3009 3555
3010 my @items = sort { 3556 my @items = sort {
3011 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3013 } @$items; 3559 } values %$items;
3014 3560
3015 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3016 3562
3017 my $row = 0; 3563 my $row = 0;
3018 for my $item (@items) { 3564 for my $item (@items) {
3019 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3020 3566
3021 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3024 3570
3025 $row++; 3571 $row++;
3026 } 3572 }
3027} 3573}
3028 3574
3029############################################################################# 3575#############################################################################
3030 3576
3031package CFClient::UI::BindEditor; 3577package CFClient::UI::SpellList;
3032 3578
3033our @ISA = CFClient::UI::FancyFrame::; 3579our @ISA = CFClient::UI::Table::;
3034 3580
3035sub new { 3581sub new {
3036 my $class = shift; 3582 my $class = shift;
3037 3583
3038 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3584 my $self = $class->SUPER::new (
3585 binding => [],
3586 commands => [],
3587 @_,
3588 )
3589}
3039 3590
3040 $self->add (my $vb = new CFClient::UI::VBox); 3591my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3041 3592
3593my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3042 3603
3043 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3604sub rebuild_spell_list {
3044 text => "start recording", 3605 my ($self) = @_;
3045 tooltip => "Start/Stops recording of actions." 3606
3046 ."All subsequent actions after the recording started will be captured." 3607 $CFClient::UI::ROOT->on_refresh ($self => sub {
3047 ."The actions are displayed after the record was stopped." 3608 $self->clear;
3048 ."To bind the action you have to click on the 'Bind' button", 3609
3049 on_activate => sub { 3610 return unless $::CONN;
3050 unless ($self->{recording}) { 3611
3051 $self->start; 3612 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618 my $row = 0;
3619
3620 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621 my $spell = $self->{spell}{$_};
3622
3623 $row++;
3624
3625 my $spell_cb = sub {
3626 my ($widget, $ev) = @_;
3627
3628 if ($ev->{button} == 1) {
3629 $::CONN->user_send ("cast $spell->{name}");
3630 } elsif ($ev->{button} == 2) {
3631 $::CONN->user_send ("invoke $spell->{name}");
3632 } elsif ($ev->{button} == 3) {
3633 (new CFClient::UI::Menu
3634 items => [
3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637 ],
3638 )->popup ($ev);
3052 } else { 3639 } else {
3053 $self->stop; 3640 return 0;
3641 }
3642
3643 1
3054 } 3644 };
3645
3646 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648 #TODO: add path info to tooltip
3649 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651 $self->add (0, $row, new CFClient::UI::Face
3652 face => $spell->{face},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (1, $row, new CFClient::UI::Label
3660 expand => 1,
3661 text => $spell->{name},
3662 can_hover => 1,
3663 can_events => 1,
3664 tooltip => $tooltip,
3665 on_button_down => $spell_cb,
3666 );
3667
3668 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3055 }); 3672 }
3056
3057 $vb->add (new CFClient::UI::Label text => "Actions:");
3058 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3061 $vb->add (my $hb = new CFClient::UI::HBox);
3062 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063 $hb->add (new CFClient::UI::Button
3064 text => "bind",
3065 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066 on_activate => sub {
3067 $self->ask_for_bind;
3068 });
3069
3070 $vb->add (my $hb = new CFClient::UI::HBox);
3071 $hb->add (new CFClient::UI::Button
3072 text => "ok",
3073 expand => 1,
3074 tooltip => "This closes the binding editor and saves the binding",
3075 on_activate => sub {
3076 $self->hide;
3077 $self->commit;
3078 });
3079
3080 $hb->add (new CFClient::UI::Button
3081 text => "cancel",
3082 expand => 1,
3083 tooltip => "This closes the binding editor without saving",
3084 on_activate => sub {
3085 $self->hide;
3086 $self->{binding_cancel}->()
3087 if $self->{binding_cancel};
3088 });
3089
3090 $self->update_binding_widgets;
3091
3092 $self
3093}
3094
3095sub commit {
3096 my ($self) = @_;
3097 my ($mod, $sym, $cmds) = $self->get_binding;
3098 if ($sym != 0 && @$cmds > 0) {
3099 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100 ."'. Don't forget 'Save Config'!");
3101 $self->{binding_change}->($mod, $sym, $cmds)
3102 if $self->{binding_change};
3103 } else {
3104 $::STATUSBOX->add ("No action bound, no key or action specified!");
3105 $self->{binding_cancel}->()
3106 if $self->{binding_cancel};
3107 }
3108}
3109
3110sub start {
3111 my ($self) = @_;
3112
3113 $self->{rec_btn}->set_text ("stop recording");
3114 $self->{recording} = 1;
3115 $self->clear_command_list;
3116 $::CONN->start_record if $::CONN;
3117}
3118
3119sub stop {
3120 my ($self) = @_;
3121
3122 $self->{rec_btn}->set_text ("start recording");
3123 $self->{recording} = 0;
3124
3125 my $rec;
3126 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec);
3129}
3130
3131# if $commit is true, the binding will be set after the user entered a key combo
3132sub ask_for_bind {
3133 my ($self, $commit) = @_;
3134
3135 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_;
3137 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138 $self->update_binding_widgets;
3139 $self->commit if $commit;
3140 }); 3673 });
3141} 3674}
3142 3675
3143# $mod and $sym are the modifiers and key symbol
3144# $cmds is a array ref of strings (the commands)
3145# $cb is the callback that is executed on OK
3146# $ccb is the callback that is executed on CANCEL and
3147# when the binding was unsuccessful on OK
3148sub set_binding {
3149 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3150
3151 $self->clear_command_list;
3152 $self->{recording} = 0;
3153 $self->{rec_btn}->set_text ("start recording");
3154
3155 $self->{binding} = [$mod, $sym];
3156 $self->{commands} = $cmds;
3157
3158 $self->{binding_change} = $cb;
3159 $self->{binding_cancel} = $ccb;
3160
3161 $self->update_binding_widgets;
3162}
3163
3164# this is a shortcut method that asks for a binding
3165# and then just binds it.
3166sub do_quick_binding {
3167 my ($self, $cmds) = @_;
3168 $self->set_binding (undef, undef, $cmds, sub {
3169 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170 });
3171 $self->ask_for_bind (1);
3172}
3173
3174sub update_binding_widgets {
3175 my ($self) = @_;
3176 my ($mod, $sym, $cmds) = $self->get_binding;
3177 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178 $self->set_command_list ($cmds);
3179}
3180
3181sub get_binding {
3182 my ($self) = @_;
3183 return (
3184 $self->{binding}->[0],
3185 $self->{binding}->[1],
3186 [ grep { defined $_ } @{$self->{commands}} ]
3187 );
3188}
3189
3190sub clear_command_list {
3191 my ($self) = @_;
3192 $self->{cmdbox}->clear ();
3193}
3194
3195sub set_command_list {
3196 my ($self, $cmds) = @_;
3197
3198 $self->{cmdbox}->clear ();
3199 $self->{commands} = $cmds;
3200
3201 my $idx = 0;
3202
3203 for (@$cmds) {
3204 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206 my $i = $idx;
3207 $hb->add (new CFClient::UI::Label text => $_);
3208 $hb->add (new CFClient::UI::Button
3209 text => "delete",
3210 tooltip => "Deletes the action from the record",
3211 on_activate => sub {
3212 $self->{cmdbox}->remove ($hb);
3213 $cmds->[$i] = undef;
3214 });
3215
3216
3217 $idx++
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::SpellList;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (new CFClient::UI::ScrolledWindow
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235 $self;
3236}
3237
3238# XXX: Do sorting? Argl...
3239sub add_spell { 3676sub add_spell {
3240 my ($self, $spell) = @_; 3677 my ($self, $spell) = @_;
3678
3241 $self->{spells}->{$spell->{name}} = $spell; 3679 $self->{spell}->{$spell->{name}} = $spell;
3242 3680 $self->rebuild_spell_list;
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face},
3245 can_hover => 1,
3246 can_events => 1,
3247 tooltip => $spell->{message});
3248
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name},
3251 can_hover => 1,
3252 can_events => 1,
3253 tooltip => $spell->{message},
3254 expand => 1);
3255
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1);
3260
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264}
3265
3266sub rebuild_spell_list {
3267 my ($self) = @_;
3268 $self->{tbl_idx} = 0;
3269 $self->add_spell ($_) for values %{$self->{spells}};
3270} 3681}
3271 3682
3272sub remove_spell { 3683sub remove_spell {
3273 my ($self, $spell) = @_; 3684 my ($self, $spell) = @_;
3685
3274 delete $self->{spells}->{$spell->{name}}; 3686 delete $self->{spell}->{$spell->{name}};
3275 $self->rebuild_spell_list; 3687 $self->rebuild_spell_list;
3276} 3688}
3277 3689
3690sub clear_spells {
3691 my ($self) = @_;
3692
3693 $self->{spell} = {};
3694 $self->rebuild_spell_list;
3695}
3696
3278############################################################################# 3697#############################################################################
3279 3698
3280package CFClient::UI::Root; 3699package CFClient::UI::Root;
3281 3700
3282our @ISA = CFClient::UI::Container::; 3701our @ISA = CFClient::UI::Container::;
3702
3703use List::Util qw(min max);
3283 3704
3284use CFClient::OpenGL; 3705use CFClient::OpenGL;
3285 3706
3286sub new { 3707sub new {
3287 my $class = shift; 3708 my $class = shift;
… …
3314 $coord = $max - $size if $coord > $max - $size; 3735 $coord = $max - $size if $coord > $max - $size;
3315 3736
3316 int $coord + 0.5 3737 int $coord + 0.5
3317} 3738}
3318 3739
3319sub size_allocate { 3740sub invoke_size_allocate {
3320 my ($self, $w, $h) = @_; 3741 my ($self, $w, $h) = @_;
3321 3742
3322 for my $child ($self->children) { 3743 for my $child ($self->children) {
3323 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3744 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3324 3745
… …
3328 $X = _to_pixel $X, $W, $self->{w}; 3749 $X = _to_pixel $X, $W, $self->{w};
3329 $Y = _to_pixel $Y, $H, $self->{h}; 3750 $Y = _to_pixel $Y, $H, $self->{h};
3330 3751
3331 $child->configure ($X, $Y, $W, $H); 3752 $child->configure ($X, $Y, $W, $H);
3332 } 3753 }
3754
3755 1
3333} 3756}
3334 3757
3335sub coord2local { 3758sub coord2local {
3336 my ($self, $x, $y) = @_; 3759 my ($self, $x, $y) = @_;
3337 3760
… …
3422 3845
3423 delete $queue{$widget+0}; 3846 delete $queue{$widget+0};
3424 3847
3425 my ($w, $h) = $widget->size_request; 3848 my ($w, $h) = $widget->size_request;
3426 3849
3427 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3850 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3851 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3852
3853 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3854 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3429 3855
3430 $w = $widget->{force_w} if exists $widget->{force_w}; 3856 $w = $widget->{force_w} if exists $widget->{force_w};
3431 $h = $widget->{force_h} if exists $widget->{force_h}; 3857 $h = $widget->{force_h} if exists $widget->{force_h};
3432 3858
3433 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3859 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3459 3885
3460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3461 3887
3462 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3463 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3464 3896
3465 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3466 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3467 3899
3468 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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