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

Diff Legend

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