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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.334 by root, Sun Jul 23 16:11:12 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
… …
970 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
971 }, 1034 },
972 ; 1035 ;
973 1036
974 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
975 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
976 slider => $slider, 1040 slider => $slider,
977 %arg, 1041 %arg,
978 ); 1042 );
979 1043
980 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
982 1046
983 $self 1047 $self
984} 1048}
985 1049
1050#TODO# update range on size_allocate depending on child
1051
986sub add { 1052sub add {
987 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
988 1054
989 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
990} 1056}
991 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
992sub update { 1074sub update {
993 my ($self) = @_; 1075 my ($self) = @_;
994 1076
995 $self->SUPER::update; 1077 $self->SUPER::update;
996 1078
997 # todo: overwrite size_allocate of child 1079 $self->update_slider;
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000} 1080}
1001 1081
1002sub size_allocate { 1082sub invoke_size_allocate {
1003 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1004 1084
1085 $self->update_slider;
1086
1005 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009} 1088}
1010
1011#TODO# update range on size_allocate depending on child
1012# update viewport offset on scroll
1013 1089
1014############################################################################# 1090#############################################################################
1015 1091
1016package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1017 1093
… …
1033 1109
1034 if ($self->{bg}) { 1110 if ($self->{bg}) {
1035 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
1036 1112
1037 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
1038 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1039 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
1040 1116
1041 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
1042 glVertex 0 , 0; 1118 glVertex 0 , 0;
1043 glVertex 0 , $h; 1119 glVertex 0 , $h;
1044 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1068 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);
1069 1145
1070sub new { 1146sub new {
1071 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1072 1148
1073 my $title = delete $arg{title};
1074
1075 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1152 border => 0.6,
1079 can_events => 1, 1153 can_events => 1,
1080 min_w => 16, 1154 min_w => 64,
1081 min_h => 16, 1155 min_h => 32,
1082 %arg, 1156 %arg,
1083 ); 1157 );
1084 1158
1085 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1160 align => 0,
1087 valign => 1, 1161 valign => 1,
1088 text => $title, 1162 text => $self->{title},
1089 fontsize => $self->{border} 1163 fontsize => $self->{border},
1090 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 }
1091 1174
1092 $self 1175 $self
1093} 1176}
1094 1177
1095sub add { 1178sub add {
1096 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1097 1180
1098 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1100} 1184}
1101 1185
1102sub border { 1186sub border {
1103 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1104} 1188}
1105 1189
1106sub size_request { 1190sub size_request {
1107 my ($self) = @_; 1191 my ($self) = @_;
1108 1192
1109 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1110 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1111 1198
1112 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1113 1200
1114 ( 1201 (
1115 $w + $self->border * 2, 1202 $w + $self->border * 2,
1116 $h + $self->border * 2, 1203 $h + $self->border * 2,
1117 ) 1204 )
1118} 1205}
1119 1206
1120sub size_allocate { 1207sub invoke_size_allocate {
1121 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1122 1209
1123 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1124 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1125 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1127 } 1214 }
1128 1215
1129 my $border = $self->border; 1216 my $border = $self->border;
1130 1217
1131 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1132 $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;
1133 1233
1134 $self->child->configure ($border, $border, $w, $h); 1234 1
1135} 1235}
1136 1236
1137sub button_down { 1237sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1139 1239
1140 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1141 my $border = $self->border; 1241 my $border = $self->border;
1142 1242
… …
1158 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1159 1259
1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162 1262
1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1163 $self->realloc; 1264 $self->realloc;
1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 }; 1265 };
1166 1266
1167 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1168 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1169 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1172 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1173 1273
1174 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1175 1275
1176 $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});
1177 }; 1279 };
1178 } else { 1280 } else {
1179 return 0; 1281 return 0;
1180 } 1282 }
1181 1283
1182 1 1284 1
1183} 1285}
1184 1286
1185sub button_up { 1287sub invoke_button_up {
1186 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1187 1289
1188 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1189} 1291}
1190 1292
1191sub mouse_motion { 1293sub invoke_mouse_motion {
1192 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1193 1295
1194 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195 1297
1196 !!$self->{motion} 1298 ! ! $self->{motion}
1197} 1299}
1198 1300
1199sub _draw { 1301sub _draw {
1200 my ($self) = @_; 1302 my ($self) = @_;
1201 1303
… …
1227 1329
1228 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1229 1331
1230 $child->draw; 1332 $child->draw;
1231 1333
1232 if ($self->{title}) { 1334 if ($self->{title_widget}) {
1233 glTranslate 0, $border - $self->{h}; 1335 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw; 1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1235 } 1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1236} 1343}
1237 1344
1238############################################################################# 1345#############################################################################
1239 1346
1240package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1257sub children { 1364sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1259} 1366}
1260 1367
1261sub add { 1368sub add {
1262 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1263 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1264 $child->set_parent ($self); 1373 $child->set_parent ($self);
1265 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1266 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1267 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1268} 1386}
1269 1387
1270# 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?
1271sub clear { 1389sub clear {
1272 my ($self) = @_; 1390 my ($self) = @_;
… …
1313 (sum @$ws), 1431 (sum @$ws),
1314 (sum @$hs), 1432 (sum @$hs),
1315 ) 1433 )
1316} 1434}
1317 1435
1318sub size_allocate { 1436sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1320 1438
1321 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1322 1440
1323 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1355 } 1473 }
1356 1474
1357 $y += $row_h; 1475 $y += $row_h;
1358 } 1476 }
1359 1477
1478 1
1360} 1479}
1361 1480
1362sub find_widget { 1481sub find_widget {
1363 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1364 1483
… …
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 ) 1522 )
1404} 1523}
1405 1524
1406sub size_allocate { 1525sub invoke_size_allocate {
1407 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1408 1527
1409 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1410 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1411 1530
1412 my @req; 1531 my @req;
1413 1532
1414 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1415 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1416 } else { 1535 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1418 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1419 1538
1420 if ($req > $space) { 1539 if ($req > $space) {
1421 # ah well, not enough space 1540 # ah well, not enough space
1422 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1423 } else { 1542 } else {
1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1425 1544
1426 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1427 1546
1428 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1429 for 0 .. $#$children; 1548 for 0 .. $#children;
1430 } 1549 }
1431 } 1550 }
1432 1551
1433 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1434 1553
1435 my $pos = 0; 1554 my $pos = 0;
1436 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1437 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1438 $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));
1439 1558
1440 $pos += $alloc; 1559 $pos += $alloc;
1441 } 1560 }
1442 1561
1443 1 1562 1
… …
1516 } 1635 }
1517 1636
1518 $self 1637 $self
1519} 1638}
1520 1639
1521sub escape($) {
1522 local $_ = $_[0];
1523
1524 s/&/&amp;/g;
1525 s/>/&gt;/g;
1526 s/</&lt;/g;
1527
1528 $_
1529}
1530
1531sub update { 1640sub update {
1532 my ($self) = @_; 1641 my ($self) = @_;
1533 1642
1534 delete $self->{texture}; 1643 delete $self->{texture};
1535 $self->SUPER::update; 1644 $self->SUPER::update;
1536} 1645}
1537 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1538sub set_text { 1654sub set_text {
1539 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1540 1656
1541 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1542 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1543 1659
1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1545 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1546 1661
1662 delete $self->{size_req};
1547 $self->realloc; 1663 $self->realloc;
1548 $self->update; 1664 $self->update;
1549} 1665}
1550 1666
1551sub set_markup { 1667sub set_markup {
… …
1554 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1555 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1556 1672
1557 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1558 1674
1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1560 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1561 1676
1677 delete $self->{size_req};
1562 $self->realloc; 1678 $self->realloc;
1563 $self->update; 1679 $self->update;
1564} 1680}
1565 1681
1566sub size_request { 1682sub size_request {
1567 my ($self) = @_; 1683 my ($self) = @_;
1568 1684
1685 $self->{size_req} ||= do {
1569 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1570 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1571 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1572 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1574 1691
1575 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1576 1693
1577 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1578 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1579 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1698
1581 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1582 1700
1583 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1584 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1585 } 1706 };
1586 1707
1587 ($w, $h) 1708 @{ $self->{size_req} }
1588} 1709}
1589 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1590sub size_allocate { 1715sub invoke_size_allocate {
1591 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1592 1717
1593 delete $self->{ox}; 1718 delete $self->{ox};
1594 1719
1595 delete $self->{texture} 1720 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1597} 1724}
1598 1725
1599sub set_fontsize { 1726sub set_fontsize {
1600 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1601 1728
1602 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1603 delete $self->{texture}; 1731 delete $self->{texture};
1604 1732
1605 $self->realloc; 1733 $self->realloc;
1606} 1734}
1607 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1608sub _draw { 1745sub _draw {
1609 my ($self) = @_; 1746 my ($self) = @_;
1610 1747
1611 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1612 1749
1613 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1614 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1615 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1616 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1617 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1620 1757
1621 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1622 }; 1759 };
1623 1760
1624 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1627 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1628 1765
1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1631 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1632 }; 1769 };
1633 1770
1634 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1636 1773
1637 if ($tex->{format} == GL_ALPHA) { 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1638 glColor @{$self->{fg}};
1639 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1640 } else {
1641 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1642 }
1643
1644 glDisable GL_TEXTURE_2D;
1645} 1775}
1646 1776
1647############################################################################# 1777#############################################################################
1648 1778
1649package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1663 can_hover => 1, 1793 can_hover => 1,
1664 can_focus => 1, 1794 can_focus => 1,
1665 valign => 0, 1795 valign => 0,
1666 can_events => 1, 1796 can_events => 1,
1667 #text => ... 1797 #text => ...
1798 #hidden => "*",
1668 @_ 1799 @_
1669 ) 1800 )
1670} 1801}
1671 1802
1672sub _set_text { 1803sub _set_text {
… …
1674 1805
1675 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1676 1807
1677 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1678 1809
1679 delete $self->{texture};
1680
1681 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1811 $self->{text} = $text;
1683 1812
1684 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1686 1816
1687 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1820 $self->update;
1688} 1821}
1689 1822
1690sub set_text { 1823sub set_text {
1691 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1692 1825
1693 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1827 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1828}
1698 1829
1699sub get_text { 1830sub get_text {
1700 $_[0]{text} 1831 $_[0]{text}
1701} 1832}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1707 1838
1708 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1709} 1840}
1710 1841
1711sub key_down { 1842sub invoke_key_down {
1712 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1713 1844
1714 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1864 $self->emit ('escape');
1734 } elsif ($uni) { 1865 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1867 } else {
1737 return 0; 1868 return 0;
1738 } 1869 }
… …
1742 $self->realloc; 1873 $self->realloc;
1743 1874
1744 1 1875 1
1745} 1876}
1746 1877
1747sub focus_in { 1878sub invoke_focus_in {
1748 my ($self) = @_; 1879 my ($self) = @_;
1749 1880
1750 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1751 1882
1752 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1753} 1884}
1754 1885
1755sub button_down { 1886sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1757 1888
1758 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1890
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1892
1762 # byte-index to char-index 1893 # byte-index to char-index
1763 my $text = $self->{text}; 1894 my $text = $self->{text};
1764 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1766 1897
1767 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1768 $self->update; 1899 $self->update;
1769 1900
1770 1 1901 1
1771} 1902}
1772 1903
1773sub mouse_motion { 1904sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1906# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1907
1777 0 1908 1
1778} 1909}
1779 1910
1780sub _draw { 1911sub _draw {
1781 my ($self) = @_; 1912 my ($self) = @_;
1782 1913
1783 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1784 1915
1785 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1786 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1787 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1788 } else { 1919 } else {
1789 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1790 } 1921 }
1791 1922
1792 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1793 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1794 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1795 glVertex 0 , 0; 1926 glVertex 0 , 0;
1796 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1797 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1798 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1823 1954
1824our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1825 1956
1826use CFClient::OpenGL; 1957use CFClient::OpenGL;
1827 1958
1828sub key_down { 1959sub invoke_key_down {
1829 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1830 1961
1831 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1832 1963
1833 if ($sym == 13) { 1964 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1836 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1839 $self->update; 1971 $self->update;
1840 1972
1841 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1991 } else {
1860 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1861 } 1993 }
1862 1994
1863 } else { 1995 } else {
1864 return $self->SUPER::key_down ($ev) 1996 return $self->SUPER::invoke_key_down ($ev)
1865 } 1997 }
1866 1998
1867 1 1999 1
1868} 2000}
1869 2001
… …
1893 can_events => 1, 2025 can_events => 1,
1894 @_ 2026 @_
1895 ) 2027 )
1896} 2028}
1897 2029
1898sub activate { }
1899
1900sub button_up { 2030sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1902 2032
1903 $self->emit ("activate") 2033 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
… …
1908} 2038}
1909 2039
1910sub _draw { 2040sub _draw {
1911 my ($self) = @_; 2041 my ($self) = @_;
1912 2042
1913 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1914
1915 if ($GRAB == $self) {
1916 $self->{fg} = $self->{active_fg};
1917 }
1918 2044
1919 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1920 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1921 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1922 2048
1923 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1924 2050
1925 glDisable GL_TEXTURE_2D; 2051 glDisable GL_TEXTURE_2D;
1926 2052
1927 $self->SUPER::_draw; 2053 $self->SUPER::_draw;
2054}
2055
2056#############################################################################
2057
2058package CFClient::UI::ImageButton;
2059
2060our @ISA = CFClient::UI::Image::;
2061
2062use CFClient::OpenGL;
2063
2064my %textures;
2065
2066sub new {
2067 my $class = shift;
2068
2069 my $self = $class->SUPER::new (
2070 padding_x => 4,
2071 padding_y => 4,
2072 fg => [1, 1, 1],
2073 active_fg => [0, 0, 1],
2074 can_hover => 1,
2075 align => 0,
2076 valign => 0,
2077 can_events => 1,
2078 @_
2079 );
2080}
2081
2082sub invoke_button_up {
2083 my ($self, $ev, $x, $y) = @_;
2084
2085 $self->emit ("activate")
2086 if $x >= 0 && $x < $self->{w}
2087 && $y >= 0 && $y < $self->{h};
2088
2089 1
1928} 2090}
1929 2091
1930############################################################################# 2092#############################################################################
1931 2093
1932package CFClient::UI::CheckBox; 2094package CFClient::UI::CheckBox;
… …
1959 my ($self) = @_; 2121 my ($self) = @_;
1960 2122
1961 (6) x 2 2123 (6) x 2
1962} 2124}
1963 2125
2126sub toggle {
2127 my ($self) = @_;
2128
2129 $self->{state} = !$self->{state};
2130 $self->emit (changed => $self->{state});
2131 $self->update;
2132}
2133
1964sub button_down { 2134sub invoke_button_down {
1965 my ($self, $ev, $x, $y) = @_; 2135 my ($self, $ev, $x, $y) = @_;
1966 2136
1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2137 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2138 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1969 $self->{state} = !$self->{state}; 2139 $self->toggle;
1970 $self->_emit (changed => $self->{state});
1971 } else { 2140 } else {
1972 return 0 2141 return 0
1973 } 2142 }
1974 2143
1975 1 2144 1
… …
2000package CFClient::UI::Image; 2169package CFClient::UI::Image;
2001 2170
2002our @ISA = CFClient::UI::Base::; 2171our @ISA = CFClient::UI::Base::;
2003 2172
2004use CFClient::OpenGL; 2173use CFClient::OpenGL;
2005use Carp qw/confess/;
2006 2174
2007our %loaded_images; 2175our %texture_cache;
2008 2176
2009sub new { 2177sub new {
2010 my $class = shift; 2178 my $class = shift;
2011 2179
2012 my $self = $class->SUPER::new (can_events => 0, @_); 2180 my $self = $class->SUPER::new (
2181 can_events => 0,
2182 @_,
2183 );
2013 2184
2014 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
2015 2187
2016 $loaded_images{$self->{image}} ||= 2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2017 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2018 2190
2019 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2020 2192
2021 Scalar::Util::weaken $loaded_images{$self->{image}}; 2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2022
2023 $self->{aspect} = $tex->{w} / $tex->{h};
2024 2194
2025 $self 2195 $self
2026} 2196}
2027 2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2201 warn "freeze<$self>\n";#d#
2202
2203 $self->{path}
2204 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206 $self->{path}
2207}
2208
2209sub STORABLE_attach {
2210 my ($self, $cloning, $path) = @_;
2211 warn "attach<@_>\n";#d#
2212
2213 $self->new (path => $path)
2214}
2215
2028sub size_request { 2216sub size_request {
2029 my ($self) = @_; 2217 my ($self) = @_;
2030 2218
2031 ($self->{tex}->{w}, $self->{tex}->{h}) 2219 ($self->{tex}{w}, $self->{tex}{h})
2032} 2220}
2033 2221
2034sub _draw { 2222sub _draw {
2035 my ($self) = @_; 2223 my ($self) = @_;
2036 2224
… …
2046 } 2234 }
2047 2235
2048 glEnable GL_TEXTURE_2D; 2236 glEnable GL_TEXTURE_2D;
2049 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2050 2238
2051 $tex->draw_quad_alpha (0, 0, $w, $h); 2239 $tex->draw_quad (0, 0, $w, $h);
2052 2240
2053 glDisable GL_TEXTURE_2D; 2241 glDisable GL_TEXTURE_2D;
2054} 2242}
2055 2243
2056############################################################################# 2244#############################################################################
… …
2145 my $ycut1 = max 0, min 1, $ycut; 2333 my $ycut1 = max 0, min 1, $ycut;
2146 my $ycut2 = max 0, min 1, $ycut - 1; 2334 my $ycut2 = max 0, min 1, $ycut - 1;
2147 2335
2148 my $h1 = $self->{h} * (1 - $ycut1); 2336 my $h1 = $self->{h} * (1 - $ycut1);
2149 my $h2 = $self->{h} * (1 - $ycut2); 2337 my $h2 = $self->{h} * (1 - $ycut2);
2338 my $h3 = $self->{h};
2339
2340 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2150 2341
2151 glEnable GL_BLEND; 2342 glEnable GL_BLEND;
2152 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2343 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2344 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2153 glEnable GL_TEXTURE_2D; 2345 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2347
2156 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2348 glBindTexture GL_TEXTURE_2D, $t1->{name};
2157 glBegin GL_QUADS; 2349 glBegin GL_QUADS;
… …
2172 2364
2173 if ($t3) { 2365 if ($t3) {
2174 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2366 glBindTexture GL_TEXTURE_2D, $t3->{name};
2175 glBegin GL_QUADS; 2367 glBegin GL_QUADS;
2176 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2368 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2177 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2369 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2178 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2370 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2179 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2371 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2180 glEnd; 2372 glEnd;
2181 } 2373 }
2182 2374
2183 glDisable GL_BLEND; 2375 glDisable GL_BLEND;
… …
2271 $self->update; 2463 $self->update;
2272 2464
2273 $self 2465 $self
2274} 2466}
2275 2467
2276sub changed { }
2277
2278sub set_range { 2468sub set_range {
2279 my ($self, $range) = @_; 2469 my ($self, $range) = @_;
2280 2470
2281 ($range, $self->{range}) = ($self->{range}, $range); 2471 ($range, $self->{range}) = ($self->{range}, $range);
2282 2472
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}"; 2473 if ("@$range" ne "@{$self->{range}}") {
2474 $self->update;
2475 $self->set_value ($self->{range}[0]);
2476 }
2285} 2477}
2286 2478
2287sub set_value { 2479sub set_value {
2288 my ($self, $value) = @_; 2480 my ($self, $value) = @_;
2289 2481
… …
2300 if $unit; 2492 if $unit;
2301 2493
2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2494 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2303 2495
2304 if ($value != $old_value) { 2496 if ($value != $old_value) {
2305 $self->_emit (changed => $value); 2497 $self->emit (changed => $value);
2306 $self->update; 2498 $self->update;
2307 } 2499 }
2308} 2500}
2309 2501
2310sub size_request { 2502sub size_request {
2311 my ($self) = @_; 2503 my ($self) = @_;
2312 2504
2313 ($self->{req_w}, $self->{req_h}) 2505 ($self->{req_w}, $self->{req_h})
2314} 2506}
2315 2507
2316sub button_down { 2508sub invoke_button_down {
2317 my ($self, $ev, $x, $y) = @_; 2509 my ($self, $ev, $x, $y) = @_;
2318 2510
2319 $self->SUPER::button_down ($ev, $x, $y); 2511 $self->SUPER::invoke_button_down ($ev, $x, $y);
2320 2512
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2513 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322 2514
2323 $self->mouse_motion ($ev, $x, $y) 2515 $self->invoke_mouse_motion ($ev, $x, $y)
2324} 2516}
2325 2517
2326sub mouse_motion { 2518sub invoke_mouse_motion {
2327 my ($self, $ev, $x, $y) = @_; 2519 my ($self, $ev, $x, $y) = @_;
2328 2520
2329 if ($GRAB == $self) { 2521 if ($GRAB == $self) {
2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2522 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2331 2523
… …
2339 } 2531 }
2340 2532
2341 1 2533 1
2342} 2534}
2343 2535
2536sub invoke_mouse_wheel {
2537 my ($self, $ev) = @_;
2538
2539 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2540
2541 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2542
2543 ! ! $delta
2544}
2545
2344sub update { 2546sub update {
2345 my ($self) = @_; 2547 my ($self) = @_;
2346 2548
2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2549 delete $self->{knob_w};
2550 $self->SUPER::update;
2551}
2552
2553sub _draw {
2554 my ($self) = @_;
2555
2556 unless ($self->{knob_w}) {
2348 $self->set_value ($self->{range}[0]); 2557 $self->set_value ($self->{range}[0]);
2349 2558
2350 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2559 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100; 2560 my $range = ($hi - $page - $lo) || 1e-100;
2352 2561
… …
2358 $value = ($value - $lo) / $range; 2567 $value = ($value - $lo) / $range;
2359 $value = $value * $self->{scale} + $self->{offset}; 2568 $value = $value * $self->{scale} + $self->{offset};
2360 2569
2361 $self->{knob_x} = $value - $knob_w * 0.5; 2570 $self->{knob_x} = $value - $knob_w * 0.5;
2362 $self->{knob_w} = $knob_w; 2571 $self->{knob_w} = $knob_w;
2363 }); 2572 }
2364
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370 2573
2371 $self->SUPER::_draw (); 2574 $self->SUPER::_draw ();
2372 2575
2373 glScale $self->{w}, $self->{h}; 2576 glScale $self->{w}, $self->{h};
2374 2577
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2638sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2639sub set_value { shift->{slider}->set_value (@_) }
2437 2640
2438############################################################################# 2641#############################################################################
2439 2642
2440package CFClient::UI::TextView; 2643package CFClient::UI::TextScroller;
2441 2644
2442our @ISA = CFClient::UI::HBox::; 2645our @ISA = CFClient::UI::HBox::;
2443 2646
2444use CFClient::OpenGL; 2647use CFClient::OpenGL;
2445 2648
2446sub new { 2649sub new {
2447 my $class = shift; 2650 my $class = shift;
2448 2651
2449 my $self = $class->SUPER::new ( 2652 my $self = $class->SUPER::new (
2450 fontsize => 1, 2653 fontsize => 1,
2451 can_events => 0, 2654 can_events => 1,
2655 indent => 0,
2452 #font => default_font 2656 #font => default_font
2453 @_, 2657 @_,
2454 2658
2455 layout => (new CFClient::Layout 1), 2659 layout => (new CFClient::Layout),
2456 par => [], 2660 par => [],
2457 height => 0, 2661 height => 0,
2458 children => [ 2662 children => [
2459 (new CFClient::UI::Empty expand => 1), 2663 (new CFClient::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2664 (new CFClient::UI::Slider vertical => 1),
… …
2471 2675
2472 $self->{fontsize} = $fontsize; 2676 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2677 $self->reflow;
2474} 2678}
2475 2679
2680sub size_request {
2681 my ($self) = @_;
2682
2683 my ($empty, $slider) = @{ $self->{children} };
2684
2685 local $self->{children} = [$empty, $slider];
2686 $self->SUPER::size_request
2687}
2688
2476sub size_allocate { 2689sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2690 my ($self, $w, $h) = @_;
2478 2691
2479 $self->SUPER::size_allocate ($w, $h); 2692 my ($empty, $slider, @other) = @{ $self->{children} };
2693 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2694
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2695 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2696 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2697 $self->{layout}->set_width ($empty->{w});
2698 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2699
2485 $self->reflow; 2700 $self->reflow;
2486}
2487 2701
2488sub text_size { 2702 local $self->{children} = [$empty, $slider];
2703 $self->SUPER::invoke_size_allocate ($w, $h)
2704}
2705
2706sub invoke_mouse_wheel {
2489 my ($self, $text, $indent) = @_; 2707 my ($self, $ev) = @_;
2708
2709 return 0 unless $ev->{dy}; # only vertical movements
2710
2711 $self->{children}[1]->emit (mouse_wheel => $ev);
2712
2713 1
2714}
2715
2716sub get_layout {
2717 my ($self, $para) = @_;
2490 2718
2491 my $layout = $self->{layout}; 2719 my $layout = $self->{layout};
2492 2720
2721 $layout->set_font ($self->{font}) if $self->{font};
2722 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2723 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2724 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2725 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2726 $layout->set_markup ($para->{markup});
2727
2728 $layout->set_shapes (
2729 map
2730 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2731 @{$para->{widget}}
2496 2732 );
2733
2497 $layout->size 2734 $layout
2498} 2735}
2499 2736
2500sub reflow { 2737sub reflow {
2501 my ($self) = @_; 2738 my ($self) = @_;
2502 2739
… …
2511 $self->{children}[1]->set_value ($offset); 2748 $self->{children}[1]->set_value ($offset);
2512} 2749}
2513 2750
2514sub clear { 2751sub clear {
2515 my ($self) = @_; 2752 my ($self) = @_;
2753
2754 my (undef, undef, @other) = @{ $self->{children} };
2755 $self->remove ($_) for @other;
2516 2756
2517 $self->{par} = []; 2757 $self->{par} = [];
2518 $self->{height} = 0; 2758 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2759 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2760}
2521 2761
2522sub add_paragraph { 2762sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2763 my ($self, $color, $para, $indent) = @_;
2524 2764
2525 for my $line (split /\n/, $text) { 2765 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2766
2527 $self->{height} += $h; 2767 $para = {
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2768 w => 1e10,
2769 wrapped => 1,
2770 fg => $color,
2771 indent => $indent,
2772 markup => $text,
2773 widget => \@w,
2529 } 2774 };
2530 2775
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2776 $self->add (@w) if @w;
2777 push @{$self->{par}}, $para;
2778
2779 $self->{need_reflow}++;
2780 $self->update;
2781}
2782
2783sub scroll_to_bottom {
2784 my ($self) = @_;
2785
2786 $self->{scroll_to_bottom} = 1;
2787 $self->update;
2532} 2788}
2533 2789
2534sub update { 2790sub update {
2535 my ($self) = @_; 2791 my ($self) = @_;
2536 2792
… …
2538 2794
2539 return unless $self->{h} > 0; 2795 return unless $self->{h} > 0;
2540 2796
2541 delete $self->{texture}; 2797 delete $self->{texture};
2542 2798
2543 $ROOT->on_post_alloc ($self, sub { 2799 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2800 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2801
2546 if (delete $self->{need_reflow}) { 2802 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2803 my $height = 0;
2548 2804
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2805 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2806 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2807 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2808 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2809
2559 $_->[1] = $h; 2810 $para->{w} = $w + $para->{indent};
2811 $para->{h} = $h;
2812 $para->{wrapped} = $layout->has_wrapped;
2560 } 2813 }
2561 2814
2562 $height += $_->[1]; 2815 $height += $para->{h};
2563 } 2816 }
2564 2817
2565 $self->{height} = $height; 2818 $self->{height} = $height;
2566 2819
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2820 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2821
2569 delete $self->{texture}; 2822 delete $self->{texture};
2570 } 2823 }
2571 2824
2825 if (delete $self->{scroll_to_bottom}) {
2826 $self->{children}[1]->set_value (1e10);
2827 }
2828
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2829 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0.5, 0.5, 0.5, 0; 2830 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2831 glClear GL_COLOR_BUFFER_BIT;
2575 2832
2576 my $top = int $self->{children}[1]{range}[0]; 2833 my $top = int $self->{children}[1]{range}[0];
2577 2834
2578 my $y0 = $top; 2835 my $y0 = $top;
2579 my $y1 = $top + $H; 2836 my $y1 = $top + $H;
2580 2837
2581 my $y = 0; 2838 my $y = 0;
2582 2839
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 2840 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2841 my $h = $para->{h};
2593 2842
2594 if ($y0 < $y + $h && $y < $y1) { 2843 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 2844
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2845 my $layout = $self->get_layout ($para);
2600 2846
2601 glRasterPos $par->[3], $y - $y0; 2847 $layout->render ($para->{indent}, $y - $y0);
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2848
2849 if (my @w = @{ $para->{widget} }) {
2850 my @s = $layout->get_shapes;
2851
2852 for (@w) {
2853 my ($dx, $dy) = splice @s, 0, 2, ();
2854
2855 $_->{x} = $dx + $para->{indent};
2856 $_->{y} = $dy + $y - $y0;
2857
2858 $_->draw;
2859 }
2860 }
2603 } 2861 }
2604 2862
2605 $y += $h; 2863 $y += $h;
2606 } 2864 }
2607
2608 glDisable GL_BLEND;
2609 }; 2865 };
2610 }); 2866 });
2611} 2867}
2612 2868
2869sub reconfigure {
2870 my ($self) = @_;
2871
2872 $self->SUPER::reconfigure;
2873
2874 $_->{w} = 1e10 for @{ $self->{par} };
2875 $self->reflow;
2876}
2877
2613sub _draw { 2878sub _draw {
2614 my ($self) = @_; 2879 my ($self) = @_;
2615 2880
2616 glEnable GL_TEXTURE_2D; 2881 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618 glColor 1, 1, 1, 1; 2883 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2884 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2621 2886
2622 $self->{children}[1]->draw; 2887 $self->{children}[1]->draw;
2623
2624} 2888}
2625 2889
2626############################################################################# 2890#############################################################################
2627 2891
2628package CFClient::UI::Animator; 2892package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2979 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2980 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2981 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2982 . "visible $widget->{visible}";
2719 } 2983 }
2984
2985 $tooltip =~ s/^\n+//;
2986 $tooltip =~ s/\n+$//;
2720 2987
2721 $self->add (new CFClient::UI::Label 2988 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2989 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2990 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2991 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3001 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 3002
2736 ($w + 4, $h + 4) 3003 ($w + 4, $h + 4)
2737} 3004}
2738 3005
2739sub size_allocate { 3006sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 3007 my ($self, $w, $h) = @_;
2741 3008
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 3009 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 3010}
2744 3011
2745sub visibility_change { 3012sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 3013 my ($self, $visible) = @_;
2747 3014
2748 return unless $visible; 3015 return unless $visible;
2749 3016
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 3017 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner} 3018 my $widget = $self->{owner}
2752 or return; 3019 or return;
2753 3020
3021 if ($widget->{visible}) {
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3022 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 3023
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3024 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 3025 if $x + $self->{w} > $self->{root}{w};
2758 3026
2759 $self->move_abs ($x, $y); 3027 $self->move_abs ($x, $y);
3028 } else {
3029 $self->hide;
3030 }
2760 }); 3031 });
2761} 3032}
2762 3033
2763sub _draw { 3034sub _draw {
2764 my ($self) = @_; 3035 my ($self) = @_;
… …
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2852 3123
2853 if ($tex) { 3124 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3125 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 1, 1, 1, 1; 3127 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3129 glDisable GL_TEXTURE_2D;
2859 } 3130 }
2860} 3131}
2861 3132
2862sub DESTROY { 3133sub destroy {
2863 my ($self) = @_; 3134 my ($self) = @_;
2864 3135
2865 $self->{timer}->cancel 3136 $self->{timer}->cancel
2866 if $self->{timer}; 3137 if $self->{timer};
2867 3138
2868 $self->SUPER::DESTROY; 3139 $self->SUPER::destroy;
2869} 3140}
2870 3141
2871############################################################################# 3142#############################################################################
2872 3143
2873package CFClient::UI::Buttonbar; 3144package CFClient::UI::Buttonbar;
… …
2894 ); 3165 );
2895 3166
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3167 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3168
2898 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
2900 3171
2901 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
2902 if (!ref $widget) { 3173 if (!ref $widget) {
3174 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2;
3176
3177 $widget = new CFClient::UI::HBox
3178 can_hover => 1,
3179 can_events => 1,
3180 tooltip => $tooltip,
3181 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1),
3184 ],
3185 ;
3186
3187 } else {
2903 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3189 can_hover => 1,
2905 can_events => 1, 3190 can_events => 1,
2906 text => $widget; 3191 markup => $widget,
3192 tooltip => $tooltip;
3193 }
2907 } 3194 }
2908 3195
2909 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
2910 3197
2911 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
2916 3203
2917# popup given the event (must be a mouse button down event currently) 3204# popup given the event (must be a mouse button down event currently)
2918sub popup { 3205sub popup {
2919 my ($self, $ev) = @_; 3206 my ($self, $ev) = @_;
2920 3207
2921 $self->_emit ("popdown"); 3208 $self->emit ("popdown");
2922 3209
2923 # maybe save $GRAB? must be careful about events... 3210 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3211 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3212 $self->{button} = $ev->{button};
2926 3213
2927 $self->show; 3214 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3215 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3216}
2930 3217
2931sub mouse_motion { 3218sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3219 my ($self, $ev, $x, $y) = @_;
2933 3220
2934 # TODO: should use vbox->find_widget or so 3221 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3222 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3223 $self->{hover} = $self->{item}{$HOVER};
2937 3224
2938 0 3225 0
2939} 3226}
2940 3227
2941sub button_up { 3228sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2943 3230
2944 if ($ev->{button} == $self->{button}) { 3231 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3232 undef $GRAB;
2946 $self->hide; 3233 $self->hide;
2947 3234
2948 $self->_emit ("popdown"); 3235 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3236 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3237 } else {
2951 return 0 3238 return 0
2952 } 3239 }
2953 3240
… …
2980 3267
2981 $self->{current} = $self->{children}[0] 3268 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3269 if @{ $self->{children} };
2983} 3270}
2984 3271
3272sub get_current_page {
3273 my ($self) = @_;
3274
3275 $self->{current}
3276}
3277
2985sub set_current_page { 3278sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3279 my ($self, $page_or_widget) = @_;
2987 3280
2988 my $widget = ref $page_or_widget 3281 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3282 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3283 : $self->{children}[$page_or_widget];
2991 3284
2992 $self->{current} = $widget; 3285 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3286 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3287
2995 $self->_emit (page_changed => $self->{current}); 3288 $self->emit (page_changed => $self->{current});
2996 3289
2997 $self->realloc; 3290 $self->realloc;
2998} 3291}
2999 3292
3000sub visible_children { 3293sub visible_children {
… …
3005 my ($self) = @_; 3298 my ($self) = @_;
3006 3299
3007 $self->{current}->size_request 3300 $self->{current}->size_request
3008} 3301}
3009 3302
3010sub size_allocate { 3303sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3304 my ($self, $w, $h) = @_;
3012 3305
3013 $self->{current}->configure (0, 0, $w, $h); 3306 $self->{current}->configure (0, 0, $w, $h);
3307
3308 1
3014} 3309}
3015 3310
3016sub _draw { 3311sub _draw {
3017 my ($self) = @_; 3312 my ($self) = @_;
3018 3313
… …
3053 ); 3348 );
3054 3349
3055 $self->{multiplexer}->add ($widget); 3350 $self->{multiplexer}->add ($widget);
3056} 3351}
3057 3352
3353sub get_current_page {
3354 my ($self) = @_;
3355
3356 $self->{multiplexer}->get_current_page
3357}
3358
3058sub set_current_page { 3359sub set_current_page {
3059 my ($self, $page) = @_; 3360 my ($self, $page) = @_;
3060 3361
3061 $self->{multiplexer}->set_current_page ($page); 3362 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3363 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3364}
3064 3365
3065############################################################################# 3366#############################################################################
3066 3367
3067package CFClient::UI::Statusbox; 3368package CFClient::UI::Combobox;
3068 3369
3370use utf8;
3371
3069our @ISA = CFClient::UI::VBox::; 3372our @ISA = CFClient::UI::Button::;
3070 3373
3071sub new { 3374sub new {
3072 my $class = shift; 3375 my $class = shift;
3073 3376
3074 $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
3378 options => [], # [value, title, longdesc], ...
3379 value => undef,
3380 @_,
3381 );
3382
3383 $self->_set_value ($self->{value});
3384
3385 $self
3386}
3387
3388sub invoke_button_down {
3389 my ($self, $ev) = @_;
3390
3391 my @menu_items;
3392
3393 for (@{ $self->{options} }) {
3394 my ($value, $title, $tooltip) = @$_;
3395
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 }
3398
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400}
3401
3402sub _set_value {
3403 my ($self, $value) = @_;
3404
3405 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3406 or return;
3407
3408 $self->{value} = $item->[0];
3409 $self->set_markup ("$item->[1] ⇓");
3410 $self->set_tooltip ($item->[2]);
3411}
3412
3413sub set_value {
3414 my ($self, $value) = @_;
3415
3416 return unless $self->{value} ne $value;
3417
3418 $self->_set_value ($value);
3419 $self->emit (changed => $value);
3420}
3421
3422#############################################################################
3423
3424package CFClient::UI::Statusbox;
3425
3426our @ISA = CFClient::UI::VBox::;
3427
3428sub new {
3429 my $class = shift;
3430
3431 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3432 fontsize => 0.8,
3076 @_, 3433 @_,
3077 ) 3434 );
3435
3436 Scalar::Util::weaken (my $this = $self);
3437
3438 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439
3440 $self
3078} 3441}
3079 3442
3080sub reorder { 3443sub reorder {
3081 my ($self) = @_; 3444 my ($self) = @_;
3082 my $NOW = time; 3445 my $NOW = Time::HiRes::time;
3446
3447 # freeze display when hovering over any label
3448 return if $CFClient::UI::TOOLTIP->{owner}
3449 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3450 values %{ $self->{item} };
3083 3451
3084 while (my ($k, $v) = each %{ $self->{item} }) { 3452 while (my ($k, $v) = each %{ $self->{item} }) {
3085 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3453 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3086 } 3454 }
3087 3455
… …
3090 my @items = sort { 3458 my @items = sort {
3091 $a->{pri} <=> $b->{pri} 3459 $a->{pri} <=> $b->{pri}
3092 or $b->{id} <=> $a->{id} 3460 or $b->{id} <=> $a->{id}
3093 } values %{ $self->{item} }; 3461 } values %{ $self->{item} };
3094 3462
3463 $self->{timer}->interval (1);
3464
3095 my $count = 10 + 1; 3465 my $count = 10 + 1;
3096 for my $item (@items) { 3466 for my $item (@items) {
3097 last unless --$count; 3467 last unless --$count;
3098 3468
3099 push @widgets, $item->{label} ||= do { 3469 my $label = $item->{label} ||= do {
3100 # TODO: doesn't handle markup well (read as: at all) 3470 # TODO: doesn't handle markup well (read as: at all)
3101 my $short = $item->{count} > 1 3471 my $short = $item->{count} > 1
3102 ? "<b>$item->{count} ×</b> $item->{text}" 3472 ? "<b>$item->{count} ×</b> $item->{text}"
3103 : $item->{text}; 3473 : $item->{text};
3104 3474
… …
3112 tooltip => $item->{tooltip}, 3482 tooltip => $item->{tooltip},
3113 tooltip_font => $::FONT_PROP, 3483 tooltip_font => $::FONT_PROP,
3114 tooltip_width => 0.67, 3484 tooltip_width => 0.67,
3115 fontsize => $item->{fontsize} || $self->{fontsize}, 3485 fontsize => $item->{fontsize} || $self->{fontsize},
3116 max_w => $::WIDTH * 0.44, 3486 max_w => $::WIDTH * 0.44,
3117 fg => $item->{fg}, 3487 fg => [@{ $item->{fg} }],
3118 can_events => 1, 3488 can_events => 1,
3119 can_hover => 1 3489 can_hover => 1
3120 }; 3490 };
3491
3492 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3493 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3494 $label->update;
3495 $label->set_max_size (undef, $label->{req_h} * $diff)
3496 if $diff < 1;
3497 $self->{timer}->interval (1/30);
3498 } else {
3499 $label->{fg}[3] = $item->{fg}[3] || 1;
3500 }
3501
3502 push @widgets, $label;
3121 } 3503 }
3122 3504
3123 $self->clear; 3505 $self->clear;
3124 $self->SUPER::add (reverse @widgets); 3506 $self->SUPER::add (reverse @widgets);
3125} 3507}
… …
3130 $text =~ s/^\s+//; 3512 $text =~ s/^\s+//;
3131 $text =~ s/\s+$//; 3513 $text =~ s/\s+$//;
3132 3514
3133 return unless $text; 3515 return unless $text;
3134 3516
3135 my $timeout = time + ((delete $arg{timeout}) || 60); 3517 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3136 3518
3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3519 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3138 3520
3139 if (my $item = $self->{item}{$group}) { 3521 if (my $item = $self->{item}{$group}) {
3140 if ($item->{text} eq $text) { 3522 if ($item->{text} eq $text) {
3141 $item->{count}++; 3523 $item->{count}++;
3142 } else { 3524 } else {
3143 $item->{count} = 1; 3525 $item->{count} = 1;
3144 $item->{text} = $item->{tooltip} = $text; 3526 $item->{text} = $item->{tooltip} = $text;
3145 } 3527 }
3146 $item->{id} = ++$self->{id}; 3528 $item->{id} += 0.2;#d#
3147 $item->{timeout} = $timeout; 3529 $item->{timeout} = $timeout;
3148 delete $item->{label}; 3530 delete $item->{label};
3149 } else { 3531 } else {
3150 $self->{item}{$group} = { 3532 $self->{item}{$group} = {
3151 id => ++$self->{id}, 3533 id => ++$self->{id},
… …
3157 count => 1, 3539 count => 1,
3158 %arg, 3540 %arg,
3159 }; 3541 };
3160 } 3542 }
3161 3543
3544 $ROOT->on_refresh (reorder => sub {
3162 $self->reorder; 3545 $self->reorder;
3546 });
3163} 3547}
3164 3548
3165sub reconfigure { 3549sub reconfigure {
3166 my ($self) = @_; 3550 my ($self) = @_;
3167 3551
… …
3170 3554
3171 $self->reorder; 3555 $self->reorder;
3172 $self->SUPER::reconfigure; 3556 $self->SUPER::reconfigure;
3173} 3557}
3174 3558
3559sub destroy {
3560 my ($self) = @_;
3561
3562 $self->{timer}->cancel;
3563
3564 $self->SUPER::destroy;
3565}
3566
3175############################################################################# 3567#############################################################################
3176 3568
3177package CFClient::UI::Inventory; 3569package CFClient::UI::Inventory;
3178 3570
3179our @ISA = CFClient::UI::ScrolledWindow::; 3571our @ISA = CFClient::UI::Table::;
3180 3572
3181sub new { 3573sub new {
3182 my $class = shift; 3574 my $class = shift;
3183 3575
3184 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3577 col_expand => [0, 1, 0],
3578 items => [],
3186 @_, 3579 @_,
3187 ); 3580 );
3188 3581
3582 $self->set_sort_order (undef);
3583
3189 $self 3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3190} 3620}
3191 3621
3192sub set_items { 3622sub set_items {
3193 my ($self, $items) = @_; 3623 my ($self, $items) = @_;
3194 3624
3195 $self->{child}->clear; 3625 $self->{items} = [$items ? values %$items : ()];
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets; 3626 $self->update_items;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412} 3627}
3413 3628
3414############################################################################# 3629#############################################################################
3415 3630
3416package CFClient::UI::SpellList; 3631package CFClient::UI::SpellList;
… …
3425 commands => [], 3640 commands => [],
3426 @_, 3641 @_,
3427 ) 3642 )
3428} 3643}
3429 3644
3430# XXX: Do sorting? Argl... 3645my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658sub rebuild_spell_list {
3659 my ($self) = @_;
3660
3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3662 $self->clear;
3663
3664 return unless $::CONN;
3665
3666 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672 my $row = 0;
3673
3674 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675 my $spell = $self->{spell}{$_};
3676
3677 $row++;
3678
3679 my $spell_cb = sub {
3680 my ($widget, $ev) = @_;
3681
3682 if ($ev->{button} == 1) {
3683 $::CONN->user_send ("cast $spell->{name}");
3684 } elsif ($ev->{button} == 2) {
3685 $::CONN->user_send ("invoke $spell->{name}");
3686 } elsif ($ev->{button} == 3) {
3687 (new CFClient::UI::Menu
3688 items => [
3689 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691 ],
3692 )->popup ($ev);
3693 } else {
3694 return 0;
3695 }
3696
3697 1
3698 };
3699
3700 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702 #TODO: add path info to tooltip
3703 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705 $self->add (0, $row, new CFClient::UI::Face
3706 face => $spell->{face},
3707 can_hover => 1,
3708 can_events => 1,
3709 tooltip => $tooltip,
3710 on_button_down => $spell_cb,
3711 );
3712
3713 $self->add (1, $row, new CFClient::UI::Label
3714 expand => 1,
3715 text => $spell->{name},
3716 can_hover => 1,
3717 can_events => 1,
3718 tooltip => $tooltip,
3719 on_button_down => $spell_cb,
3720 );
3721
3722 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726 }
3727 });
3728}
3729
3431sub add_spell { 3730sub add_spell {
3432 my ($self, $spell) = @_; 3731 my ($self, $spell) = @_;
3732
3433 $self->{spells}->{$spell->{name}} = $spell; 3733 $self->{spell}->{$spell->{name}} = $spell;
3434 3734 $self->rebuild_spell_list;
3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462} 3735}
3463 3736
3464sub remove_spell { 3737sub remove_spell {
3465 my ($self, $spell) = @_; 3738 my ($self, $spell) = @_;
3739
3466 delete $self->{spells}->{$spell->{name}}; 3740 delete $self->{spell}->{$spell->{name}};
3467 $self->rebuild_spell_list; 3741 $self->rebuild_spell_list;
3468} 3742}
3469 3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3748 $self->rebuild_spell_list;
3749}
3750
3470############################################################################# 3751#############################################################################
3471 3752
3472package CFClient::UI::Root; 3753package CFClient::UI::Root;
3473 3754
3474our @ISA = CFClient::UI::Container::; 3755our @ISA = CFClient::UI::Container::;
3756
3757use List::Util qw(min max);
3475 3758
3476use CFClient::OpenGL; 3759use CFClient::OpenGL;
3477 3760
3478sub new { 3761sub new {
3479 my $class = shift; 3762 my $class = shift;
… …
3506 $coord = $max - $size if $coord > $max - $size; 3789 $coord = $max - $size if $coord > $max - $size;
3507 3790
3508 int $coord + 0.5 3791 int $coord + 0.5
3509} 3792}
3510 3793
3511sub size_allocate { 3794sub invoke_size_allocate {
3512 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3513 3796
3514 for my $child ($self->children) { 3797 for my $child ($self->children) {
3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3516 3799
… …
3520 $X = _to_pixel $X, $W, $self->{w}; 3803 $X = _to_pixel $X, $W, $self->{w};
3521 $Y = _to_pixel $Y, $H, $self->{h}; 3804 $Y = _to_pixel $Y, $H, $self->{h};
3522 3805
3523 $child->configure ($X, $Y, $W, $H); 3806 $child->configure ($X, $Y, $W, $H);
3524 } 3807 }
3808
3809 1
3525} 3810}
3526 3811
3527sub coord2local { 3812sub coord2local {
3528 my ($self, $x, $y) = @_; 3813 my ($self, $x, $y) = @_;
3529 3814
… …
3614 3899
3615 delete $queue{$widget+0}; 3900 delete $queue{$widget+0};
3616 3901
3617 my ($w, $h) = $widget->size_request; 3902 my ($w, $h) = $widget->size_request;
3618 3903
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3904 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3905 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3906
3907 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3908 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3621 3909
3622 $w = $widget->{force_w} if exists $widget->{force_w}; 3910 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h}; 3911 $h = $widget->{force_h} if exists $widget->{force_h};
3624 3912
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3913 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3651 3939
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3653 3941
3654 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3655 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3944
3945 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h;
3947
3948 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656 3950
3657 $w = int $w + 0.5; 3951 $w = int $w + 0.5;
3658 $h = int $h + 0.5; 3952 $h = int $h + 0.5;
3659 3953
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3954 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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