ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.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;
… …
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, %arg) = @_; 1130 my ($class, %arg) = @_;
1056 1131
1057 my $title = delete $arg{title};
1058
1059 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1060 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1061 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1062 border => 0.6, 1135 border => 0.6,
1063 can_events => 1, 1136 can_events => 1,
1064 min_w => 16, 1137 min_w => 64,
1065 min_h => 16, 1138 min_h => 32,
1066 %arg, 1139 %arg,
1067 ); 1140 );
1068 1141
1069 $self->{title} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1070 align => 0, 1143 align => 0,
1071 valign => 1, 1144 valign => 1,
1072 text => $title, 1145 text => $self->{title},
1073 fontsize => $self->{border} 1146 fontsize => $self->{border},
1074 if defined $title; 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 }
1075 1157
1076 $self 1158 $self
1077} 1159}
1078 1160
1079sub add { 1161sub add {
1080 my ($self, @widgets) = @_; 1162 my ($self, @widgets) = @_;
1081 1163
1082 $self->SUPER::add (@widgets); 1164 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084} 1167}
1085 1168
1086sub border { 1169sub border {
1087 int $_[0]{border} * $::FONTSIZE 1170 int $_[0]{border} * $::FONTSIZE
1088} 1171}
1089 1172
1090sub size_request { 1173sub size_request {
1091 my ($self) = @_; 1174 my ($self) = @_;
1092 1175
1093 $self->{title}->size_request 1176 $self->{title_widget}->size_request
1094 if $self->{title}; 1177 if $self->{title_widget};
1178
1179 $self->{close_button}->size_request
1180 if $self->{close_button};
1095 1181
1096 my ($w, $h) = $self->SUPER::size_request; 1182 my ($w, $h) = $self->SUPER::size_request;
1097 1183
1098 ( 1184 (
1099 $w + $self->border * 2, 1185 $w + $self->border * 2,
1100 $h + $self->border * 2, 1186 $h + $self->border * 2,
1101 ) 1187 )
1102} 1188}
1103 1189
1104sub size_allocate { 1190sub invoke_size_allocate {
1105 my ($self, $w, $h) = @_; 1191 my ($self, $w, $h) = @_;
1106 1192
1107 if ($self->{title}) { 1193 if ($self->{title_widget}) {
1108 $self->{title}{w} = $w; 1194 $self->{title_widget}{w} = $w;
1109 $self->{title}{h} = $h; 1195 $self->{title_widget}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h); 1196 $self->{title_widget}->invoke_size_allocate ($w, $h);
1111 } 1197 }
1112 1198
1113 my $border = $self->border; 1199 my $border = $self->border;
1114 1200
1115 $h -= List::Util::max 0, $border * 2; 1201 $h -= List::Util::max 0, $border * 2;
1116 $w -= List::Util::max 0, $border * 2; 1202 $w -= List::Util::max 0, $border * 2;
1203
1204 $self->child->configure ($border, $border, $w, $h);
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;
1117 1216
1118 $self->child->configure ($border, $border, $w, $h); 1217 1
1119} 1218}
1120 1219
1121sub button_down { 1220sub invoke_button_down {
1122 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1123 1222
1124 my ($w, $h) = @$self{qw(w h)}; 1223 my ($w, $h) = @$self{qw(w h)};
1125 my $border = $self->border; 1224 my $border = $self->border;
1126 1225
… …
1142 my $dy = $ev->{y} - $oy; 1241 my $dy = $ev->{y} - $oy;
1143 1242
1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1243 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1244 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146 1245
1246 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147 $self->realloc; 1247 $self->realloc;
1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149 }; 1248 };
1150 1249
1151 } elsif ($lr ^ $td) { 1250 } elsif ($lr ^ $td) {
1152 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1251 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153 my ($bx, $by) = ($self->{x}, $self->{y}); 1252 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1156 my ($ev, $x, $y) = @_; 1255 my ($ev, $x, $y) = @_;
1157 1256
1158 ($x, $y) = ($ev->{x}, $ev->{y}); 1257 ($x, $y) = ($ev->{x}, $ev->{y});
1159 1258
1160 $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});
1161 }; 1262 };
1263 } else {
1264 return 0;
1265 }
1266
1162 } 1267 1
1163} 1268}
1164 1269
1165sub button_up { 1270sub invoke_button_up {
1166 my ($self, $ev, $x, $y) = @_; 1271 my ($self, $ev, $x, $y) = @_;
1167 1272
1168 delete $self->{motion}; 1273 ! ! delete $self->{motion}
1169} 1274}
1170 1275
1171sub mouse_motion { 1276sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_; 1277 my ($self, $ev, $x, $y) = @_;
1173 1278
1174 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1279 $self->{motion}->($ev, $x, $y) if $self->{motion};
1280
1281 ! ! $self->{motion}
1175} 1282}
1176 1283
1177sub _draw { 1284sub _draw {
1178 my ($self) = @_; 1285 my ($self) = @_;
1179 1286
… …
1205 1312
1206 glDisable GL_TEXTURE_2D; 1313 glDisable GL_TEXTURE_2D;
1207 1314
1208 $child->draw; 1315 $child->draw;
1209 1316
1210 if ($self->{title}) { 1317 if ($self->{title_widget}) {
1211 glTranslate 0, $border - $self->{h}; 1318 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw; 1319 $self->{title_widget}->_draw;
1320
1321 glTranslate 0, - ($border - $self->{h});
1213 } 1322 }
1323
1324 $self->{close_button}->draw
1325 if $self->{close_button};
1214} 1326}
1215 1327
1216############################################################################# 1328#############################################################################
1217 1329
1218package CFClient::UI::Table; 1330package CFClient::UI::Table;
… …
1241 1353
1242 $child->set_parent ($self); 1354 $child->set_parent ($self);
1243 $self->{children}[$y][$x] = $child; 1355 $self->{children}[$y][$x] = $child;
1244 1356
1245 $self->realloc; 1357 $self->realloc;
1358}
1359
1360sub remove {
1361 my ($self, $child) = @_;
1362
1363 # TODO: not yet implemented
1246} 1364}
1247 1365
1248# 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?
1249sub clear { 1367sub clear {
1250 my ($self) = @_; 1368 my ($self) = @_;
… …
1291 (sum @$ws), 1409 (sum @$ws),
1292 (sum @$hs), 1410 (sum @$hs),
1293 ) 1411 )
1294} 1412}
1295 1413
1296sub size_allocate { 1414sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_; 1415 my ($self, $w, $h) = @_;
1298 1416
1299 my ($ws, $hs) = $self->get_wh; 1417 my ($ws, $hs) = $self->get_wh;
1300 1418
1301 my $req_w = (sum @$ws) || 1; 1419 my $req_w = (sum @$ws) || 1;
… …
1333 } 1451 }
1334 1452
1335 $y += $row_h; 1453 $y += $row_h;
1336 } 1454 }
1337 1455
1456 1
1338} 1457}
1339 1458
1340sub find_widget { 1459sub find_widget {
1341 my ($self, $x, $y) = @_; 1460 my ($self, $x, $y) = @_;
1342 1461
… …
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1498 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1499 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 ) 1500 )
1382} 1501}
1383 1502
1384sub size_allocate { 1503sub invoke_size_allocate {
1385 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1386 1505
1387 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1388 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1389 1508
1390 my @req; 1509 my @req;
1391 1510
1392 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1393 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1394 } else { 1513 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1397 1516
1398 if ($req > $space) { 1517 if ($req > $space) {
1399 # ah well, not enough space 1518 # ah well, not enough space
1400 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1401 } else { 1520 } else {
1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403 1522
1404 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1405 1524
1406 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1407 for 0 .. $#$children; 1526 for 0 .. $#children;
1408 } 1527 }
1409 } 1528 }
1410 1529
1411 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1412 1531
1413 my $pos = 0; 1532 my $pos = 0;
1414 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1415 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1416 $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));
1417 1536
1418 $pos += $alloc; 1537 $pos += $alloc;
1419 } 1538 }
1420 1539
1421 1 1540 1
… …
1511 1630
1512 delete $self->{texture}; 1631 delete $self->{texture};
1513 $self->SUPER::update; 1632 $self->SUPER::update;
1514} 1633}
1515 1634
1635sub realloc {
1636 my ($self) = @_;
1637
1638 delete $self->{ox};
1639 $self->SUPER::realloc;
1640}
1641
1516sub set_text { 1642sub set_text {
1517 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1518 1644
1519 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1520 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1521 1647
1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1524 1649
1650 delete $self->{size_req};
1525 $self->realloc; 1651 $self->realloc;
1526 $self->update; 1652 $self->update;
1527} 1653}
1528 1654
1529sub set_markup { 1655sub set_markup {
… …
1532 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1533 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1534 1660
1535 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536 1662
1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1539 1664
1665 delete $self->{size_req};
1540 $self->realloc; 1666 $self->realloc;
1541 $self->update; 1667 $self->update;
1542} 1668}
1543 1669
1544sub size_request { 1670sub size_request {
1545 my ($self) = @_; 1671 my ($self) = @_;
1546 1672
1673 $self->{size_req} ||= do {
1547 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1674 $self->{layout}->set_font ($self->{font}) if $self->{font};
1548 $self->{layout}->set_width ($self->{max_w} || -1); 1675 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1676 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1677 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1678 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552 1679
1553 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1554 1681
1555 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1556 $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);
1557 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558 1686
1559 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1560 1688
1561 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
1562 $h = List::Util::max $h, $h2; 1690 $h = List::Util::max $h, $h2;
1691 }
1692
1693 [$w, $h]
1563 } 1694 };
1564 1695
1565 ($w, $h) 1696 @{ $self->{size_req} }
1566} 1697}
1567 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1568sub size_allocate { 1703sub invoke_size_allocate {
1569 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1570 1705
1571 delete $self->{ox}; 1706 delete $self->{ox};
1572 1707
1573 delete $self->{texture} 1708 delete $self->{texture}
1574 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
1575} 1712}
1576 1713
1577sub set_fontsize { 1714sub set_fontsize {
1578 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1579 1716
1580 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1581 delete $self->{texture}; 1719 delete $self->{texture};
1582 1720
1583 $self->realloc; 1721 $self->realloc;
1584} 1722}
1585 1723
1724sub reconfigure {
1725 my ($self) = @_;
1726
1727 delete $self->{size_req};
1728 delete $self->{texture};
1729
1730 $self->SUPER::reconfigure;
1731}
1732
1586sub _draw { 1733sub _draw {
1587 my ($self) = @_; 1734 my ($self) = @_;
1588 1735
1589 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1590 1737
1591 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1592 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1593 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1594 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1745
1599 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1600 }; 1747 };
1601 1748
1602 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1606 1753
1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1610 }; 1757 };
1611 1758
1612 glEnable GL_TEXTURE_2D; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1614 1761
1615 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1616 glColor @{$self->{fg}};
1617 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618 } else {
1619 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620 }
1621
1622 glDisable GL_TEXTURE_2D;
1623} 1763}
1624 1764
1625############################################################################# 1765#############################################################################
1626 1766
1627package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1641 can_hover => 1, 1781 can_hover => 1,
1642 can_focus => 1, 1782 can_focus => 1,
1643 valign => 0, 1783 valign => 0,
1644 can_events => 1, 1784 can_events => 1,
1645 #text => ... 1785 #text => ...
1786 #hidden => "*",
1646 @_ 1787 @_
1647 ) 1788 )
1648} 1789}
1649 1790
1650sub _set_text { 1791sub _set_text {
… …
1652 1793
1653 delete $self->{cur_h}; 1794 delete $self->{cur_h};
1654 1795
1655 return if $self->{text} eq $text; 1796 return if $self->{text} eq $text;
1656 1797
1657 delete $self->{texture};
1658
1659 $self->{last_activity} = $::NOW; 1798 $self->{last_activity} = $::NOW;
1660 $self->{text} = $text; 1799 $self->{text} = $text;
1661 1800
1662 $text =~ s/./*/g if $self->{hidden}; 1801 $text =~ s/./*/g if $self->{hidden};
1663 $self->{layout}->set_text ("$text "); 1802 $self->{layout}->set_text ("$text ");
1803 delete $self->{size_req};
1664 1804
1665 $self->_emit (changed => $self->{text}); 1805 $self->emit (changed => $self->{text});
1806
1807 $self->realloc;
1808 $self->update;
1666} 1809}
1667 1810
1668sub set_text { 1811sub set_text {
1669 my ($self, $text) = @_; 1812 my ($self, $text) = @_;
1670 1813
1671 $self->{cursor} = length $text; 1814 $self->{cursor} = length $text;
1672 $self->_set_text ($text); 1815 $self->_set_text ($text);
1673
1674 $self->realloc;
1675} 1816}
1676 1817
1677sub get_text { 1818sub get_text {
1678 $_[0]{text} 1819 $_[0]{text}
1679} 1820}
… …
1684 my ($w, $h) = $self->SUPER::size_request; 1825 my ($w, $h) = $self->SUPER::size_request;
1685 1826
1686 ($w + 1, $h) # add 1 for cursor 1827 ($w + 1, $h) # add 1 for cursor
1687} 1828}
1688 1829
1689sub key_down { 1830sub invoke_key_down {
1690 my ($self, $ev) = @_; 1831 my ($self, $ev) = @_;
1691 1832
1692 my $mod = $ev->{mod}; 1833 my $mod = $ev->{mod};
1693 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1694 my $uni = $ev->{unicode}; 1835 my $uni = $ev->{unicode};
… …
1706 } elsif ($sym == CFClient::SDLK_HOME) { 1847 } elsif ($sym == CFClient::SDLK_HOME) {
1707 $self->{cursor} = 0; 1848 $self->{cursor} = 0;
1708 } elsif ($sym == CFClient::SDLK_END) { 1849 } elsif ($sym == CFClient::SDLK_END) {
1709 $self->{cursor} = length $text; 1850 $self->{cursor} = length $text;
1710 } elsif ($uni == 27) { 1851 } elsif ($uni == 27) {
1711 $self->_emit ('escape'); 1852 $self->emit ('escape');
1712 } elsif ($uni) { 1853 } elsif ($uni) {
1713 substr $text, $self->{cursor}++, 0, chr $uni; 1854 substr $text, $self->{cursor}++, 0, chr $uni;
1855 } else {
1856 return 0;
1714 } 1857 }
1715 1858
1716 $self->_set_text ($text); 1859 $self->_set_text ($text);
1717 1860
1718 $self->realloc; 1861 $self->realloc;
1719}
1720 1862
1863 1
1864}
1865
1721sub focus_in { 1866sub invoke_focus_in {
1722 my ($self) = @_; 1867 my ($self) = @_;
1723 1868
1724 $self->{last_activity} = $::NOW; 1869 $self->{last_activity} = $::NOW;
1725 1870
1726 $self->SUPER::focus_in; 1871 $self->SUPER::invoke_focus_in
1727} 1872}
1728 1873
1729sub button_down { 1874sub invoke_button_down {
1730 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1731 1876
1732 $self->SUPER::button_down ($ev, $x, $y); 1877 $self->SUPER::invoke_button_down ($ev, $x, $y);
1733 1878
1734 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1735 1880
1736 # byte-index to char-index 1881 # byte-index to char-index
1737 my $text = $self->{text}; 1882 my $text = $self->{text};
1738 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1739 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1740 1885
1741 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1742 $self->update; 1887 $self->update;
1888
1889 1
1743} 1890}
1744 1891
1745sub mouse_motion { 1892sub invoke_mouse_motion {
1746 my ($self, $ev, $x, $y) = @_; 1893 my ($self, $ev, $x, $y) = @_;
1747# 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
1748} 1897}
1749 1898
1750sub _draw { 1899sub _draw {
1751 my ($self) = @_; 1900 my ($self) = @_;
1752 1901
1753 local $self->{fg} = $self->{fg}; 1902 local $self->{fg} = $self->{fg};
1754 1903
1755 if ($FOCUS == $self) { 1904 if ($FOCUS == $self) {
1756 glColor @{$self->{active_bg}}; 1905 glColor_premultiply @{$self->{active_bg}};
1757 $self->{fg} = $self->{active_fg}; 1906 $self->{fg} = $self->{active_fg};
1758 } else { 1907 } else {
1759 glColor @{$self->{bg}}; 1908 glColor_premultiply @{$self->{bg}};
1760 } 1909 }
1761 1910
1762 glEnable GL_BLEND; 1911 glEnable GL_BLEND;
1763 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1912 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764 glBegin GL_QUADS; 1913 glBegin GL_QUADS;
1765 glVertex 0 , 0; 1914 glVertex 0 , 0;
1766 glVertex 0 , $self->{h}; 1915 glVertex 0 , $self->{h};
1767 glVertex $self->{w}, $self->{h}; 1916 glVertex $self->{w}, $self->{h};
1768 glVertex $self->{w}, 0; 1917 glVertex $self->{w}, 0;
… …
1793 1942
1794our @ISA = CFClient::UI::EntryBase::; 1943our @ISA = CFClient::UI::EntryBase::;
1795 1944
1796use CFClient::OpenGL; 1945use CFClient::OpenGL;
1797 1946
1798sub key_down { 1947sub invoke_key_down {
1799 my ($self, $ev) = @_; 1948 my ($self, $ev) = @_;
1800 1949
1801 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1802 1951
1803 if ($sym == 13) { 1952 if ($sym == 13) {
1804 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1805 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1806 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1807 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1808 $self->_emit (activate => $txt); 1958 $self->emit (activate => $txt);
1809 $self->update; 1959 $self->update;
1810 1960
1811 } elsif ($sym == CFClient::SDLK_UP) { 1961 } elsif ($sym == CFClient::SDLK_UP) {
1812 if ($self->{history_pointer} < 0) { 1962 if ($self->{history_pointer} < 0) {
1813 $self->{history_saveback} = $self->get_text; 1963 $self->{history_saveback} = $self->get_text;
… …
1829 } else { 1979 } else {
1830 $self->set_text ($self->{history_saveback}); 1980 $self->set_text ($self->{history_saveback});
1831 } 1981 }
1832 1982
1833 } else { 1983 } else {
1834 $self->SUPER::key_down ($ev); 1984 return $self->SUPER::invoke_key_down ($ev)
1985 }
1986
1835 } 1987 1
1836
1837} 1988}
1838 1989
1839############################################################################# 1990#############################################################################
1840 1991
1841package CFClient::UI::Button; 1992package CFClient::UI::Button;
… …
1862 can_events => 1, 2013 can_events => 1,
1863 @_ 2014 @_
1864 ) 2015 )
1865} 2016}
1866 2017
1867sub activate { }
1868
1869sub button_up { 2018sub invoke_button_up {
1870 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
1871 2020
1872 $self->emit ("activate") 2021 $self->emit ("activate")
1873 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
1874 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1875} 2026}
1876 2027
1877sub _draw { 2028sub _draw {
1878 my ($self) = @_; 2029 my ($self) = @_;
1879 2030
1880 local $self->{fg} = $self->{fg}; 2031 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882 if ($GRAB == $self) {
1883 $self->{fg} = $self->{active_fg};
1884 }
1885 2032
1886 glEnable GL_TEXTURE_2D; 2033 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 glColor 0, 0, 0, 1; 2035 glColor 0, 0, 0, 1;
1889 2036
1890 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1891 2038
1892 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1893 2040
1894 $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
1895} 2078}
1896 2079
1897############################################################################# 2080#############################################################################
1898 2081
1899package CFClient::UI::CheckBox; 2082package CFClient::UI::CheckBox;
… …
1926 my ($self) = @_; 2109 my ($self) = @_;
1927 2110
1928 (6) x 2 2111 (6) x 2
1929} 2112}
1930 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
1931sub button_down { 2122sub invoke_button_down {
1932 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
1933 2124
1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936 $self->{state} = !$self->{state}; 2127 $self->toggle;
1937 $self->_emit (changed => $self->{state}); 2128 } else {
2129 return 0
2130 }
2131
1938 } 2132 1
1939} 2133}
1940 2134
1941sub _draw { 2135sub _draw {
1942 my ($self) = @_; 2136 my ($self) = @_;
1943 2137
… …
1963package CFClient::UI::Image; 2157package CFClient::UI::Image;
1964 2158
1965our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
1966 2160
1967use CFClient::OpenGL; 2161use CFClient::OpenGL;
1968use Carp qw/confess/;
1969 2162
1970our %loaded_images; 2163our %texture_cache;
1971 2164
1972sub new { 2165sub new {
1973 my $class = shift; 2166 my $class = shift;
1974 2167
1975 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
1976 2172
1977 $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";
1978 2175
1979 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1980 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;
1981 2178
1982 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
1983 2180
1984 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986 $self->{aspect} = $tex->{w} / $tex->{h};
1987 2182
1988 $self 2183 $self
1989} 2184}
1990 2185
1991sub size_request { 2186sub size_request {
1992 my ($self) = @_; 2187 my ($self) = @_;
1993 2188
1994 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
1995} 2190}
1996 2191
1997sub _draw { 2192sub _draw {
1998 my ($self) = @_; 2193 my ($self) = @_;
1999 2194
… …
2108 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2109 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2110 2305
2111 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2112 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);
2113 2311
2114 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2115 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;
2116 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
2117 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118 2317
2119 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2318 glBindTexture GL_TEXTURE_2D, $t1->{name};
2120 glBegin GL_QUADS; 2319 glBegin GL_QUADS;
… …
2135 2334
2136 if ($t3) { 2335 if ($t3) {
2137 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2138 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2139 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143 glEnd; 2342 glEnd;
2144 } 2343 }
2145 2344
2146 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2234 $self->update; 2433 $self->update;
2235 2434
2236 $self 2435 $self
2237} 2436}
2238 2437
2239sub changed { }
2240
2241sub set_range { 2438sub set_range {
2242 my ($self, $range) = @_; 2439 my ($self, $range) = @_;
2243 2440
2244 ($range, $self->{range}) = ($self->{range}, $range); 2441 ($range, $self->{range}) = ($self->{range}, $range);
2245 2442
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}"; 2443 if ("@$range" ne "@{$self->{range}}") {
2444 $self->update;
2445 $self->set_value ($self->{range}[0]);
2446 }
2248} 2447}
2249 2448
2250sub set_value { 2449sub set_value {
2251 my ($self, $value) = @_; 2450 my ($self, $value) = @_;
2252 2451
… …
2263 if $unit; 2462 if $unit;
2264 2463
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2464 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266 2465
2267 if ($value != $old_value) { 2466 if ($value != $old_value) {
2268 $self->_emit (changed => $value); 2467 $self->emit (changed => $value);
2269 $self->update; 2468 $self->update;
2270 } 2469 }
2271} 2470}
2272 2471
2273sub size_request { 2472sub size_request {
2274 my ($self) = @_; 2473 my ($self) = @_;
2275 2474
2276 ($self->{req_w}, $self->{req_h}) 2475 ($self->{req_w}, $self->{req_h})
2277} 2476}
2278 2477
2279sub button_down { 2478sub invoke_button_down {
2280 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2281 2480
2282 $self->SUPER::button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2283 2482
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285 2484
2286 $self->mouse_motion ($ev, $x, $y); 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2287} 2486}
2288 2487
2289sub mouse_motion { 2488sub invoke_mouse_motion {
2290 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2291 2490
2292 if ($GRAB == $self) { 2491 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2492 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294 2493
2295 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2494 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296 2495
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2496 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298 2497
2299 $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
2300 } 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
2301} 2514}
2302 2515
2303sub update { 2516sub update {
2304 my ($self) = @_; 2517 my ($self) = @_;
2305 2518
2306 $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}) {
2307 $self->set_value ($self->{range}[0]); 2527 $self->set_value ($self->{range}[0]);
2308 2528
2309 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2529 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100; 2530 my $range = ($hi - $page - $lo) || 1e-100;
2311 2531
… …
2317 $value = ($value - $lo) / $range; 2537 $value = ($value - $lo) / $range;
2318 $value = $value * $self->{scale} + $self->{offset}; 2538 $value = $value * $self->{scale} + $self->{offset};
2319 2539
2320 $self->{knob_x} = $value - $knob_w * 0.5; 2540 $self->{knob_x} = $value - $knob_w * 0.5;
2321 $self->{knob_w} = $knob_w; 2541 $self->{knob_w} = $knob_w;
2322 }); 2542 }
2323
2324 $self->SUPER::update;
2325}
2326
2327sub _draw {
2328 my ($self) = @_;
2329 2543
2330 $self->SUPER::_draw (); 2544 $self->SUPER::_draw ();
2331 2545
2332 glScale $self->{w}, $self->{h}; 2546 glScale $self->{w}, $self->{h};
2333 2547
… …
2394sub set_range { shift->{slider}->set_range (@_) } 2608sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) } 2609sub set_value { shift->{slider}->set_value (@_) }
2396 2610
2397############################################################################# 2611#############################################################################
2398 2612
2399package CFClient::UI::TextView; 2613package CFClient::UI::TextScroller;
2400 2614
2401our @ISA = CFClient::UI::HBox::; 2615our @ISA = CFClient::UI::HBox::;
2402 2616
2403use CFClient::OpenGL; 2617use CFClient::OpenGL;
2404 2618
2405sub new { 2619sub new {
2406 my $class = shift; 2620 my $class = shift;
2407 2621
2408 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2409 fontsize => 1, 2623 fontsize => 1,
2410 can_events => 0, 2624 can_events => 1,
2625 indent => 0,
2411 #font => default_font 2626 #font => default_font
2412 @_, 2627 @_,
2413 2628
2414 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2415 par => [], 2630 par => [],
2416 height => 0, 2631 height => 0,
2417 children => [ 2632 children => [
2418 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2419 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2430 2645
2431 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2432 $self->reflow; 2647 $self->reflow;
2433} 2648}
2434 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
2435sub size_allocate { 2659sub invoke_size_allocate {
2436 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2437 2661
2438 $self->SUPER::size_allocate ($w, $h); 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439 2664
2440 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2441 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442 $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});
2443 2669
2444 $self->reflow; 2670 $self->reflow;
2445}
2446 2671
2447sub text_size { 2672 local $self->{children} = [$empty, $slider];
2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2448 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) = @_;
2449 2688
2450 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2451 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $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});
2454 $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}}
2455 2702 );
2703
2456 $layout->size 2704 $layout
2457} 2705}
2458 2706
2459sub reflow { 2707sub reflow {
2460 my ($self) = @_; 2708 my ($self) = @_;
2461 2709
… …
2470 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2471} 2719}
2472 2720
2473sub clear { 2721sub clear {
2474 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2475 2726
2476 $self->{par} = []; 2727 $self->{par} = [];
2477 $self->{height} = 0; 2728 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479} 2730}
2480 2731
2481sub add_paragraph { 2732sub add_paragraph {
2482 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2483 2734
2484 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2485 my ($w, $h) = $self->text_size ($line); 2736
2486 $self->{height} += $h; 2737 $para = {
2487 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,
2488 } 2744 };
2489 2745
2490 $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;
2491} 2758}
2492 2759
2493sub update { 2760sub update {
2494 my ($self) = @_; 2761 my ($self) = @_;
2495 2762
… …
2497 2764
2498 return unless $self->{h} > 0; 2765 return unless $self->{h} > 0;
2499 2766
2500 delete $self->{texture}; 2767 delete $self->{texture};
2501 2768
2502 $ROOT->on_post_alloc ($self, sub { 2769 $ROOT->on_post_alloc ($self => sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504 2771
2505 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2506 my $height = 0; 2773 my $height = 0;
2507 2774
2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2514 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3]; 2779
2518 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2519 } 2783 }
2520 2784
2521 $height += $_->[1]; 2785 $height += $para->{h};
2522 } 2786 }
2523 2787
2524 $self->{height} = $height; 2788 $self->{height} = $height;
2525 2789
2526 $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]);
2527 2791
2528 delete $self->{texture}; 2792 delete $self->{texture};
2529 } 2793 }
2530 2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2797 }
2798
2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2532 glClearColor 0.5, 0.5, 0.5, 0; 2800 glClearColor 0, 0, 0, 0;
2533 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
2534 2802
2535 my $top = int $self->{children}[1]{range}[0]; 2803 my $top = int $self->{children}[1]{range}[0];
2536 2804
2537 my $y0 = $top; 2805 my $y0 = $top;
2538 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2539 2807
2540 my $y = 0; 2808 my $y = 0;
2541 2809
2542 my $layout = $self->{layout};
2543
2544 $layout->set_font ($self->{font}) if $self->{font};
2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2550 for my $par (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2551 my $h = $par->[1]; 2811 my $h = $para->{h};
2552 2812
2553 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2556 $layout->set_markup ($par->[4]);
2557 2814
2558 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2559 2816
2560 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2561 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 }
2562 } 2831 }
2563 2832
2564 $y += $h; 2833 $y += $h;
2565 } 2834 }
2566
2567 glDisable GL_BLEND;
2568 }; 2835 };
2569 }); 2836 });
2570} 2837}
2571 2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2846}
2847
2572sub _draw { 2848sub _draw {
2573 my ($self) = @_; 2849 my ($self) = @_;
2574 2850
2575 glEnable GL_TEXTURE_2D; 2851 glEnable GL_TEXTURE_2D;
2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2852 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577 glColor 1, 1, 1, 1; 2853 glColor 0, 0, 0, 1;
2578 $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});
2579 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2580 2856
2581 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2582
2583} 2858}
2584 2859
2585############################################################################# 2860#############################################################################
2586 2861
2587package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2674 $tooltip .= "\n\n" . (ref $widget) . "\n" 2949 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2950 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n" 2951 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}"; 2952 . "visible $widget->{visible}";
2678 } 2953 }
2954
2955 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//;
2679 2957
2680 $self->add (new CFClient::UI::Label 2958 $self->add (new CFClient::UI::Label
2681 markup => $tooltip, 2959 markup => $tooltip,
2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683 fontsize => 0.8, 2961 fontsize => 0.8,
… …
2693 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2971 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694 2972
2695 ($w + 4, $h + 4) 2973 ($w + 4, $h + 4)
2696} 2974}
2697 2975
2698sub size_allocate { 2976sub invoke_size_allocate {
2699 my ($self, $w, $h) = @_; 2977 my ($self, $w, $h) = @_;
2700 2978
2701 $self->SUPER::size_allocate ($w - 4, $h - 4); 2979 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702} 2980}
2703 2981
2704sub visibility_change { 2982sub invoke_visibility_change {
2705 my ($self, $visible) = @_; 2983 my ($self, $visible) = @_;
2706 2984
2707 return unless $visible; 2985 return unless $visible;
2708 2986
2709 $self->{root}->on_post_alloc ("move_$self" => sub { 2987 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2711 or return; 2989 or return;
2712 2990
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714 2992
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH; 2994 if $x + $self->{w} > $self->{root}{w};
2717 2995
2718 $self->move_abs ($x, $y); 2996 $self->move_abs ($x, $y);
2719 }); 2997 });
2720} 2998}
2721 2999
… …
2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3088 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2811 3089
2812 if ($tex) { 3090 if ($tex) {
2813 glEnable GL_TEXTURE_2D; 3091 glEnable GL_TEXTURE_2D;
2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815 glColor 1, 1, 1, 1; 3093 glColor 0, 0, 0, 1;
2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3094 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817 glDisable GL_TEXTURE_2D; 3095 glDisable GL_TEXTURE_2D;
2818 } 3096 }
2819} 3097}
2820 3098
2821sub DESTROY { 3099sub destroy {
2822 my ($self) = @_; 3100 my ($self) = @_;
2823 3101
2824 $self->{timer}->cancel 3102 $self->{timer}->cancel
2825 if $self->{timer}; 3103 if $self->{timer};
2826 3104
2827 $self->SUPER::DESTROY; 3105 $self->SUPER::destroy;
2828} 3106}
3107
3108#############################################################################
3109
3110package CFClient::UI::Buttonbar;
3111
3112our @ISA = CFClient::UI::HBox::;
3113
3114# TODO: should actualyl wrap buttons and other goodies.
2829 3115
2830############################################################################# 3116#############################################################################
2831 3117
2832package CFClient::UI::Menu; 3118package CFClient::UI::Menu;
2833 3119
… …
2845 ); 3131 );
2846 3132
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3133 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848 3134
2849 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
2851 3137
2852 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
2853 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 {
2854 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
2855 can_hover => 1, 3155 can_hover => 1,
2856 can_events => 1, 3156 can_events => 1,
2857 text => $widget; 3157 markup => $widget,
3158 tooltip => $tooltip;
3159 }
2858 } 3160 }
2859 3161
2860 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
2861 3163
2862 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
2867 3169
2868# 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)
2869sub popup { 3171sub popup {
2870 my ($self, $ev) = @_; 3172 my ($self, $ev) = @_;
2871 3173
2872 $self->_emit ("popdown"); 3174 $self->emit ("popdown");
2873 3175
2874 # maybe save $GRAB? must be careful about events... 3176 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 3177 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 3178 $self->{button} = $ev->{button};
2877 3179
2878 $self->show; 3180 $self->show;
2879 $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);
2880} 3182}
2881 3183
2882sub mouse_motion { 3184sub invoke_mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 3185 my ($self, $ev, $x, $y) = @_;
2884 3186
2885 # TODO: should use vbox->find_widget or so 3187 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3188 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 3189 $self->{hover} = $self->{item}{$HOVER};
2888}
2889 3190
3191 0
3192}
3193
2890sub button_up { 3194sub invoke_button_up {
2891 my ($self, $ev, $x, $y) = @_; 3195 my ($self, $ev, $x, $y) = @_;
2892 3196
2893 if ($ev->{button} == $self->{button}) { 3197 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 3198 undef $GRAB;
2895 $self->hide; 3199 $self->hide;
2896 3200
2897 $self->_emit ("popdown"); 3201 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 3202 $self->{hover}[1]->() if $self->{hover};
3203 } else {
3204 return 0
3205 }
3206
2899 } 3207 1
2900} 3208}
2901 3209
2902############################################################################# 3210#############################################################################
2903 3211
2904package CFClient::UI::Statusbox; 3212package CFClient::UI::Multiplexer;
2905 3213
2906our @ISA = CFClient::UI::VBox::; 3214our @ISA = CFClient::UI::Container::;
2907 3215
2908sub new { 3216sub new {
2909 my $class = shift; 3217 my $class = shift;
2910 3218
2911 $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 (
2912 fontsize => 0.8, 3398 fontsize => 0.8,
2913 @_, 3399 @_,
2914 ) 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
2915} 3407}
2916 3408
2917sub reorder { 3409sub reorder {
2918 my ($self) = @_; 3410 my ($self) = @_;
2919 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} };
2920 3417
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3418 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3419 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3420 }
2924 3421
… …
2927 my @items = sort { 3424 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3425 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3426 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3427 } values %{ $self->{item} };
2931 3428
3429 $self->{timer}->interval (1);
3430
2932 my $count = 10 + 1; 3431 my $count = 10 + 1;
2933 for my $item (@items) { 3432 for my $item (@items) {
2934 last unless --$count; 3433 last unless --$count;
2935 3434
2936 push @widgets, $item->{label} ||= do { 3435 my $label = $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all) 3436 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1 3437 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}" 3438 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text}; 3439 : $item->{text};
2941 3440
… …
2949 tooltip => $item->{tooltip}, 3448 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP, 3449 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3450 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3451 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3452 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3453 fg => [@{ $item->{fg} }],
2955 can_events => 1, 3454 can_events => 1,
2956 can_hover => 1 3455 can_hover => 1
2957 }; 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;
2958 } 3469 }
2959 3470
2960 $self->clear; 3471 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3472 $self->SUPER::add (reverse @widgets);
2962} 3473}
… …
2967 $text =~ s/^\s+//; 3478 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3479 $text =~ s/\s+$//;
2969 3480
2970 return unless $text; 3481 return unless $text;
2971 3482
2972 my $timeout = time + ((delete $arg{timeout}) || 60); 3483 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973 3484
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3485 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975 3486
2976 if (my $item = $self->{item}{$group}) { 3487 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) { 3488 if ($item->{text} eq $text) {
2978 $item->{count}++; 3489 $item->{count}++;
2979 } else { 3490 } else {
2980 $item->{count} = 1; 3491 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text; 3492 $item->{text} = $item->{tooltip} = $text;
2982 } 3493 }
2983 $item->{id} = ++$self->{id}; 3494 $item->{id} += 0.2;#d#
2984 $item->{timeout} = $timeout; 3495 $item->{timeout} = $timeout;
2985 delete $item->{label}; 3496 delete $item->{label};
2986 } else { 3497 } else {
2987 $self->{item}{$group} = { 3498 $self->{item}{$group} = {
2988 id => ++$self->{id}, 3499 id => ++$self->{id},
… …
2994 count => 1, 3505 count => 1,
2995 %arg, 3506 %arg,
2996 }; 3507 };
2997 } 3508 }
2998 3509
3510 $ROOT->on_refresh (reorder => sub {
2999 $self->reorder; 3511 $self->reorder;
3512 });
3000} 3513}
3001 3514
3002sub reconfigure { 3515sub reconfigure {
3003 my ($self) = @_; 3516 my ($self) = @_;
3004 3517
… …
3007 3520
3008 $self->reorder; 3521 $self->reorder;
3009 $self->SUPER::reconfigure; 3522 $self->SUPER::reconfigure;
3010} 3523}
3011 3524
3525sub destroy {
3526 my ($self) = @_;
3527
3528 $self->{timer}->cancel;
3529
3530 $self->SUPER::destroy;
3531}
3532
3012############################################################################# 3533#############################################################################
3013 3534
3014package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3015 3536
3016our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3017 3538
3018sub new { 3539sub new {
3019 my $class = shift; 3540 my $class = shift;
3020 3541
3021 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3023 @_, 3544 @_,
3024 ); 3545 );
3025 3546
3026 $self 3547 $self
3027} 3548}
3028 3549
3029sub set_items { 3550sub set_items {
3030 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3031 3552
3032 $self->{scrolled}->clear; 3553 $self->clear;
3033 return unless $items; 3554 return unless $items;
3034 3555
3035 my @items = sort { 3556 my @items = sort {
3036 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3038 } @$items; 3559 } values %$items;
3039 3560
3040 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3041 3562
3042 my $row = 0; 3563 my $row = 0;
3043 for my $item (@items) { 3564 for my $item (@items) {
3044 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3045 3566
3046 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3049 3570
3050 $row++; 3571 $row++;
3051 } 3572 }
3052} 3573}
3053 3574
3054############################################################################# 3575#############################################################################
3055 3576
3056package CFClient::UI::BindEditor; 3577package CFClient::UI::SpellList;
3057 3578
3058our @ISA = CFClient::UI::FancyFrame::; 3579our @ISA = CFClient::UI::Table::;
3059 3580
3060sub new { 3581sub new {
3061 my $class = shift; 3582 my $class = shift;
3062 3583
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3584 my $self = $class->SUPER::new (
3585 binding => [],
3586 commands => [],
3587 @_,
3588 )
3589}
3064 3590
3065 $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>";
3066 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");
3067 3603
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button 3604sub rebuild_spell_list {
3069 text => "start recording", 3605 my ($self) = @_;
3070 tooltip => "Start/Stops recording of actions." 3606
3071 ."All subsequent actions after the recording started will be captured." 3607 $CFClient::UI::ROOT->on_refresh ($self => sub {
3072 ."The actions are displayed after the record was stopped." 3608 $self->clear;
3073 ."To bind the action you have to click on the 'Bind' button", 3609
3074 on_activate => sub { 3610 return unless $::CONN;
3075 unless ($self->{recording}) { 3611
3076 $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);
3077 } else { 3639 } else {
3078 $self->stop; 3640 return 0;
3641 }
3642
3643 1
3079 } 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);
3080 }); 3672 }
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 }); 3673 });
3171} 3674}
3172 3675
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3180
3181 $self->clear_command_list;
3182 $self->{recording} = 0;
3183 $self->{rec_btn}->set_text ("start recording");
3184
3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
3203
3204sub update_binding_widgets {
3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell { 3676sub add_spell {
3270 my ($self, $spell) = @_; 3677 my ($self, $spell) = @_;
3678
3271 $self->{spells}->{$spell->{name}} = $spell; 3679 $self->{spell}->{$spell->{name}} = $spell;
3272 3680 $self->rebuild_spell_list;
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300} 3681}
3301 3682
3302sub remove_spell { 3683sub remove_spell {
3303 my ($self, $spell) = @_; 3684 my ($self, $spell) = @_;
3685
3304 delete $self->{spells}->{$spell->{name}}; 3686 delete $self->{spell}->{$spell->{name}};
3305 $self->rebuild_spell_list; 3687 $self->rebuild_spell_list;
3306} 3688}
3307 3689
3690sub clear_spells {
3691 my ($self) = @_;
3692
3693 $self->{spell} = {};
3694 $self->rebuild_spell_list;
3695}
3696
3308############################################################################# 3697#############################################################################
3309 3698
3310package CFClient::UI::Root; 3699package CFClient::UI::Root;
3311 3700
3312our @ISA = CFClient::UI::Container::; 3701our @ISA = CFClient::UI::Container::;
3702
3703use List::Util qw(min max);
3313 3704
3314use CFClient::OpenGL; 3705use CFClient::OpenGL;
3315 3706
3316sub new { 3707sub new {
3317 my $class = shift; 3708 my $class = shift;
… …
3344 $coord = $max - $size if $coord > $max - $size; 3735 $coord = $max - $size if $coord > $max - $size;
3345 3736
3346 int $coord + 0.5 3737 int $coord + 0.5
3347} 3738}
3348 3739
3349sub size_allocate { 3740sub invoke_size_allocate {
3350 my ($self, $w, $h) = @_; 3741 my ($self, $w, $h) = @_;
3351 3742
3352 for my $child ($self->children) { 3743 for my $child ($self->children) {
3353 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)};
3354 3745
… …
3358 $X = _to_pixel $X, $W, $self->{w}; 3749 $X = _to_pixel $X, $W, $self->{w};
3359 $Y = _to_pixel $Y, $H, $self->{h}; 3750 $Y = _to_pixel $Y, $H, $self->{h};
3360 3751
3361 $child->configure ($X, $Y, $W, $H); 3752 $child->configure ($X, $Y, $W, $H);
3362 } 3753 }
3754
3755 1
3363} 3756}
3364 3757
3365sub coord2local { 3758sub coord2local {
3366 my ($self, $x, $y) = @_; 3759 my ($self, $x, $y) = @_;
3367 3760
… …
3452 3845
3453 delete $queue{$widget+0}; 3846 delete $queue{$widget+0};
3454 3847
3455 my ($w, $h) = $widget->size_request; 3848 my ($w, $h) = $widget->size_request;
3456 3849
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3850 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $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};
3459 3855
3460 $w = $widget->{force_w} if exists $widget->{force_w}; 3856 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h}; 3857 $h = $widget->{force_h} if exists $widget->{force_h};
3462 3858
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3859 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3489 3885
3490 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3491 3887
3492 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3493 $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};
3494 3896
3495 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3496 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3497 3899
3498 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