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.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 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}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $self->{x} = List::Util::max 0, int $x; 319 $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; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop 376 # nop
377} 377}
378 378
379sub visible_children { 379sub visible_children {
… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
397 399
398 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
399 401
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 405 }
404} 406}
405 407
406# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
407sub coord2local { 409sub coord2local {
… …
415 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
416 418
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 420}
419 421
420sub focus_in { 422sub invoke_focus_in {
421 my ($self) = @_; 423 my ($self) = @_;
422 424
423 return if $FOCUS == $self; 425 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
425 427
426 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus);
429
430 $focus->update if $focus; 430 $focus->update if $focus;
431 $FOCUS->update; 431 $FOCUS->update;
432}
433 432
433 0
434}
435
434sub focus_out { 436sub invoke_focus_out {
435 my ($self) = @_; 437 my ($self) = @_;
436 438
437 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
438 440
439 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
440 442
441 $self->_emit (focus_out => $focus);
442
443 $focus->update if $focus; #? 443 $focus->update if $focus; #?
444 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 446 unless $FOCUS;
447}
448 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
449sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
450sub button_up { 0 } 458sub invoke_button_up { 1 }
451sub key_down { 0 } 459sub invoke_key_down { 1 }
452sub key_up { 0 } 460sub invoke_key_up { 1 }
453 461
454sub button_down { 462sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
456 464
457 $self->focus_in; 465 $self->grab_focus;
458 466
459 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 483}
461 484
462sub find_widget { 485sub find_widget {
463 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
464 487
… …
474sub set_parent { 497sub set_parent {
475 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
476 499
477 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 501 $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} 502}
503 503
504sub realloc { 504sub realloc {
505 my ($self) = @_; 505 my ($self) = @_;
506 506
… …
539 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540 540
541 # update screen rectangle 541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 544
547 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 548
551 glPushMatrix; 549 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 551
556 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 554 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 556 glBegin GL_QUADS;
563 glVertex $x , $y; 557 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
567 glEnd; 561 glEnd;
568 glDisable GL_BLEND; 562 glDisable GL_BLEND;
569 } 563 }
570 564
571 if ($ENV{CFPLUS_DEBUG} & 1) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 566 glPushMatrix;
573 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 570 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
580 glEnd; 574 glEnd;
581 glPopMatrix; 575 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
584} 581}
585 582
586sub _draw { 583sub _draw {
587 my ($self) = @_; 584 my ($self) = @_;
588 585
… …
591 588
592sub DESTROY { 589sub DESTROY {
593 my ($self) = @_; 590 my ($self) = @_;
594 591
595 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
596 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 596}
598 597
599############################################################################# 598#############################################################################
600 599
601package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
626 625
627 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
629 628
630 glEnable GL_BLEND; 629 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 631 glColor_premultiply @$color;
633 632
634 glBegin GL_QUADS; 633 glBegin GL_QUADS;
635 glVertex 0 , 0; 634 glVertex 0 , 0;
636 glVertex 0 , $h; 635 glVertex 0 , $h;
637 glVertex $w, $h; 636 glVertex $w, $h;
… …
766} 765}
767 766
768sub add { 767sub add {
769 my ($self, $child) = @_; 768 my ($self, $child) = @_;
770 769
771 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
774} 772}
775 773
776sub remove { 774sub remove {
777 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
786 784
787sub size_request { 785sub size_request {
788 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
789} 787}
790 788
791sub size_allocate { 789sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
793 791
794 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
795} 795}
796 796
797############################################################################# 797#############################################################################
798 798
799# back-buffered drawing area 799# back-buffered drawing area
… …
815 815
816 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
817 $self->SUPER::update; 817 $self->SUPER::update;
818} 818}
819 819
820sub size_allocate { 820sub invoke_size_allocate {
821 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
822 822
823 $self->SUPER::size_allocate ($w, $h);
824 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
825} 826}
826 827
827sub _render { 828sub _render {
828 my ($self) = @_; 829 my ($self) = @_;
829 830
… …
856 my $tex = $self->{texture} 857 my $tex = $self->{texture}
857 or return; 858 or return;
858 859
859 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
862 863
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 865
865 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
866} 867}
… …
890 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
891 892
892 ($w, $h) 893 ($w, $h)
893} 894}
894 895
895sub size_allocate { 896sub invoke_size_allocate {
896 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
897 898
898 my $child = $self->child; 899 my $child = $self->child;
899 900
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902 903
903 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
904 $self->update; 905 $self->update;
906
907 1
905} 908}
906 909
907sub set_offset { 910sub set_offset {
908 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
909 912
… …
999 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1005}
1003 1006
1004sub size_allocate { 1007sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
1006
1007 $self->SUPER::size_allocate ($w, $h);
1008 1009
1009 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1014}
1012 1015
1013#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll 1017# update viewport offset on scroll
1015 1018
… …
1035 1038
1036 if ($self->{bg}) { 1039 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
1038 1041
1039 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
1042 1045
1043 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1047 glVertex 0 , 0;
1045 glVertex 0 , $h; 1048 glVertex 0 , $h;
1046 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1074
1072sub new { 1075sub new {
1073 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1076 1077
1077 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1080 border => 0.6, 1081 border => 0.6,
… …
1082 min_w => 16, 1083 min_w => 16,
1083 min_h => 16, 1084 min_h => 16,
1084 %arg, 1085 %arg,
1085 ); 1086 );
1086 1087
1087 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1088 align => 0, 1089 align => 0,
1089 valign => 1, 1090 valign => 1,
1090 text => $title, 1091 text => $self->{title},
1091 fontsize => $self->{border} 1092 fontsize => $self->{border},
1092 if defined $title; 1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
1093 1103
1094 $self 1104 $self
1095} 1105}
1096 1106
1097sub add { 1107sub add {
1098 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1099 1109
1100 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102} 1113}
1103 1114
1104sub border { 1115sub border {
1105 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1106} 1117}
1107 1118
1108sub size_request { 1119sub size_request {
1109 my ($self) = @_; 1120 my ($self) = @_;
1110 1121
1111 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1112 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1113 1127
1114 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1115 1129
1116 ( 1130 (
1117 $w + $self->border * 2, 1131 $w + $self->border * 2,
1118 $h + $self->border * 2, 1132 $h + $self->border * 2,
1119 ) 1133 )
1120} 1134}
1121 1135
1122sub size_allocate { 1136sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1124 1138
1125 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1126 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1127 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1129 } 1143 }
1130 1144
1131 my $border = $self->border; 1145 my $border = $self->border;
1132 1146
1133 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1134 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1135 1149
1136 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1137}
1138 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1139sub button_down { 1158sub invoke_button_down {
1140 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1141 1160
1142 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1143 my $border = $self->border; 1162 my $border = $self->border;
1144 1163
… …
1175 1194
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1196
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1179 # HACK: the next line is required to enforce placement 1198 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1181 }; 1200 };
1182 } else { 1201 } else {
1183 return 0; 1202 return 0;
1184 } 1203 }
1185 1204
1186 1 1205 1
1187} 1206}
1188 1207
1189sub button_up { 1208sub invoke_button_up {
1190 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1191 1210
1192 !!delete $self->{motion} 1211 ! ! delete $self->{motion}
1193} 1212}
1194 1213
1195sub mouse_motion { 1214sub invoke_mouse_motion {
1196 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1197 1216
1198 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199 1218
1200 !!$self->{motion} 1219 ! ! $self->{motion}
1201} 1220}
1202 1221
1203sub _draw { 1222sub _draw {
1204 my ($self) = @_; 1223 my ($self) = @_;
1205 1224
… …
1231 1250
1232 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1233 1252
1234 $child->draw; 1253 $child->draw;
1235 1254
1236 if ($self->{title}) { 1255 if ($self->{title_widget}) {
1237 glTranslate 0, $border - $self->{h}; 1256 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw; 1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1239 } 1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1240} 1264}
1241 1265
1242############################################################################# 1266#############################################################################
1243 1267
1244package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1267 1291
1268 $child->set_parent ($self); 1292 $child->set_parent ($self);
1269 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1270 1294
1271 $self->realloc; 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1272} 1302}
1273 1303
1274# TODO: move to container class maybe? send children a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1275sub clear { 1305sub clear {
1276 my ($self) = @_; 1306 my ($self) = @_;
… …
1317 (sum @$ws), 1347 (sum @$ws),
1318 (sum @$hs), 1348 (sum @$hs),
1319 ) 1349 )
1320} 1350}
1321 1351
1322sub size_allocate { 1352sub invoke_size_allocate {
1323 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1324 1354
1325 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1326 1356
1327 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1359 } 1389 }
1360 1390
1361 $y += $row_h; 1391 $y += $row_h;
1362 } 1392 }
1363 1393
1394 1
1364} 1395}
1365 1396
1366sub find_widget { 1397sub find_widget {
1367 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1368 1399
… …
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 ) 1438 )
1408} 1439}
1409 1440
1410sub size_allocate { 1441sub invoke_size_allocate {
1411 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1412 1443
1413 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1414 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1415 1446
1416 my @req; 1447 my @req;
1417 1448
1418 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1419 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1420 } else { 1451 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1422 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1423 1454
1424 if ($req > $space) { 1455 if ($req > $space) {
1425 # ah well, not enough space 1456 # ah well, not enough space
1426 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1427 } else { 1458 } else {
1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1429 1460
1430 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1431 1462
1432 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1433 for 0 .. $#$children; 1464 for 0 .. $#children;
1434 } 1465 }
1435 } 1466 }
1436 1467
1437 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1438 1469
1439 my $pos = 0; 1470 my $pos = 0;
1440 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1441 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1443 1474
1444 $pos += $alloc; 1475 $pos += $alloc;
1445 } 1476 }
1446 1477
1447 1 1478 1
… …
1537 1568
1538 delete $self->{texture}; 1569 delete $self->{texture};
1539 $self->SUPER::update; 1570 $self->SUPER::update;
1540} 1571}
1541 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1542sub set_text { 1580sub set_text {
1543 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1544 1582
1545 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1547 1585
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1550 1588
1589 delete $self->{size_req};
1551 $self->realloc; 1590 $self->realloc;
1552 $self->update; 1591 $self->update;
1553} 1592}
1554 1593
1555sub set_markup { 1594sub set_markup {
… …
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1601
1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1564 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1565 1604
1605 delete $self->{size_req};
1566 $self->realloc; 1606 $self->realloc;
1567 $self->update; 1607 $self->update;
1568} 1608}
1569 1609
1570sub size_request { 1610sub size_request {
1571 my ($self) = @_; 1611 my ($self) = @_;
1572 1612
1613 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 1619
1579 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1580 1621
1581 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1582 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 1625
1585 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1586 1627
1587 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1589 } 1633 };
1590 1634
1591 ($w, $h) 1635 @{ $self->{size_req} }
1592} 1636}
1593 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1594sub size_allocate { 1642sub invoke_size_allocate {
1595 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1596 1644
1597 delete $self->{ox}; 1645 delete $self->{ox};
1598 1646
1599 delete $self->{texture} 1647 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1601} 1651}
1602 1652
1603sub set_fontsize { 1653sub set_fontsize {
1604 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1605 1655
1606 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1607 delete $self->{texture}; 1657 delete $self->{texture};
1608 1658
1609 $self->realloc; 1659 $self->realloc;
1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1610} 1668}
1611 1669
1612sub _draw { 1670sub _draw {
1613 my ($self) = @_; 1671 my ($self) = @_;
1614 1672
… …
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1636 }; 1694 };
1637 1695
1638 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1640 1700
1641 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1642 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1644 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1646 } 1708 }
1647 1709
1648 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1649} 1711}
1650 1712
… …
1667 can_hover => 1, 1729 can_hover => 1,
1668 can_focus => 1, 1730 can_focus => 1,
1669 valign => 0, 1731 valign => 0,
1670 can_events => 1, 1732 can_events => 1,
1671 #text => ... 1733 #text => ...
1734 #hidden => "*",
1672 @_ 1735 @_
1673 ) 1736 )
1674} 1737}
1675 1738
1676sub _set_text { 1739sub _set_text {
… …
1683 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1747 $self->{text} = $text;
1685 1748
1686 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1688 1752
1689 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1690 $self->update; 1756 $self->update;
1691} 1757}
1692 1758
1693sub set_text { 1759sub set_text {
1694 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1695 1761
1696 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 1763 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 1764}
1701 1765
1702sub get_text { 1766sub get_text {
1703 $_[0]{text} 1767 $_[0]{text}
1704} 1768}
… …
1709 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1710 1774
1711 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1712} 1776}
1713 1777
1714sub key_down { 1778sub invoke_key_down {
1715 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1716 1780
1717 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1718 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1719 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1731 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1732 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1733 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1734 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1735 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1736 $self->_emit ('escape'); 1800 $self->emit ('escape');
1737 } elsif ($uni) { 1801 } elsif ($uni) {
1738 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else { 1803 } else {
1740 return 0; 1804 return 0;
1741 } 1805 }
… …
1745 $self->realloc; 1809 $self->realloc;
1746 1810
1747 1 1811 1
1748} 1812}
1749 1813
1750sub focus_in { 1814sub invoke_focus_in {
1751 my ($self) = @_; 1815 my ($self) = @_;
1752 1816
1753 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1754 1818
1755 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1756} 1820}
1757 1821
1758sub button_down { 1822sub invoke_button_down {
1759 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1760 1824
1761 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1762 1826
1763 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1764 1828
1765 # byte-index to char-index 1829 # byte-index to char-index
1766 my $text = $self->{text}; 1830 my $text = $self->{text};
… …
1771 $self->update; 1835 $self->update;
1772 1836
1773 1 1837 1
1774} 1838}
1775 1839
1776sub mouse_motion { 1840sub invoke_mouse_motion {
1777 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779 1843
1780 0 1844 1
1781} 1845}
1782 1846
1783sub _draw { 1847sub _draw {
1784 my ($self) = @_; 1848 my ($self) = @_;
1785 1849
1786 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1787 1851
1788 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1791 } else { 1855 } else {
1792 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1793 } 1857 }
1794 1858
1795 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1798 glVertex 0 , 0; 1862 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1826 1890
1827our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1828 1892
1829use CFClient::OpenGL; 1893use CFClient::OpenGL;
1830 1894
1831sub key_down { 1895sub invoke_key_down {
1832 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1833 1897
1834 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1835 1899
1836 if ($sym == 13) { 1900 if ($sym == 13) {
1837 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1838 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1839 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1840 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1841 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1842 $self->update; 1907 $self->update;
1843 1908
1844 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1845 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1846 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1862 } else { 1927 } else {
1863 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1864 } 1929 }
1865 1930
1866 } else { 1931 } else {
1867 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1868 } 1933 }
1869 1934
1870 1 1935 1
1871} 1936}
1872 1937
… …
1896 can_events => 1, 1961 can_events => 1,
1897 @_ 1962 @_
1898 ) 1963 )
1899} 1964}
1900 1965
1901sub activate { }
1902
1903sub button_up { 1966sub invoke_button_up {
1904 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1905 1968
1906 $self->emit ("activate") 1969 $self->emit ("activate")
1907 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1908 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
… …
1911} 1974}
1912 1975
1913sub _draw { 1976sub _draw {
1914 my ($self) = @_; 1977 my ($self) = @_;
1915 1978
1916 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921 1980
1922 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1925 1984
1926 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1927 1986
1928 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1929 1988
1930 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1931} 2026}
1932 2027
1933############################################################################# 2028#############################################################################
1934 2029
1935package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1962 my ($self) = @_; 2057 my ($self) = @_;
1963 2058
1964 (6) x 2 2059 (6) x 2
1965} 2060}
1966 2061
1967sub button_down { 2062sub invoke_button_down {
1968 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1969 2064
1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1972 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1973 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
1974 } else { 2069 } else {
1975 return 0 2070 return 0
1976 } 2071 }
1977 2072
1978 1 2073 1
… …
2003package CFClient::UI::Image; 2098package CFClient::UI::Image;
2004 2099
2005our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
2006 2101
2007use CFClient::OpenGL; 2102use CFClient::OpenGL;
2008use Carp qw/confess/;
2009 2103
2010our %loaded_images; 2104our %texture_cache;
2011 2105
2012sub new { 2106sub new {
2013 my $class = shift; 2107 my $class = shift;
2014 2108
2015 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2016 2113
2017 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2018 2116
2019 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2020 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2021 2119
2022 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2023 2121
2024 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2025
2026 $self->{aspect} = $tex->{w} / $tex->{h};
2027 2123
2028 $self 2124 $self
2029} 2125}
2030 2126
2031sub size_request { 2127sub size_request {
2032 my ($self) = @_; 2128 my ($self) = @_;
2033 2129
2034 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
2035} 2131}
2036 2132
2037sub _draw { 2133sub _draw {
2038 my ($self) = @_; 2134 my ($self) = @_;
2039 2135
… …
2150 2246
2151 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
2152 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
2153 2249
2154 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
2155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2255
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2274 $self->update; 2371 $self->update;
2275 2372
2276 $self 2373 $self
2277} 2374}
2278 2375
2279sub changed { }
2280
2281sub set_range { 2376sub set_range {
2282 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2283 2378
2284 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2285 2380
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}"; 2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2288} 2385}
2289 2386
2290sub set_value { 2387sub set_value {
2291 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2292 2389
… …
2303 if $unit; 2400 if $unit;
2304 2401
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306 2403
2307 if ($value != $old_value) { 2404 if ($value != $old_value) {
2308 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2309 $self->update; 2406 $self->update;
2310 } 2407 }
2311} 2408}
2312 2409
2313sub size_request { 2410sub size_request {
2314 my ($self) = @_; 2411 my ($self) = @_;
2315 2412
2316 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2317} 2414}
2318 2415
2319sub button_down { 2416sub invoke_button_down {
2320 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2321 2418
2322 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2323 2420
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325 2422
2326 $self->mouse_motion ($ev, $x, $y) 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2327} 2424}
2328 2425
2329sub mouse_motion { 2426sub invoke_mouse_motion {
2330 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2331 2428
2332 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334 2431
… …
2439sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2441 2538
2442############################################################################# 2539#############################################################################
2443 2540
2444package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2445 2542
2446our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2447 2544
2448use CFClient::OpenGL; 2545use CFClient::OpenGL;
2449 2546
… …
2451 my $class = shift; 2548 my $class = shift;
2452 2549
2453 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2454 fontsize => 1, 2551 fontsize => 1,
2455 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2456 #font => default_font 2554 #font => default_font
2457 @_, 2555 @_,
2458 2556
2459 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2460 par => [], 2558 par => [],
… …
2475 2573
2476 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2477 $self->reflow; 2575 $self->reflow;
2478} 2576}
2479 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2480sub size_allocate { 2587sub invoke_size_allocate {
2481 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2482 2589
2483 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2484 2592
2485 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 2597
2489 $self->reflow; 2598 $self->reflow;
2490}
2491 2599
2492sub text_size { 2600 local $self->{children} = [$empty, $slider];
2493 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2494 2606
2495 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2496 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2500 2620 );
2621
2501 $layout->size 2622 $layout
2502} 2623}
2503 2624
2504sub reflow { 2625sub reflow {
2505 my ($self) = @_; 2626 my ($self) = @_;
2506 2627
… …
2515 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2516} 2637}
2517 2638
2518sub clear { 2639sub clear {
2519 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2520 2644
2521 $self->{par} = []; 2645 $self->{par} = [];
2522 $self->{height} = 0; 2646 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524} 2648}
2525 2649
2526sub add_paragraph { 2650sub add_paragraph {
2527 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2528 2652
2529 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2530 my ($w, $h) = $self->text_size ($line); 2654
2531 $self->{height} += $h; 2655 $para = {
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2533 } 2662 };
2534 2663
2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2536} 2676}
2537 2677
2538sub update { 2678sub update {
2539 my ($self) = @_; 2679 my ($self) = @_;
2540 2680
… …
2542 2682
2543 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2544 2684
2545 delete $self->{texture}; 2685 delete $self->{texture};
2546 2686
2547 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549 2689
2550 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2551 my $height = 0; 2691 my $height = 0;
2552 2692
2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2557 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2559 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3]; 2697
2563 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2564 } 2701 }
2565 2702
2566 $height += $_->[1]; 2703 $height += $para->{h};
2567 } 2704 }
2568 2705
2569 $self->{height} = $height; 2706 $self->{height} = $height;
2570 2707
2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2572 2709
2573 delete $self->{texture}; 2710 delete $self->{texture};
2574 } 2711 }
2575 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2579 2720
2580 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2581 2722
2582 my $y0 = $top; 2723 my $y0 = $top;
2583 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2584 2725
2585 my $y = 0; 2726 my $y = 0;
2586
2587 my $layout = $self->{layout};
2588
2589 $layout->set_font ($self->{font}) if $self->{font};
2590 2727
2591 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594 2731
2595 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2596 my $h = $par->[1]; 2733 my $h = $para->{h};
2597 2734
2598 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] }); 2736
2600 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2601 $layout->set_markup ($par->[4]);
2602 2738
2603 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2604 2740
2605 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2607 } 2756 }
2608 2757
2609 $y += $h; 2758 $y += $h;
2610 } 2759 }
2611 2760
2612 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2613 }; 2762 };
2614 }); 2763 });
2615} 2764}
2616 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2617sub _draw { 2775sub _draw {
2618 my ($self) = @_; 2776 my ($self) = @_;
2619 2777
2620 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2624 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2625 2783
2626 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2627
2628} 2785}
2629 2786
2630############################################################################# 2787#############################################################################
2631 2788
2632package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2719 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2723 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2724 2884
2725 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2726 markup => $tooltip, 2886 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2739 2899
2740 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2741} 2901}
2742 2902
2743sub size_allocate { 2903sub invoke_size_allocate {
2744 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2745 2905
2746 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2747} 2907}
2748 2908
2749sub visibility_change { 2909sub invoke_visibility_change {
2750 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2751 2911
2752 return unless $visible; 2912 return unless $visible;
2753 2913
2754 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2756 or return; 2916 or return;
2757 2917
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759 2919
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2762 2922
2763 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2764 }); 2924 });
2765} 2925}
2766 2926
… …
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2856 3016
2857 if ($tex) { 3017 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2863 } 3023 }
2864} 3024}
2865 3025
2866sub DESTROY { 3026sub destroy {
2867 my ($self) = @_; 3027 my ($self) = @_;
2868 3028
2869 $self->{timer}->cancel 3029 $self->{timer}->cancel
2870 if $self->{timer}; 3030 if $self->{timer};
2871 3031
2872 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2873} 3033}
2874 3034
2875############################################################################# 3035#############################################################################
2876 3036
2877package CFClient::UI::Buttonbar; 3037package CFClient::UI::Buttonbar;
… …
2898 ); 3058 );
2899 3059
2900 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2901 3061
2902 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2903 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2904 3064
2905 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2906 if (!ref $widget) { 3066 if (!ref $widget) {
2907 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2908 can_hover => 1, 3068 can_hover => 1,
2909 can_events => 1, 3069 can_events => 1,
2910 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2911 } 3072 }
2912 3073
2913 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2914 3075
2915 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2920 3081
2921# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
2922sub popup { 3083sub popup {
2923 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2924 3085
2925 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2926 3087
2927 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2928 $GRAB = $self; 3089 $GRAB = $self;
2929 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2930 3091
2931 $self->show; 3092 $self->show;
2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2933} 3094}
2934 3095
2935sub mouse_motion { 3096sub invoke_mouse_motion {
2936 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2937 3098
2938 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2940 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2941 3102
2942 0 3103 0
2943} 3104}
2944 3105
2945sub button_up { 3106sub invoke_button_up {
2946 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2947 3108
2948 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2949 undef $GRAB; 3110 undef $GRAB;
2950 $self->hide; 3111 $self->hide;
2951 3112
2952 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2953 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
2954 } else { 3115 } else {
2955 return 0 3116 return 0
2956 } 3117 }
2957 3118
… …
2994 : $self->{children}[$page_or_widget]; 3155 : $self->{children}[$page_or_widget];
2995 3156
2996 $self->{current} = $widget; 3157 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998 3159
2999 $self->_emit (page_changed => $self->{current}); 3160 $self->emit (page_changed => $self->{current});
3000 3161
3001 $self->realloc; 3162 $self->realloc;
3002} 3163}
3003 3164
3004sub visible_children { 3165sub visible_children {
… …
3009 my ($self) = @_; 3170 my ($self) = @_;
3010 3171
3011 $self->{current}->size_request 3172 $self->{current}->size_request
3012} 3173}
3013 3174
3014sub size_allocate { 3175sub invoke_size_allocate {
3015 my ($self, $w, $h) = @_; 3176 my ($self, $w, $h) = @_;
3016 3177
3017 $self->{current}->configure (0, 0, $w, $h); 3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3018} 3181}
3019 3182
3020sub _draw { 3183sub _draw {
3021 my ($self) = @_; 3184 my ($self) = @_;
3022 3185
… …
3061 3224
3062sub set_current_page { 3225sub set_current_page {
3063 my ($self, $page) = @_; 3226 my ($self, $page) = @_;
3064 3227
3065 $self->{multiplexer}->set_current_page ($page); 3228 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current}); 3229 $self->emit (page_changed => $self->{multiplexer}{current});
3067} 3230}
3068 3231
3069############################################################################# 3232#############################################################################
3070 3233
3071package CFClient::UI::Statusbox; 3234package CFClient::UI::Combobox;
3072 3235
3236use utf8;
3237
3073our @ISA = CFClient::UI::VBox::; 3238our @ISA = CFClient::UI::Button::;
3074 3239
3075sub new { 3240sub new {
3076 my $class = shift; 3241 my $class = shift;
3077 3242
3078 $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
3244 options => [], # [value, title, longdesc], ...
3245 value => undef,
3246 @_,
3247 );
3248
3249 $self->_set_value ($self->{value});
3250
3251 $self
3252}
3253
3254sub invoke_button_down {
3255 my ($self, $ev) = @_;
3256
3257 my @menu_items;
3258
3259 for (@{ $self->{options} }) {
3260 my ($value, $title, $tooltip) = @$_;
3261
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 }
3264
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266}
3267
3268sub _set_value {
3269 my ($self, $value) = @_;
3270
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3272 or return;
3273
3274 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]);
3277}
3278
3279sub set_value {
3280 my ($self, $value) = @_;
3281
3282 return unless $self->{value} ne $value;
3283
3284 $self->_set_value ($value);
3285 $self->emit (changed => $value);
3286}
3287
3288#############################################################################
3289
3290package CFClient::UI::Statusbox;
3291
3292our @ISA = CFClient::UI::VBox::;
3293
3294sub new {
3295 my $class = shift;
3296
3297 my $self = $class->SUPER::new (
3079 fontsize => 0.8, 3298 fontsize => 0.8,
3080 @_, 3299 @_,
3081 ) 3300 );
3301
3302 Scalar::Util::weaken (my $this = $self);
3303
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305
3306 $self
3082} 3307}
3083 3308
3084sub reorder { 3309sub reorder {
3085 my ($self) = @_; 3310 my ($self) = @_;
3086 my $NOW = time; 3311 my $NOW = Time::HiRes::time;
3312
3313 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} };
3087 3317
3088 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 3320 }
3091 3321
… …
3094 my @items = sort { 3324 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
3098 3328
3329 $self->{timer}->interval (1);
3330
3099 my $count = 10 + 1; 3331 my $count = 10 + 1;
3100 for my $item (@items) { 3332 for my $item (@items) {
3101 last unless --$count; 3333 last unless --$count;
3102 3334
3103 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 3339 : $item->{text};
3108 3340
… …
3116 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
3122 can_events => 1, 3354 can_events => 1,
3123 can_hover => 1 3355 can_hover => 1
3124 }; 3356 };
3357
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1;
3363 $self->{timer}->interval (1/30);
3364 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 }
3367
3368 push @widgets, $label;
3125 } 3369 }
3126 3370
3127 $self->clear; 3371 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
3129} 3373}
… …
3134 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
3136 3380
3137 return unless $text; 3381 return unless $text;
3138 3382
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 3384
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 3386
3143 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
3145 $item->{count}++; 3389 $item->{count}++;
3146 } else { 3390 } else {
3147 $item->{count} = 1; 3391 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
3149 } 3393 }
3150 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
3151 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
3152 delete $item->{label}; 3396 delete $item->{label};
3153 } else { 3397 } else {
3154 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
3155 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
3174 3418
3175 $self->reorder; 3419 $self->reorder;
3176 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
3177} 3421}
3178 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
3179############################################################################# 3431#############################################################################
3180 3432
3181package CFClient::UI::Inventory; 3433package CFClient::UI::Inventory;
3182 3434
3183our @ISA = CFClient::UI::ScrolledWindow::; 3435our @ISA = CFClient::UI::ScrolledWindow::;
… …
3282 $self->update_binding_widgets; 3534 $self->update_binding_widgets;
3283 3535
3284 $self 3536 $self
3285} 3537}
3286 3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3287sub commit { 3551sub commit {
3288 my ($self) = @_; 3552 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding; 3553 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) { 3554 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3325 my ($self) = @_; 3589 my ($self) = @_;
3326 $self->ask_for_bind (1); 3590 $self->ask_for_bind (1);
3327} 3591}
3328 3592
3329sub ask_for_bind { 3593sub ask_for_bind {
3330 my ($self, $commit) = @_; 3594 my ($self, $commit, $end_cb) = @_;
3331 3595
3332 CFClient::Binder::open_binding_dialog (sub { 3596 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_; 3597 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets; 3599 $self->update_binding_widgets;
3336 $self->commit if $commit; 3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3337 }); 3602 });
3338} 3603}
3339 3604
3340# $mod and $sym are the modifiers and key symbol 3605# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands) 3606# $cmds is a array ref of strings (the commands)
… …
3359} 3624}
3360 3625
3361# this is a shortcut method that asks for a binding 3626# this is a shortcut method that asks for a binding
3362# and then just binds it. 3627# and then just binds it.
3363sub do_quick_binding { 3628sub do_quick_binding {
3364 my ($self, $cmds) = @_; 3629 my ($self, $cmds, $end_cb) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub { 3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1); 3631 $self->ask_for_bind (1, $end_cb);
3369} 3632}
3370 3633
3371sub update_binding_widgets { 3634sub update_binding_widgets {
3372 my ($self) = @_; 3635 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding; 3636 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3429 commands => [], 3692 commands => [],
3430 @_, 3693 @_,
3431 ) 3694 )
3432} 3695}
3433 3696
3434# XXX: Do sorting? Argl... 3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3435sub add_spell { 3782sub add_spell {
3436 my ($self, $spell) = @_; 3783 my ($self, $spell) = @_;
3784
3437 $self->{spells}->{$spell->{name}} = $spell; 3785 $self->{spell}->{$spell->{name}} = $spell;
3438 3786 $self->rebuild_spell_list;
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466} 3787}
3467 3788
3468sub remove_spell { 3789sub remove_spell {
3469 my ($self, $spell) = @_; 3790 my ($self, $spell) = @_;
3791
3470 delete $self->{spells}->{$spell->{name}}; 3792 delete $self->{spell}->{$spell->{name}};
3471 $self->rebuild_spell_list; 3793 $self->rebuild_spell_list;
3472} 3794}
3473 3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3474############################################################################# 3803#############################################################################
3475 3804
3476package CFClient::UI::Root; 3805package CFClient::UI::Root;
3477 3806
3478our @ISA = CFClient::UI::Container::; 3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3479 3810
3480use CFClient::OpenGL; 3811use CFClient::OpenGL;
3481 3812
3482sub new { 3813sub new {
3483 my $class = shift; 3814 my $class = shift;
… …
3510 $coord = $max - $size if $coord > $max - $size; 3841 $coord = $max - $size if $coord > $max - $size;
3511 3842
3512 int $coord + 0.5 3843 int $coord + 0.5
3513} 3844}
3514 3845
3515sub size_allocate { 3846sub invoke_size_allocate {
3516 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3517 3848
3518 for my $child ($self->children) { 3849 for my $child ($self->children) {
3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3520 3851
… …
3524 $X = _to_pixel $X, $W, $self->{w}; 3855 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3526 3857
3527 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3528 } 3859 }
3860
3861 1
3529} 3862}
3530 3863
3531sub coord2local { 3864sub coord2local {
3532 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3533 3866
… …
3618 3951
3619 delete $queue{$widget+0}; 3952 delete $queue{$widget+0};
3620 3953
3621 my ($w, $h) = $widget->size_request; 3954 my ($w, $h) = $widget->size_request;
3622 3955
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625 3961
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 3962 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 3963 $h = $widget->{force_h} if exists $widget->{force_h};
3628 3964
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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