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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.332 by root, Sun Jul 23 08:58:44 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 {
376 # nop 398 # nop
377} 399}
378 400
379sub visible_children { 401sub visible_children {
… …
381} 403}
382 404
383sub set_max_size { 405sub set_max_size {
384 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
385 407
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
388} 412}
389 413
390sub set_tooltip { 414sub set_tooltip {
391 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
392 416
… …
397 421
398 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
399 423
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 427 }
404} 428}
405 429
406# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
407sub coord2local { 431sub coord2local {
408 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
409 433
434 Carp::confess unless $self->{parent};#d#
435
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 437}
412 438
413# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
414sub coord2global { 440sub coord2global {
415 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
416 442
443 Carp::confess unless $self->{parent};#d#
444
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 446}
419 447
420sub focus_in { 448sub invoke_focus_in {
421 my ($self) = @_; 449 my ($self) = @_;
422 450
423 return if $FOCUS == $self; 451 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
425 453
426 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
427 455
428 $self->_emit (focus_in => $focus); 456 $self->update;
429 457
430 $focus->update if $focus; 458 0
431 $FOCUS->update;
432} 459}
433 460
434sub focus_out { 461sub invoke_focus_out {
435 my ($self) = @_; 462 my ($self) = @_;
436 463
437 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
438 465
439 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
440 467
441 $self->_emit (focus_out => $focus); 468 $self->update;
442 469
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 471 unless $FOCUS;
447}
448 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
449sub mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 484sub invoke_button_up { 0 }
451sub key_down { 0 } 485sub invoke_key_down { 0 }
452sub key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
453 488
454sub button_down { 489sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
456 491
457 $self->focus_in; 492 $self->grab_focus;
458 493
459 0 494 0
495}
496
497sub connect {
498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 531}
461 532
462sub find_widget { 533sub find_widget {
463 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
464 535
… …
474sub set_parent { 545sub set_parent {
475 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
476 547
477 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 550}
503 551
504sub realloc { 552sub realloc {
505 my ($self) = @_; 553 my ($self) = @_;
506 554
… …
539 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
540 588
541 # update screen rectangle 589 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 592
547 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 596
551 glPushMatrix; 597 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 599
556 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 602 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 604 glBegin GL_QUADS;
563 glVertex $x , $y; 605 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
567 glEnd; 609 glEnd;
568 glDisable GL_BLEND; 610 glDisable GL_BLEND;
569 } 611 }
570 612
571 if ($ENV{CFPLUS_DEBUG} & 1) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 614 glPushMatrix;
573 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 618 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
580 glEnd; 622 glEnd;
581 glPopMatrix; 623 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 624 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
584} 629}
585 630
586sub _draw { 631sub _draw {
587 my ($self) = @_; 632 my ($self) = @_;
588 633
… …
590} 635}
591 636
592sub DESTROY { 637sub DESTROY {
593 my ($self) = @_; 638 my ($self) = @_;
594 639
640 return if CFClient::in_destruct;
641
595 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
596 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 646}
598 647
599############################################################################# 648#############################################################################
600 649
601package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
626 675
627 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
629 678
630 glEnable GL_BLEND; 679 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 681 glColor_premultiply @$color;
633 682
634 glBegin GL_QUADS; 683 glBegin GL_QUADS;
635 glVertex 0 , 0; 684 glVertex 0 , 0;
636 glVertex 0 , $h; 685 glVertex 0 , $h;
637 glVertex $w, $h; 686 glVertex $w, $h;
… …
682 if $children; 731 if $children;
683 732
684 $self 733 $self
685} 734}
686 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
687sub add { 744sub add {
688 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
689 746
690 $_->set_parent ($self) 747 $_->set_parent ($self)
691 for @widgets; 748 for @widgets;
… …
766} 823}
767 824
768sub add { 825sub add {
769 my ($self, $child) = @_; 826 my ($self, $child) = @_;
770 827
771 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
774} 830}
775 831
776sub remove { 832sub remove {
777 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
786 842
787sub size_request { 843sub size_request {
788 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
789} 845}
790 846
791sub size_allocate { 847sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
793 849
794 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
795} 853}
796 854
797############################################################################# 855#############################################################################
856
857# back-buffered drawing area
798 858
799package CFClient::UI::Window; 859package CFClient::UI::Window;
800 860
801our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
802 862
… …
813 873
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 875 $self->SUPER::update;
816} 876}
817 877
818sub size_allocate { 878sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
820 880
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
823} 884}
824 885
825sub _render { 886sub _render {
826 my ($self) = @_; 887 my ($self) = @_;
827 888
… …
854 my $tex = $self->{texture} 915 my $tex = $self->{texture}
855 or return; 916 or return;
856 917
857 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
860 921
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
862 923
863 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
864} 925}
… …
888 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
889 950
890 ($w, $h) 951 ($w, $h)
891} 952}
892 953
893sub size_allocate { 954sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
895 956
896 my $child = $self->child; 957 my $child = $self->child;
897 958
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 961
901 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
902 $self->update; 963 $self->update;
964
965 1
903} 966}
904 967
905sub set_offset { 968sub set_offset {
906 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
907 970
… …
955package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
956 1019
957our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
958 1021
959sub new { 1022sub new {
960 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
961 1026
962 my $self; 1027 my $self;
963 1028
964 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
965 vertical => 1, 1030 vertical => 1,
… …
968 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
969 }, 1034 },
970 ; 1035 ;
971 1036
972 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
974 slider => $slider, 1040 slider => $slider,
975 @_, 1041 %arg,
976 ); 1042 );
977 1043
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
981 1046
982 $self 1047 $self
983} 1048}
984 1049
1050#TODO# update range on size_allocate depending on child
1051
1052sub add {
1053 my ($self, $widget) = @_;
1054
1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
985sub update { 1074sub update {
986 my ($self) = @_; 1075 my ($self) = @_;
987 1076
988 $self->SUPER::update; 1077 $self->SUPER::update;
989 1078
990 # todo: overwrite size_allocate of child 1079 $self->update_slider;
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1080}
994 1081
995sub size_allocate { 1082sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
997 1084
1085 $self->update_slider;
1086
998 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1088}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1089
1007############################################################################# 1090#############################################################################
1008 1091
1009package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1010 1093
… …
1026 1109
1027 if ($self->{bg}) { 1110 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
1029 1112
1030 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
1033 1116
1034 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1118 glVertex 0 , 0;
1036 glVertex 0 , $h; 1119 glVertex 0 , $h;
1037 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1145
1063sub new { 1146sub new {
1064 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1065 1148
1066 my $title = delete $arg{title};
1067
1068 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1152 border => 0.6,
1072 can_events => 1, 1153 can_events => 1,
1073 min_w => 16, 1154 min_w => 64,
1074 min_h => 16, 1155 min_h => 32,
1075 %arg, 1156 %arg,
1076 ); 1157 );
1077 1158
1078 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1079 align => 0, 1160 align => 0,
1080 valign => 1, 1161 valign => 1,
1081 text => $title, 1162 text => $self->{title},
1082 fontsize => $self->{border} 1163 fontsize => $self->{border},
1083 if defined $title; 1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFClient::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFClient::UI::Container::add ($self->{close_button});
1173 }
1084 1174
1085 $self 1175 $self
1086} 1176}
1087 1177
1088sub add { 1178sub add {
1089 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1090 1180
1091 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1184}
1094 1185
1095sub border { 1186sub border {
1096 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1097} 1188}
1098 1189
1099sub size_request { 1190sub size_request {
1100 my ($self) = @_; 1191 my ($self) = @_;
1101 1192
1102 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1103 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1104 1198
1105 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1106 1200
1107 ( 1201 (
1108 $w + $self->border * 2, 1202 $w + $self->border * 2,
1109 $h + $self->border * 2, 1203 $h + $self->border * 2,
1110 ) 1204 )
1111} 1205}
1112 1206
1113sub size_allocate { 1207sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1115 1209
1116 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1214 }
1121 1215
1122 my $border = $self->border; 1216 my $border = $self->border;
1123 1217
1124 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1220
1221 $self->child->configure ($border, $border, $w, $h);
1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1126 1233
1127 $self->child->configure ($border, $border, $w, $h); 1234 1
1128} 1235}
1129 1236
1130sub button_down { 1237sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1132 1239
1133 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1241 my $border = $self->border;
1135 1242
… …
1151 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1152 1259
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1264 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1265 };
1159 1266
1160 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1166 1273
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1275
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1277 # HACK: the next line is required to enforce placement
1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1279 };
1171 } else { 1280 } else {
1172 return 0; 1281 return 0;
1173 } 1282 }
1174 1283
1175 1 1284 1
1176} 1285}
1177 1286
1178sub button_up { 1287sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1180 1289
1181 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1182} 1291}
1183 1292
1184sub mouse_motion { 1293sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1186 1295
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1297
1189 !!$self->{motion} 1298 ! ! $self->{motion}
1190} 1299}
1191 1300
1192sub _draw { 1301sub _draw {
1193 my ($self) = @_; 1302 my ($self) = @_;
1194 1303
… …
1220 1329
1221 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1222 1331
1223 $child->draw; 1332 $child->draw;
1224 1333
1225 if ($self->{title}) { 1334 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1335 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1228 } 1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1229} 1343}
1230 1344
1231############################################################################# 1345#############################################################################
1232 1346
1233package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1250sub children { 1364sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1252} 1366}
1253 1367
1254sub add { 1368sub add {
1255 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1256 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1257 $child->set_parent ($self); 1373 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1259 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1260 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1261} 1386}
1262 1387
1263# TODO: move to container class maybe? send children a signal on removal? 1388# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1389sub clear {
1265 my ($self) = @_; 1390 my ($self) = @_;
… …
1306 (sum @$ws), 1431 (sum @$ws),
1307 (sum @$hs), 1432 (sum @$hs),
1308 ) 1433 )
1309} 1434}
1310 1435
1311sub size_allocate { 1436sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1313 1438
1314 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1315 1440
1316 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1348 } 1473 }
1349 1474
1350 $y += $row_h; 1475 $y += $row_h;
1351 } 1476 }
1352 1477
1478 1
1353} 1479}
1354 1480
1355sub find_widget { 1481sub find_widget {
1356 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1357 1483
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1522 )
1397} 1523}
1398 1524
1399sub size_allocate { 1525sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1401 1527
1402 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1404 1530
1405 my @req; 1531 my @req;
1406 1532
1407 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1409 } else { 1535 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1412 1538
1413 if ($req > $space) { 1539 if ($req > $space) {
1414 # ah well, not enough space 1540 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1416 } else { 1542 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1544
1419 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1420 1546
1421 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1548 for 0 .. $#children;
1423 } 1549 }
1424 } 1550 }
1425 1551
1426 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1427 1553
1428 my $pos = 0; 1554 my $pos = 0;
1429 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1558
1433 $pos += $alloc; 1559 $pos += $alloc;
1434 } 1560 }
1435 1561
1436 1 1562 1
… …
1526 1652
1527 delete $self->{texture}; 1653 delete $self->{texture};
1528 $self->SUPER::update; 1654 $self->SUPER::update;
1529} 1655}
1530 1656
1657sub realloc {
1658 my ($self) = @_;
1659
1660 delete $self->{ox};
1661 $self->SUPER::realloc;
1662}
1663
1531sub set_text { 1664sub set_text {
1532 my ($self, $text) = @_; 1665 my ($self, $text) = @_;
1533 1666
1534 return if $self->{text} eq "T$text"; 1667 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1668 $self->{text} = "T$text";
1536 1669
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1670 $self->{layout}->set_text ($text);
1539 1671
1672 delete $self->{size_req};
1540 $self->realloc; 1673 $self->realloc;
1541 $self->update; 1674 $self->update;
1542} 1675}
1543 1676
1544sub set_markup { 1677sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1680 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1681 $self->{text} = "M$markup";
1549 1682
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1683 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1684
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1685 $self->{layout}->set_markup ($markup);
1554 1686
1687 delete $self->{size_req};
1555 $self->realloc; 1688 $self->realloc;
1556 $self->update; 1689 $self->update;
1557} 1690}
1558 1691
1559sub size_request { 1692sub size_request {
1560 my ($self) = @_; 1693 my ($self) = @_;
1561 1694
1695 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1696 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1697 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1698 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1699 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1701
1568 my ($w, $h) = $self->{layout}->size; 1702 my ($w, $h) = $self->{layout}->size;
1569 1703
1570 if (exists $self->{template}) { 1704 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1705 $self->{template}->set_font ($self->{font}) if $self->{font};
1706 $self->{template}->set_width ($self->{max_w} || -1);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1707 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1708
1574 my ($w2, $h2) = $self->{template}->size; 1709 my ($w2, $h2) = $self->{template}->size;
1575 1710
1576 $w = List::Util::max $w, $w2; 1711 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1712 $h = List::Util::max $h, $h2;
1713 }
1714
1715 [$w, $h]
1578 } 1716 };
1579 1717
1580 ($w, $h) 1718 @{ $self->{size_req} }
1581} 1719}
1582 1720
1721sub baseline_shift {
1722 $_[0]{layout}->descent
1723}
1724
1583sub size_allocate { 1725sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1726 my ($self, $w, $h) = @_;
1585 1727
1586 delete $self->{ox}; 1728 delete $self->{ox};
1587 1729
1588 delete $self->{texture} 1730 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1731 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1732
1733 1
1590} 1734}
1591 1735
1592sub set_fontsize { 1736sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1737 my ($self, $fontsize) = @_;
1594 1738
1595 $self->{fontsize} = $fontsize; 1739 $self->{fontsize} = $fontsize;
1740 delete $self->{size_req};
1596 delete $self->{texture}; 1741 delete $self->{texture};
1597 1742
1598 $self->realloc; 1743 $self->realloc;
1599} 1744}
1600 1745
1746sub reconfigure {
1747 my ($self) = @_;
1748
1749 delete $self->{size_req};
1750 delete $self->{texture};
1751
1752 $self->SUPER::reconfigure;
1753}
1754
1601sub _draw { 1755sub _draw {
1602 my ($self) = @_; 1756 my ($self) = @_;
1603 1757
1604 $self->SUPER::_draw; # draw background, if applicable 1758 $self->SUPER::_draw; # draw background, if applicable
1605 1759
1606 my $tex = $self->{texture} ||= do { 1760 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1761 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1762 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1763 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1764 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1765 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1766 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1767
1614 new_from_layout CFClient::Texture $self->{layout} 1768 [$self->{layout}->size]
1615 }; 1769 };
1616 1770
1617 unless (exists $self->{ox}) { 1771 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1772 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1773 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1774 : ($self->{w} - $size->[0]) * 0.5);
1621 1775
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1776 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1777 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1778 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1779 };
1626 1780
1627 glEnable GL_TEXTURE_2D; 1781 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1782 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1783
1630 if ($tex->{format} == GL_ALPHA) { 1784 $self->{layout}->render ($self->{ox}, $self->{oy});
1631 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636
1637 glDisable GL_TEXTURE_2D;
1638} 1785}
1639 1786
1640############################################################################# 1787#############################################################################
1641 1788
1642package CFClient::UI::EntryBase; 1789package CFClient::UI::EntryBase;
… …
1656 can_hover => 1, 1803 can_hover => 1,
1657 can_focus => 1, 1804 can_focus => 1,
1658 valign => 0, 1805 valign => 0,
1659 can_events => 1, 1806 can_events => 1,
1660 #text => ... 1807 #text => ...
1808 #hidden => "*",
1661 @_ 1809 @_
1662 ) 1810 )
1663} 1811}
1664 1812
1665sub _set_text { 1813sub _set_text {
… …
1667 1815
1668 delete $self->{cur_h}; 1816 delete $self->{cur_h};
1669 1817
1670 return if $self->{text} eq $text; 1818 return if $self->{text} eq $text;
1671 1819
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1821 $self->{text} = $text;
1676 1822
1677 $text =~ s/./*/g if $self->{hidden}; 1823 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1824 $self->{layout}->set_text ("$text ");
1825 delete $self->{size_req};
1679 1826
1680 $self->_emit (changed => $self->{text}); 1827 $self->emit (changed => $self->{text});
1828
1829 $self->realloc;
1830 $self->update;
1681} 1831}
1682 1832
1683sub set_text { 1833sub set_text {
1684 my ($self, $text) = @_; 1834 my ($self, $text) = @_;
1685 1835
1686 $self->{cursor} = length $text; 1836 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1837 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1838}
1691 1839
1692sub get_text { 1840sub get_text {
1693 $_[0]{text} 1841 $_[0]{text}
1694} 1842}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1847 my ($w, $h) = $self->SUPER::size_request;
1700 1848
1701 ($w + 1, $h) # add 1 for cursor 1849 ($w + 1, $h) # add 1 for cursor
1702} 1850}
1703 1851
1704sub key_down { 1852sub invoke_key_down {
1705 my ($self, $ev) = @_; 1853 my ($self, $ev) = @_;
1706 1854
1707 my $mod = $ev->{mod}; 1855 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1856 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1857 my $uni = $ev->{unicode};
… …
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1869 } elsif ($sym == CFClient::SDLK_HOME) {
1722 $self->{cursor} = 0; 1870 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1871 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text; 1872 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 1873 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1874 $self->emit ('escape');
1727 } elsif ($uni) { 1875 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1876 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1877 } else {
1730 return 0; 1878 return 0;
1731 } 1879 }
… …
1735 $self->realloc; 1883 $self->realloc;
1736 1884
1737 1 1885 1
1738} 1886}
1739 1887
1740sub focus_in { 1888sub invoke_focus_in {
1741 my ($self) = @_; 1889 my ($self) = @_;
1742 1890
1743 $self->{last_activity} = $::NOW; 1891 $self->{last_activity} = $::NOW;
1744 1892
1745 $self->SUPER::focus_in; 1893 $self->SUPER::invoke_focus_in
1746} 1894}
1747 1895
1748sub button_down { 1896sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 1897 my ($self, $ev, $x, $y) = @_;
1750 1898
1751 $self->SUPER::button_down ($ev, $x, $y); 1899 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 1900
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 1901 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 1902
1755 # byte-index to char-index 1903 # byte-index to char-index
1756 my $text = $self->{text}; 1904 my $text = $self->{text};
1757 utf8::encode $text; 1905 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 1906 $self->{cursor} = length $text;
1759 1907
1760 $self->_set_text ($self->{text}); 1908 $self->_set_text ($self->{text});
1761 $self->update; 1909 $self->update;
1762 1910
1763 1 1911 1
1764} 1912}
1765 1913
1766sub mouse_motion { 1914sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1916# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 1917
1770 0 1918 1
1771} 1919}
1772 1920
1773sub _draw { 1921sub _draw {
1774 my ($self) = @_; 1922 my ($self) = @_;
1775 1923
1776 local $self->{fg} = $self->{fg}; 1924 local $self->{fg} = $self->{fg};
1777 1925
1778 if ($FOCUS == $self) { 1926 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 1927 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 1928 $self->{fg} = $self->{active_fg};
1781 } else { 1929 } else {
1782 glColor @{$self->{bg}}; 1930 glColor_premultiply @{$self->{bg}};
1783 } 1931 }
1784 1932
1785 glEnable GL_BLEND; 1933 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1934 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 1935 glBegin GL_QUADS;
1788 glVertex 0 , 0; 1936 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 1937 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 1938 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 1939 glVertex $self->{w}, 0;
… …
1816 1964
1817our @ISA = CFClient::UI::EntryBase::; 1965our @ISA = CFClient::UI::EntryBase::;
1818 1966
1819use CFClient::OpenGL; 1967use CFClient::OpenGL;
1820 1968
1821sub key_down { 1969sub invoke_key_down {
1822 my ($self, $ev) = @_; 1970 my ($self, $ev) = @_;
1823 1971
1824 my $sym = $ev->{sym}; 1972 my $sym = $ev->{sym};
1825 1973
1826 if ($sym == 13) { 1974 if ($sym == 13) {
1827 unshift @{$self->{history}}, 1975 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 1976 my $txt = $self->get_text;
1977
1829 $self->{history_pointer} = -1; 1978 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 1979 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 1980 $self->emit (activate => $txt);
1832 $self->update; 1981 $self->update;
1833 1982
1834 } elsif ($sym == CFClient::SDLK_UP) { 1983 } elsif ($sym == CFClient::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 1984 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 1985 $self->{history_saveback} = $self->get_text;
… …
1852 } else { 2001 } else {
1853 $self->set_text ($self->{history_saveback}); 2002 $self->set_text ($self->{history_saveback});
1854 } 2003 }
1855 2004
1856 } else { 2005 } else {
1857 return $self->SUPER::key_down ($ev) 2006 return $self->SUPER::invoke_key_down ($ev)
1858 } 2007 }
1859 2008
1860 1 2009 1
1861} 2010}
1862 2011
… …
1886 can_events => 1, 2035 can_events => 1,
1887 @_ 2036 @_
1888 ) 2037 )
1889} 2038}
1890 2039
1891sub activate { }
1892
1893sub button_up { 2040sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2041 my ($self, $ev, $x, $y) = @_;
1895 2042
1896 $self->emit ("activate") 2043 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2044 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2045 && $y >= 0 && $y < $self->{h};
… …
1901} 2048}
1902 2049
1903sub _draw { 2050sub _draw {
1904 my ($self) = @_; 2051 my ($self) = @_;
1905 2052
1906 local $self->{fg} = $self->{fg}; 2053 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 2054
1912 glEnable GL_TEXTURE_2D; 2055 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2057 glColor 0, 0, 0, 1;
1915 2058
1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2059 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1917 2060
1918 glDisable GL_TEXTURE_2D; 2061 glDisable GL_TEXTURE_2D;
1919 2062
1920 $self->SUPER::_draw; 2063 $self->SUPER::_draw;
2064}
2065
2066#############################################################################
2067
2068package CFClient::UI::ImageButton;
2069
2070our @ISA = CFClient::UI::Image::;
2071
2072use CFClient::OpenGL;
2073
2074my %textures;
2075
2076sub new {
2077 my $class = shift;
2078
2079 my $self = $class->SUPER::new (
2080 padding_x => 4,
2081 padding_y => 4,
2082 fg => [1, 1, 1],
2083 active_fg => [0, 0, 1],
2084 can_hover => 1,
2085 align => 0,
2086 valign => 0,
2087 can_events => 1,
2088 @_
2089 );
2090}
2091
2092sub invoke_button_up {
2093 my ($self, $ev, $x, $y) = @_;
2094
2095 $self->emit ("activate")
2096 if $x >= 0 && $x < $self->{w}
2097 && $y >= 0 && $y < $self->{h};
2098
2099 1
1921} 2100}
1922 2101
1923############################################################################# 2102#############################################################################
1924 2103
1925package CFClient::UI::CheckBox; 2104package CFClient::UI::CheckBox;
… …
1952 my ($self) = @_; 2131 my ($self) = @_;
1953 2132
1954 (6) x 2 2133 (6) x 2
1955} 2134}
1956 2135
2136sub toggle {
2137 my ($self) = @_;
2138
2139 $self->{state} = !$self->{state};
2140 $self->emit (changed => $self->{state});
2141 $self->update;
2142}
2143
1957sub button_down { 2144sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
1959 2146
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2147 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2148 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2149 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2150 } else {
1965 return 0 2151 return 0
1966 } 2152 }
1967 2153
1968 1 2154 1
… …
1993package CFClient::UI::Image; 2179package CFClient::UI::Image;
1994 2180
1995our @ISA = CFClient::UI::Base::; 2181our @ISA = CFClient::UI::Base::;
1996 2182
1997use CFClient::OpenGL; 2183use CFClient::OpenGL;
1998use Carp qw/confess/;
1999 2184
2000our %loaded_images; 2185our %texture_cache;
2001 2186
2002sub new { 2187sub new {
2003 my $class = shift; 2188 my $class = shift;
2004 2189
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2190 my $self = $class->SUPER::new (
2191 can_events => 0,
2192 @_,
2193 );
2006 2194
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2195 $self->{path} || $self->{tex}
2196 or Carp::croak "'path' or 'tex' attributes required";
2008 2197
2009 $loaded_images{$self->{image}} ||= 2198 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2199 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2011 2200
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2201 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2202
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2203 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2204
2018 $self 2205 $self
2019} 2206}
2020 2207
2021sub size_request { 2208sub size_request {
2022 my ($self) = @_; 2209 my ($self) = @_;
2023 2210
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2211 ($self->{tex}{w}, $self->{tex}{h})
2025} 2212}
2026 2213
2027sub _draw { 2214sub _draw {
2028 my ($self) = @_; 2215 my ($self) = @_;
2029 2216
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2325 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2326 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2327
2141 my $h1 = $self->{h} * (1 - $ycut1); 2328 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2329 my $h2 = $self->{h} * (1 - $ycut2);
2330 my $h3 = $self->{h};
2331
2332 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2333
2144 glEnable GL_BLEND; 2334 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2335 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2336 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2337 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2338 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2339
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2340 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2341 glBegin GL_QUADS;
… …
2165 2356
2166 if ($t3) { 2357 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2358 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2359 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2360 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2361 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2362 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2363 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2364 glEnd;
2174 } 2365 }
2175 2366
2176 glDisable GL_BLEND; 2367 glDisable GL_BLEND;
… …
2264 $self->update; 2455 $self->update;
2265 2456
2266 $self 2457 $self
2267} 2458}
2268 2459
2269sub changed { }
2270
2271sub set_range { 2460sub set_range {
2272 my ($self, $range) = @_; 2461 my ($self, $range) = @_;
2273 2462
2274 ($range, $self->{range}) = ($self->{range}, $range); 2463 ($range, $self->{range}) = ($self->{range}, $range);
2275 2464
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2465 if ("@$range" ne "@{$self->{range}}") {
2466 $self->update;
2467 $self->set_value ($self->{range}[0]);
2468 }
2278} 2469}
2279 2470
2280sub set_value { 2471sub set_value {
2281 my ($self, $value) = @_; 2472 my ($self, $value) = @_;
2282 2473
… …
2293 if $unit; 2484 if $unit;
2294 2485
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2486 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2487
2297 if ($value != $old_value) { 2488 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2489 $self->emit (changed => $value);
2299 $self->update; 2490 $self->update;
2300 } 2491 }
2301} 2492}
2302 2493
2303sub size_request { 2494sub size_request {
2304 my ($self) = @_; 2495 my ($self) = @_;
2305 2496
2306 ($self->{req_w}, $self->{req_h}) 2497 ($self->{req_w}, $self->{req_h})
2307} 2498}
2308 2499
2309sub button_down { 2500sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2501 my ($self, $ev, $x, $y) = @_;
2311 2502
2312 $self->SUPER::button_down ($ev, $x, $y); 2503 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2504
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2505 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2506
2316 $self->mouse_motion ($ev, $x, $y) 2507 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2508}
2318 2509
2319sub mouse_motion { 2510sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2511 my ($self, $ev, $x, $y) = @_;
2321 2512
2322 if ($GRAB == $self) { 2513 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2514 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2515
… …
2332 } 2523 }
2333 2524
2334 1 2525 1
2335} 2526}
2336 2527
2528sub invoke_mouse_wheel {
2529 my ($self, $ev) = @_;
2530
2531 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532
2533 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2534
2535 ! ! $delta
2536}
2537
2337sub update { 2538sub update {
2338 my ($self) = @_; 2539 my ($self) = @_;
2339 2540
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2541 delete $self->{knob_w};
2542 $self->SUPER::update;
2543}
2544
2545sub _draw {
2546 my ($self) = @_;
2547
2548 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2549 $self->set_value ($self->{range}[0]);
2342 2550
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2551 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2552 my $range = ($hi - $page - $lo) || 1e-100;
2345 2553
… …
2351 $value = ($value - $lo) / $range; 2559 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2560 $value = $value * $self->{scale} + $self->{offset};
2353 2561
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2562 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2563 $self->{knob_w} = $knob_w;
2356 }); 2564 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2565
2364 $self->SUPER::_draw (); 2566 $self->SUPER::_draw ();
2365 2567
2366 glScale $self->{w}, $self->{h}; 2568 glScale $self->{w}, $self->{h};
2367 2569
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2630sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2631sub set_value { shift->{slider}->set_value (@_) }
2430 2632
2431############################################################################# 2633#############################################################################
2432 2634
2433package CFClient::UI::TextView; 2635package CFClient::UI::TextScroller;
2434 2636
2435our @ISA = CFClient::UI::HBox::; 2637our @ISA = CFClient::UI::HBox::;
2436 2638
2437use CFClient::OpenGL; 2639use CFClient::OpenGL;
2438 2640
2439sub new { 2641sub new {
2440 my $class = shift; 2642 my $class = shift;
2441 2643
2442 my $self = $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2443 fontsize => 1, 2645 fontsize => 1,
2444 can_events => 0, 2646 can_events => 1,
2647 indent => 0,
2445 #font => default_font 2648 #font => default_font
2446 @_, 2649 @_,
2447 2650
2448 layout => (new CFClient::Layout 1), 2651 layout => (new CFClient::Layout),
2449 par => [], 2652 par => [],
2450 height => 0, 2653 height => 0,
2451 children => [ 2654 children => [
2452 (new CFClient::UI::Empty expand => 1), 2655 (new CFClient::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2656 (new CFClient::UI::Slider vertical => 1),
… …
2464 2667
2465 $self->{fontsize} = $fontsize; 2668 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2669 $self->reflow;
2467} 2670}
2468 2671
2672sub size_request {
2673 my ($self) = @_;
2674
2675 my ($empty, $slider) = @{ $self->{children} };
2676
2677 local $self->{children} = [$empty, $slider];
2678 $self->SUPER::size_request
2679}
2680
2469sub size_allocate { 2681sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2682 my ($self, $w, $h) = @_;
2471 2683
2472 $self->SUPER::size_allocate ($w, $h); 2684 my ($empty, $slider, @other) = @{ $self->{children} };
2685 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2686
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2687 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2688 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2689 $self->{layout}->set_width ($empty->{w});
2690 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2691
2478 $self->reflow; 2692 $self->reflow;
2479}
2480 2693
2481sub text_size { 2694 local $self->{children} = [$empty, $slider];
2695 $self->SUPER::invoke_size_allocate ($w, $h)
2696}
2697
2698sub invoke_mouse_wheel {
2482 my ($self, $text, $indent) = @_; 2699 my ($self, $ev) = @_;
2700
2701 return 0 unless $ev->{dy}; # only vertical movements
2702
2703 $self->{children}[1]->emit (mouse_wheel => $ev);
2704
2705 1
2706}
2707
2708sub get_layout {
2709 my ($self, $para) = @_;
2483 2710
2484 my $layout = $self->{layout}; 2711 my $layout = $self->{layout};
2485 2712
2713 $layout->set_font ($self->{font}) if $self->{font};
2714 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2715 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2716 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2717 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2718 $layout->set_markup ($para->{markup});
2719
2720 $layout->set_shapes (
2721 map
2722 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2723 @{$para->{widget}}
2489 2724 );
2725
2490 $layout->size 2726 $layout
2491} 2727}
2492 2728
2493sub reflow { 2729sub reflow {
2494 my ($self) = @_; 2730 my ($self) = @_;
2495 2731
… …
2504 $self->{children}[1]->set_value ($offset); 2740 $self->{children}[1]->set_value ($offset);
2505} 2741}
2506 2742
2507sub clear { 2743sub clear {
2508 my ($self) = @_; 2744 my ($self) = @_;
2745
2746 my (undef, undef, @other) = @{ $self->{children} };
2747 $self->remove ($_) for @other;
2509 2748
2510 $self->{par} = []; 2749 $self->{par} = [];
2511 $self->{height} = 0; 2750 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2751 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2752}
2514 2753
2515sub add_paragraph { 2754sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2755 my ($self, $color, $para, $indent) = @_;
2517 2756
2518 for my $line (split /\n/, $text) { 2757 my ($text, @w) = ref $para ? @$para : $para;
2519 my ($w, $h) = $self->text_size ($line); 2758
2520 $self->{height} += $h; 2759 $para = {
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2760 w => 1e10,
2761 wrapped => 1,
2762 fg => $color,
2763 indent => $indent,
2764 markup => $text,
2765 widget => \@w,
2522 } 2766 };
2523 2767
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2768 $self->add (@w) if @w;
2769 push @{$self->{par}}, $para;
2770
2771 $self->{need_reflow}++;
2772 $self->update;
2773}
2774
2775sub scroll_to_bottom {
2776 my ($self) = @_;
2777
2778 $self->{scroll_to_bottom} = 1;
2779 $self->update;
2525} 2780}
2526 2781
2527sub update { 2782sub update {
2528 my ($self) = @_; 2783 my ($self) = @_;
2529 2784
… …
2531 2786
2532 return unless $self->{h} > 0; 2787 return unless $self->{h} > 0;
2533 2788
2534 delete $self->{texture}; 2789 delete $self->{texture};
2535 2790
2536 $ROOT->on_post_alloc ($self, sub { 2791 $ROOT->on_post_alloc ($self => sub {
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2792 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2793
2539 if (delete $self->{need_reflow}) { 2794 if (delete $self->{need_reflow}) {
2540 my $height = 0; 2795 my $height = 0;
2541 2796
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) { 2797 for my $para (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2798 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2548 $layout->set_width ($W - $_->[3]); 2799 my $layout = $self->get_layout ($para);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size; 2800 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3]; 2801
2552 $_->[1] = $h; 2802 $para->{w} = $w + $para->{indent};
2803 $para->{h} = $h;
2804 $para->{wrapped} = $layout->has_wrapped;
2553 } 2805 }
2554 2806
2555 $height += $_->[1]; 2807 $height += $para->{h};
2556 } 2808 }
2557 2809
2558 $self->{height} = $height; 2810 $self->{height} = $height;
2559 2811
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2812 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2561 2813
2562 delete $self->{texture}; 2814 delete $self->{texture};
2563 } 2815 }
2564 2816
2817 if (delete $self->{scroll_to_bottom}) {
2818 $self->{children}[1]->set_value (1e10);
2819 }
2820
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2821 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2822 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2823 glClear GL_COLOR_BUFFER_BIT;
2568 2824
2569 my $top = int $self->{children}[1]{range}[0]; 2825 my $top = int $self->{children}[1]{range}[0];
2570 2826
2571 my $y0 = $top; 2827 my $y0 = $top;
2572 my $y1 = $top + $H; 2828 my $y1 = $top + $H;
2573 2829
2574 my $y = 0; 2830 my $y = 0;
2575 2831
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2584 for my $par (@{$self->{par}}) { 2832 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2833 my $h = $para->{h};
2586 2834
2587 if ($y0 < $y + $h && $y < $y1) { 2835 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] });
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 2836
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2837 my $layout = $self->get_layout ($para);
2593 2838
2594 glRasterPos $par->[3], $y - $y0; 2839 $layout->render ($para->{indent}, $y - $y0);
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2840
2841 if (my @w = @{ $para->{widget} }) {
2842 my @s = $layout->get_shapes;
2843
2844 for (@w) {
2845 my ($dx, $dy) = splice @s, 0, 2, ();
2846
2847 $_->{x} = $dx + $para->{indent};
2848 $_->{y} = $dy + $y - $y0;
2849
2850 $_->draw;
2851 }
2852 }
2596 } 2853 }
2597 2854
2598 $y += $h; 2855 $y += $h;
2599 } 2856 }
2600
2601 glDisable GL_BLEND;
2602 }; 2857 };
2603 }); 2858 });
2604} 2859}
2605 2860
2861sub reconfigure {
2862 my ($self) = @_;
2863
2864 $self->SUPER::reconfigure;
2865
2866 $_->{w} = 1e10 for @{ $self->{par} };
2867 $self->reflow;
2868}
2869
2606sub _draw { 2870sub _draw {
2607 my ($self) = @_; 2871 my ($self) = @_;
2608 2872
2609 glEnable GL_TEXTURE_2D; 2873 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2874 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 2875 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2876 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 2877 glDisable GL_TEXTURE_2D;
2614 2878
2615 $self->{children}[1]->draw; 2879 $self->{children}[1]->draw;
2616
2617} 2880}
2618 2881
2619############################################################################# 2882#############################################################################
2620 2883
2621package CFClient::UI::Animator; 2884package CFClient::UI::Animator;
… …
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 2971 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2972 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 2973 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 2974 . "visible $widget->{visible}";
2712 } 2975 }
2976
2977 $tooltip =~ s/^\n+//;
2978 $tooltip =~ s/\n+$//;
2713 2979
2714 $self->add (new CFClient::UI::Label 2980 $self->add (new CFClient::UI::Label
2715 markup => $tooltip, 2981 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2982 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 2983 fontsize => 0.8,
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2993 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 2994
2729 ($w + 4, $h + 4) 2995 ($w + 4, $h + 4)
2730} 2996}
2731 2997
2732sub size_allocate { 2998sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 2999 my ($self, $w, $h) = @_;
2734 3000
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 3001 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 3002}
2737 3003
2738sub visibility_change { 3004sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 3005 my ($self, $visible) = @_;
2740 3006
2741 return unless $visible; 3007 return unless $visible;
2742 3008
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 3009 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner} 3010 my $widget = $self->{owner}
2745 or return; 3011 or return;
2746 3012
3013 if ($widget->{visible}) {
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3014 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 3015
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3016 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 3017 if $x + $self->{w} > $self->{root}{w};
2751 3018
2752 $self->move_abs ($x, $y); 3019 $self->move_abs ($x, $y);
3020 } else {
3021 $self->hide;
3022 }
2753 }); 3023 });
2754} 3024}
2755 3025
2756sub _draw { 3026sub _draw {
2757 my ($self) = @_; 3027 my ($self) = @_;
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3114 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3115
2846 if ($tex) { 3116 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3117 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3119 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3120 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3121 glDisable GL_TEXTURE_2D;
2852 } 3122 }
2853} 3123}
2854 3124
2855sub DESTROY { 3125sub destroy {
2856 my ($self) = @_; 3126 my ($self) = @_;
2857 3127
2858 $self->{timer}->cancel 3128 $self->{timer}->cancel
2859 if $self->{timer}; 3129 if $self->{timer};
2860 3130
2861 $self->SUPER::DESTROY; 3131 $self->SUPER::destroy;
2862} 3132}
2863 3133
2864############################################################################# 3134#############################################################################
2865 3135
2866package CFClient::UI::Buttonbar; 3136package CFClient::UI::Buttonbar;
… …
2887 ); 3157 );
2888 3158
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3159 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2890 3160
2891 for my $item (@{ $self->{items} }) { 3161 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3162 my ($widget, $cb, $tooltip) = @$item;
2893 3163
2894 # handle various types of items, only text for now 3164 # handle various types of items, only text for now
2895 if (!ref $widget) { 3165 if (!ref $widget) {
3166 if ($widget =~ /\t/) {
3167 my ($left, $right) = split /\t/, $widget, 2;
3168
3169 $widget = new CFClient::UI::HBox
3170 can_hover => 1,
3171 can_events => 1,
3172 tooltip => $tooltip,
3173 children => [
3174 (new CFClient::UI::Label markup => $left, expand => 1),
3175 (new CFClient::UI::Label markup => $right, align => +1),
3176 ],
3177 ;
3178
3179 } else {
2896 $widget = new CFClient::UI::Label 3180 $widget = new CFClient::UI::Label
2897 can_hover => 1, 3181 can_hover => 1,
2898 can_events => 1, 3182 can_events => 1,
2899 text => $widget; 3183 markup => $widget,
3184 tooltip => $tooltip;
3185 }
2900 } 3186 }
2901 3187
2902 $self->{item}{$widget} = $item; 3188 $self->{item}{$widget} = $item;
2903 3189
2904 $self->{vbox}->add ($widget); 3190 $self->{vbox}->add ($widget);
… …
2909 3195
2910# popup given the event (must be a mouse button down event currently) 3196# popup given the event (must be a mouse button down event currently)
2911sub popup { 3197sub popup {
2912 my ($self, $ev) = @_; 3198 my ($self, $ev) = @_;
2913 3199
2914 $self->_emit ("popdown"); 3200 $self->emit ("popdown");
2915 3201
2916 # maybe save $GRAB? must be careful about events... 3202 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3203 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3204 $self->{button} = $ev->{button};
2919 3205
2920 $self->show; 3206 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3207 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3208}
2923 3209
2924sub mouse_motion { 3210sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3211 my ($self, $ev, $x, $y) = @_;
2926 3212
2927 # TODO: should use vbox->find_widget or so 3213 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3214 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3215 $self->{hover} = $self->{item}{$HOVER};
2930 3216
2931 0 3217 0
2932} 3218}
2933 3219
2934sub button_up { 3220sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3221 my ($self, $ev, $x, $y) = @_;
2936 3222
2937 if ($ev->{button} == $self->{button}) { 3223 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3224 undef $GRAB;
2939 $self->hide; 3225 $self->hide;
2940 3226
2941 $self->_emit ("popdown"); 3227 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3228 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3229 } else {
2944 return 0 3230 return 0
2945 } 3231 }
2946 3232
… …
2973 3259
2974 $self->{current} = $self->{children}[0] 3260 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3261 if @{ $self->{children} };
2976} 3262}
2977 3263
3264sub get_current_page {
3265 my ($self) = @_;
3266
3267 $self->{current}
3268}
3269
2978sub set_current_page { 3270sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3271 my ($self, $page_or_widget) = @_;
2980 3272
2981 my $widget = ref $page_or_widget 3273 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3274 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3275 : $self->{children}[$page_or_widget];
2984 3276
2985 $self->{current} = $widget; 3277 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3278 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3279
2988 $self->_emit (page_changed => $self->{current}); 3280 $self->emit (page_changed => $self->{current});
2989 3281
2990 $self->realloc; 3282 $self->realloc;
2991} 3283}
2992 3284
2993sub visible_children { 3285sub visible_children {
… …
2998 my ($self) = @_; 3290 my ($self) = @_;
2999 3291
3000 $self->{current}->size_request 3292 $self->{current}->size_request
3001} 3293}
3002 3294
3003sub size_allocate { 3295sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3296 my ($self, $w, $h) = @_;
3005 3297
3006 $self->{current}->configure (0, 0, $w, $h); 3298 $self->{current}->configure (0, 0, $w, $h);
3299
3300 1
3007} 3301}
3008 3302
3009sub _draw { 3303sub _draw {
3010 my ($self) = @_; 3304 my ($self) = @_;
3011 3305
… …
3022 my $class = shift; 3316 my $class = shift;
3023 3317
3024 my $self = $class->SUPER::new ( 3318 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3319 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3320 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3321 # filter => # will be put between multiplexer and $self
3027 @_, 3322 @_,
3028 ); 3323 );
3029 3324
3325 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3326 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3327
3032 $self 3328 $self
3033} 3329}
3034 3330
3035sub add { 3331sub add {
… …
3044 ); 3340 );
3045 3341
3046 $self->{multiplexer}->add ($widget); 3342 $self->{multiplexer}->add ($widget);
3047} 3343}
3048 3344
3345sub get_current_page {
3346 my ($self) = @_;
3347
3348 $self->{multiplexer}->get_current_page
3349}
3350
3049sub set_current_page { 3351sub set_current_page {
3050 my ($self, $page) = @_; 3352 my ($self, $page) = @_;
3051 3353
3052 $self->{multiplexer}->set_current_page ($page); 3354 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3355 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3356}
3055 3357
3056############################################################################# 3358#############################################################################
3057 3359
3058package CFClient::UI::Statusbox; 3360package CFClient::UI::Combobox;
3059 3361
3362use utf8;
3363
3060our @ISA = CFClient::UI::VBox::; 3364our @ISA = CFClient::UI::Button::;
3061 3365
3062sub new { 3366sub new {
3063 my $class = shift; 3367 my $class = shift;
3064 3368
3065 $class->SUPER::new ( 3369 my $self = $class->SUPER::new (
3370 options => [], # [value, title, longdesc], ...
3371 value => undef,
3372 @_,
3373 );
3374
3375 $self->_set_value ($self->{value});
3376
3377 $self
3378}
3379
3380sub invoke_button_down {
3381 my ($self, $ev) = @_;
3382
3383 my @menu_items;
3384
3385 for (@{ $self->{options} }) {
3386 my ($value, $title, $tooltip) = @$_;
3387
3388 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389 }
3390
3391 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392}
3393
3394sub _set_value {
3395 my ($self, $value) = @_;
3396
3397 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3398 or return;
3399
3400 $self->{value} = $item->[0];
3401 $self->set_markup ("$item->[1] ⇓");
3402 $self->set_tooltip ($item->[2]);
3403}
3404
3405sub set_value {
3406 my ($self, $value) = @_;
3407
3408 return unless $self->{value} ne $value;
3409
3410 $self->_set_value ($value);
3411 $self->emit (changed => $value);
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::Statusbox;
3417
3418our @ISA = CFClient::UI::VBox::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3424 fontsize => 0.8,
3067 @_, 3425 @_,
3068 ) 3426 );
3427
3428 Scalar::Util::weaken (my $this = $self);
3429
3430 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3431
3432 $self
3069} 3433}
3070 3434
3071sub reorder { 3435sub reorder {
3072 my ($self) = @_; 3436 my ($self) = @_;
3073 my $NOW = time; 3437 my $NOW = Time::HiRes::time;
3438
3439 # freeze display when hovering over any label
3440 return if $CFClient::UI::TOOLTIP->{owner}
3441 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3442 values %{ $self->{item} };
3074 3443
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3444 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3445 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3446 }
3078 3447
… …
3081 my @items = sort { 3450 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3451 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3452 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3453 } values %{ $self->{item} };
3085 3454
3455 $self->{timer}->interval (1);
3456
3086 my $count = 10 + 1; 3457 my $count = 10 + 1;
3087 for my $item (@items) { 3458 for my $item (@items) {
3088 last unless --$count; 3459 last unless --$count;
3089 3460
3090 push @widgets, $item->{label} ||= do { 3461 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3462 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3463 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3464 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3465 : $item->{text};
3095 3466
… …
3103 tooltip => $item->{tooltip}, 3474 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3475 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3476 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3477 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3478 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3479 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3480 can_events => 1,
3110 can_hover => 1 3481 can_hover => 1
3111 }; 3482 };
3483
3484 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3485 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3486 $label->update;
3487 $label->set_max_size (undef, $label->{req_h} * $diff)
3488 if $diff < 1;
3489 $self->{timer}->interval (1/30);
3490 } else {
3491 $label->{fg}[3] = $item->{fg}[3] || 1;
3492 }
3493
3494 push @widgets, $label;
3112 } 3495 }
3113 3496
3114 $self->clear; 3497 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3498 $self->SUPER::add (reverse @widgets);
3116} 3499}
… …
3121 $text =~ s/^\s+//; 3504 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3505 $text =~ s/\s+$//;
3123 3506
3124 return unless $text; 3507 return unless $text;
3125 3508
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3509 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3510
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3511 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3512
3130 if (my $item = $self->{item}{$group}) { 3513 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3514 if ($item->{text} eq $text) {
3132 $item->{count}++; 3515 $item->{count}++;
3133 } else { 3516 } else {
3134 $item->{count} = 1; 3517 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3518 $item->{text} = $item->{tooltip} = $text;
3136 } 3519 }
3137 $item->{id} = ++$self->{id}; 3520 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3521 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3522 delete $item->{label};
3140 } else { 3523 } else {
3141 $self->{item}{$group} = { 3524 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3525 id => ++$self->{id},
… …
3148 count => 1, 3531 count => 1,
3149 %arg, 3532 %arg,
3150 }; 3533 };
3151 } 3534 }
3152 3535
3536 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3537 $self->reorder;
3538 });
3154} 3539}
3155 3540
3156sub reconfigure { 3541sub reconfigure {
3157 my ($self) = @_; 3542 my ($self) = @_;
3158 3543
… …
3161 3546
3162 $self->reorder; 3547 $self->reorder;
3163 $self->SUPER::reconfigure; 3548 $self->SUPER::reconfigure;
3164} 3549}
3165 3550
3551sub destroy {
3552 my ($self) = @_;
3553
3554 $self->{timer}->cancel;
3555
3556 $self->SUPER::destroy;
3557}
3558
3166############################################################################# 3559#############################################################################
3167 3560
3168package CFClient::UI::Inventory; 3561package CFClient::UI::Inventory;
3169 3562
3170our @ISA = CFClient::UI::ScrolledWindow::; 3563our @ISA = CFClient::UI::Table::;
3171 3564
3172sub new { 3565sub new {
3173 my $class = shift; 3566 my $class = shift;
3174 3567
3175 my $self = $class->SUPER::new ( 3568 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3569 col_expand => [0, 1, 0],
3570 items => [],
3177 @_, 3571 @_,
3178 ); 3572 );
3179 3573
3574 $self->set_sort_order (undef);
3575
3180 $self 3576 $self
3577}
3578
3579sub update_items {
3580 my ($self) = @_;
3581
3582 $self->clear;
3583
3584 my @item = $self->{sort}->(@{ $self->{items} });
3585
3586 my @adds;
3587 my $row = 0;
3588 for my $item ($self->{sort}->(@{ $self->{items} })) {
3589 CFClient::Item::update_widgets $item;
3590
3591 push @adds, 0, $row, $item->{face_widget};
3592 push @adds, 1, $row, $item->{desc_widget};
3593 push @adds, 2, $row, $item->{weight_widget};
3594
3595 $row++;
3596 }
3597
3598 $self->add (@adds);
3599}
3600
3601sub set_sort_order {
3602 my ($self, $order) = @_;
3603
3604 $self->{sort} = $order ||= sub {
3605 sort {
3606 $a->{type} <=> $b->{type}
3607 or $a->{name} cmp $b->{name}
3608 } @_
3609 };
3610
3611 $self->update_items;
3181} 3612}
3182 3613
3183sub set_items { 3614sub set_items {
3184 my ($self, $items) = @_; 3615 my ($self, $items) = @_;
3185 3616
3186 $self->{scrolled}->clear; 3617 $self->{items} = [$items ? values %$items : ()];
3187 return unless $items; 3618 $self->update_items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206} 3619}
3207 3620
3208############################################################################# 3621#############################################################################
3209 3622
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList; 3623package CFClient::UI::SpellList;
3408 3624
3409our @ISA = CFClient::UI::ScrolledWindow::; 3625our @ISA = CFClient::UI::Table::;
3410 3626
3411sub new { 3627sub new {
3412 my $class = shift; 3628 my $class = shift;
3413 3629
3414 my $self = $class->SUPER::new ( 3630 my $self = $class->SUPER::new (
3415 binding => [], 3631 binding => [],
3416 commands => [], 3632 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3633 @_,
3419 ) 3634 )
3420} 3635}
3421 3636
3422# XXX: Do sorting? Argl... 3637my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3638
3639my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3641my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3642 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3643my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3645my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3647my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649
3650sub rebuild_spell_list {
3651 my ($self) = @_;
3652
3653 $CFClient::UI::ROOT->on_refresh ($self => sub {
3654 $self->clear;
3655
3656 return unless $::CONN;
3657
3658 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663
3664 my $row = 0;
3665
3666 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667 my $spell = $self->{spell}{$_};
3668
3669 $row++;
3670
3671 my $spell_cb = sub {
3672 my ($widget, $ev) = @_;
3673
3674 if ($ev->{button} == 1) {
3675 $::CONN->user_send ("cast $spell->{name}");
3676 } elsif ($ev->{button} == 2) {
3677 $::CONN->user_send ("invoke $spell->{name}");
3678 } elsif ($ev->{button} == 3) {
3679 (new CFClient::UI::Menu
3680 items => [
3681 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683 ],
3684 )->popup ($ev);
3685 } else {
3686 return 0;
3687 }
3688
3689 1
3690 };
3691
3692 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3693
3694 #TODO: add path info to tooltip
3695 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3696
3697 $self->add (0, $row, new CFClient::UI::Face
3698 face => $spell->{face},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (1, $row, new CFClient::UI::Label
3706 expand => 1,
3707 text => $spell->{name},
3708 can_hover => 1,
3709 can_events => 1,
3710 tooltip => $tooltip,
3711 on_button_down => $spell_cb,
3712 );
3713
3714 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718 }
3719 });
3720}
3721
3423sub add_spell { 3722sub add_spell {
3424 my ($self, $spell) = @_; 3723 my ($self, $spell) = @_;
3724
3425 $self->{spells}->{$spell->{name}} = $spell; 3725 $self->{spell}->{$spell->{name}} = $spell;
3426 3726 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3727}
3455 3728
3456sub remove_spell { 3729sub remove_spell {
3457 my ($self, $spell) = @_; 3730 my ($self, $spell) = @_;
3731
3458 delete $self->{spells}->{$spell->{name}}; 3732 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3733 $self->rebuild_spell_list;
3460} 3734}
3461 3735
3736sub clear_spells {
3737 my ($self) = @_;
3738
3739 $self->{spell} = {};
3740 $self->rebuild_spell_list;
3741}
3742
3462############################################################################# 3743#############################################################################
3463 3744
3464package CFClient::UI::Root; 3745package CFClient::UI::Root;
3465 3746
3466our @ISA = CFClient::UI::Container::; 3747our @ISA = CFClient::UI::Container::;
3748
3749use List::Util qw(min max);
3467 3750
3468use CFClient::OpenGL; 3751use CFClient::OpenGL;
3469 3752
3470sub new { 3753sub new {
3471 my $class = shift; 3754 my $class = shift;
… …
3498 $coord = $max - $size if $coord > $max - $size; 3781 $coord = $max - $size if $coord > $max - $size;
3499 3782
3500 int $coord + 0.5 3783 int $coord + 0.5
3501} 3784}
3502 3785
3503sub size_allocate { 3786sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3787 my ($self, $w, $h) = @_;
3505 3788
3506 for my $child ($self->children) { 3789 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3790 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3791
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3795 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3796 $Y = _to_pixel $Y, $H, $self->{h};
3514 3797
3515 $child->configure ($X, $Y, $W, $H); 3798 $child->configure ($X, $Y, $W, $H);
3516 } 3799 }
3800
3801 1
3517} 3802}
3518 3803
3519sub coord2local { 3804sub coord2local {
3520 my ($self, $x, $y) = @_; 3805 my ($self, $x, $y) = @_;
3521 3806
… …
3606 3891
3607 delete $queue{$widget+0}; 3892 delete $queue{$widget+0};
3608 3893
3609 my ($w, $h) = $widget->size_request; 3894 my ($w, $h) = $widget->size_request;
3610 3895
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3896 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3897 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3898
3899 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3900 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3901
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3902 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3903 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3904
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3905 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 3931
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3932 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 3933
3646 $w = 0 if $w < 0; 3934 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 3935 $h = 0 if $h < 0;
3936
3937 $w = max $widget->{min_w}, $w;
3938 $h = max $widget->{min_h}, $h;
3939
3940 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 3942
3649 $w = int $w + 0.5; 3943 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 3944 $h = int $h + 0.5;
3651 3945
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3946 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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