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.329 by root, Sun Jul 23 02:44:06 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 $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus); 430 $self->update;
429 431
430 $focus->update if $focus; 432 0
431 $FOCUS->update;
432} 433}
433 434
434sub focus_out { 435sub invoke_focus_out {
435 my ($self) = @_; 436 my ($self) = @_;
436 437
437 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
438 439
439 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
440 441
441 $self->_emit (focus_out => $focus); 442 $self->update;
442 443
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 445 unless $FOCUS;
447}
448 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
449sub mouse_motion { 0 } 457sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 458sub invoke_button_up { 0 }
451sub key_down { 0 } 459sub invoke_key_down { 0 }
452sub key_up { 0 } 460sub invoke_key_up { 0 }
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 0
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 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480
481 #d##TODO# stop propagating at first true, do not use sum
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 485}
461 486
462sub find_widget { 487sub find_widget {
463 my ($self, $x, $y) = @_; 488 my ($self, $x, $y) = @_;
464 489
… …
474sub set_parent { 499sub set_parent {
475 my ($self, $parent) = @_; 500 my ($self, $parent) = @_;
476 501
477 Scalar::Util::weaken ($self->{parent} = $parent); 502 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 503 $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} 504}
503 505
504sub realloc { 506sub realloc {
505 my ($self) = @_; 507 my ($self) = @_;
506 508
… …
539 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
540 542
541 # update screen rectangle 543 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 546
547 # skip widgets that are entirely outside the drawing area 547 # skip widgets that are entirely outside the drawing area
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
… …
590} 589}
591 590
592sub DESTROY { 591sub DESTROY {
593 my ($self) = @_; 592 my ($self) = @_;
594 593
594 return if CFClient::in_destruct;
595
595 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
596 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 600}
598 601
599############################################################################# 602#############################################################################
600 603
601package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
626 629
627 if ($color && (@$color < 4 || $color->[3])) { 630 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 631 my ($w, $h) = @$self{qw(w h)};
629 632
630 glEnable GL_BLEND; 633 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 635 glColor_premultiply @$color;
633 636
634 glBegin GL_QUADS; 637 glBegin GL_QUADS;
635 glVertex 0 , 0; 638 glVertex 0 , 0;
636 glVertex 0 , $h; 639 glVertex 0 , $h;
637 glVertex $w, $h; 640 glVertex $w, $h;
… …
766} 769}
767 770
768sub add { 771sub add {
769 my ($self, $child) = @_; 772 my ($self, $child) = @_;
770 773
771 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
774} 776}
775 777
776sub remove { 778sub remove {
777 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
786 788
787sub size_request { 789sub size_request {
788 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
789} 791}
790 792
791sub size_allocate { 793sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
793 795
794 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
795} 799}
796 800
797############################################################################# 801#############################################################################
798 802
799# back-buffered drawing area 803# back-buffered drawing area
… …
815 819
816 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
817 $self->SUPER::update; 821 $self->SUPER::update;
818} 822}
819 823
820sub size_allocate { 824sub invoke_size_allocate {
821 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
822 826
823 $self->SUPER::size_allocate ($w, $h);
824 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
825} 830}
826 831
827sub _render { 832sub _render {
828 my ($self) = @_; 833 my ($self) = @_;
829 834
… …
856 my $tex = $self->{texture} 861 my $tex = $self->{texture}
857 or return; 862 or return;
858 863
859 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 866 glColor 0, 0, 0, 1;
862 867
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 869
865 glDisable GL_TEXTURE_2D; 870 glDisable GL_TEXTURE_2D;
866} 871}
… …
890 $h = 10 if $self->{scroll_y}; 895 $h = 10 if $self->{scroll_y};
891 896
892 ($w, $h) 897 ($w, $h)
893} 898}
894 899
895sub size_allocate { 900sub invoke_size_allocate {
896 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
897 902
898 my $child = $self->child; 903 my $child = $self->child;
899 904
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902 907
903 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
904 $self->update; 909 $self->update;
910
911 1
905} 912}
906 913
907sub set_offset { 914sub set_offset {
908 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
909 916
… …
983 $self->add ($child) if $child; 990 $self->add ($child) if $child;
984 991
985 $self 992 $self
986} 993}
987 994
995#TODO# update range on size_allocate depending on child
996
988sub add { 997sub add {
989 my ($self, $widget) = @_; 998 my ($self, $widget) = @_;
990 999
991 $self->{vp}->add ($self->{child} = $widget); 1000 $self->{vp}->add ($self->{child} = $widget);
992} 1001}
993 1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
994sub update { 1017sub update {
995 my ($self) = @_; 1018 my ($self) = @_;
996 1019
997 $self->SUPER::update; 1020 $self->SUPER::update;
998 1021
999 # todo: overwrite size_allocate of child 1022 $self->update_slider;
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1023}
1003 1024
1004sub size_allocate { 1025sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
1006 1027
1028 $self->update_slider;
1029
1007 $self->SUPER::size_allocate ($w, $h); 1030 $self->SUPER::invoke_size_allocate ($w, $h)
1008
1009 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1011} 1031}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1032
1016############################################################################# 1033#############################################################################
1017 1034
1018package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1019 1036
… …
1035 1052
1036 if ($self->{bg}) { 1053 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1054 my ($w, $h) = @$self{qw(w h)};
1038 1055
1039 glEnable GL_BLEND; 1056 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1058 glColor_premultiply @{ $self->{bg} };
1042 1059
1043 glBegin GL_QUADS; 1060 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1061 glVertex 0 , 0;
1045 glVertex 0 , $h; 1062 glVertex 0 , $h;
1046 glVertex $w, $h; 1063 glVertex $w, $h;
… …
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1088
1072sub new { 1089sub new {
1073 my ($class, %arg) = @_; 1090 my ($class, %arg) = @_;
1074 1091
1075 my $title = delete $arg{title};
1076
1077 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1080 border => 0.6, 1095 border => 0.6,
1081 can_events => 1, 1096 can_events => 1,
1082 min_w => 16, 1097 min_w => 64,
1083 min_h => 16, 1098 min_h => 32,
1084 %arg, 1099 %arg,
1085 ); 1100 );
1086 1101
1087 $self->{title} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1088 align => 0, 1103 align => 0,
1089 valign => 1, 1104 valign => 1,
1090 text => $title, 1105 text => $self->{title},
1091 fontsize => $self->{border} 1106 fontsize => $self->{border},
1092 if defined $title; 1107 if exists $self->{title};
1108
1109 if ($self->{has_close_button}) {
1110 $self->{close_button} =
1111 new CFClient::UI::ImageButton
1112 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") };
1114
1115 $self->CFClient::UI::Container::add ($self->{close_button});
1116 }
1093 1117
1094 $self 1118 $self
1095} 1119}
1096 1120
1097sub add { 1121sub add {
1098 my ($self, @widgets) = @_; 1122 my ($self, @widgets) = @_;
1099 1123
1100 $self->SUPER::add (@widgets); 1124 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102} 1127}
1103 1128
1104sub border { 1129sub border {
1105 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
1106} 1131}
1107 1132
1108sub size_request { 1133sub size_request {
1109 my ($self) = @_; 1134 my ($self) = @_;
1110 1135
1111 $self->{title}->size_request 1136 $self->{title_widget}->size_request
1112 if $self->{title}; 1137 if $self->{title_widget};
1138
1139 $self->{close_button}->size_request
1140 if $self->{close_button};
1113 1141
1114 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
1115 1143
1116 ( 1144 (
1117 $w + $self->border * 2, 1145 $w + $self->border * 2,
1118 $h + $self->border * 2, 1146 $h + $self->border * 2,
1119 ) 1147 )
1120} 1148}
1121 1149
1122sub size_allocate { 1150sub invoke_size_allocate {
1123 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1124 1152
1125 if ($self->{title}) { 1153 if ($self->{title_widget}) {
1126 $self->{title}{w} = $w; 1154 $self->{title_widget}{w} = $w;
1127 $self->{title}{h} = $h; 1155 $self->{title_widget}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h); 1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1129 } 1157 }
1130 1158
1131 my $border = $self->border; 1159 my $border = $self->border;
1132 1160
1133 $h -= List::Util::max 0, $border * 2; 1161 $h -= List::Util::max 0, $border * 2;
1134 $w -= List::Util::max 0, $border * 2; 1162 $w -= List::Util::max 0, $border * 2;
1163
1164 $self->child->configure ($border, $border, $w, $h);
1165
1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1167 if $self->{close_button};
1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1135 1176
1136 $self->child->configure ($border, $border, $w, $h); 1177 1
1137} 1178}
1138 1179
1139sub button_down { 1180sub invoke_button_down {
1140 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1141 1182
1142 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1143 my $border = $self->border; 1184 my $border = $self->border;
1144 1185
… …
1175 1216
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1218
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1179 # HACK: the next line is required to enforce placement 1220 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1181 }; 1222 };
1182 } else { 1223 } else {
1183 return 0; 1224 return 0;
1184 } 1225 }
1185 1226
1186 1 1227 1
1187} 1228}
1188 1229
1189sub button_up { 1230sub invoke_button_up {
1190 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1191 1232
1192 !!delete $self->{motion} 1233 ! ! delete $self->{motion}
1193} 1234}
1194 1235
1195sub mouse_motion { 1236sub invoke_mouse_motion {
1196 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1197 1238
1198 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199 1240
1200 !!$self->{motion} 1241 ! ! $self->{motion}
1201} 1242}
1202 1243
1203sub _draw { 1244sub _draw {
1204 my ($self) = @_; 1245 my ($self) = @_;
1205 1246
… …
1231 1272
1232 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1233 1274
1234 $child->draw; 1275 $child->draw;
1235 1276
1236 if ($self->{title}) { 1277 if ($self->{title_widget}) {
1237 glTranslate 0, $border - $self->{h}; 1278 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw; 1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1239 } 1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1240} 1286}
1241 1287
1242############################################################################# 1288#############################################################################
1243 1289
1244package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1267 1313
1268 $child->set_parent ($self); 1314 $child->set_parent ($self);
1269 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1270 1316
1271 $self->realloc; 1317 $self->realloc;
1318}
1319
1320sub remove {
1321 my ($self, $child) = @_;
1322
1323 # TODO: not yet implemented
1272} 1324}
1273 1325
1274# TODO: move to container class maybe? send children a signal on removal? 1326# TODO: move to container class maybe? send children a signal on removal?
1275sub clear { 1327sub clear {
1276 my ($self) = @_; 1328 my ($self) = @_;
… …
1317 (sum @$ws), 1369 (sum @$ws),
1318 (sum @$hs), 1370 (sum @$hs),
1319 ) 1371 )
1320} 1372}
1321 1373
1322sub size_allocate { 1374sub invoke_size_allocate {
1323 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1324 1376
1325 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1326 1378
1327 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1359 } 1411 }
1360 1412
1361 $y += $row_h; 1413 $y += $row_h;
1362 } 1414 }
1363 1415
1416 1
1364} 1417}
1365 1418
1366sub find_widget { 1419sub find_widget {
1367 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1368 1421
… …
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 ) 1460 )
1408} 1461}
1409 1462
1410sub size_allocate { 1463sub invoke_size_allocate {
1411 my ($self, $w, $h) = @_; 1464 my ($self, $w, $h) = @_;
1412 1465
1413 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1414 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1415 1468
1416 my @req; 1469 my @req;
1417 1470
1418 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1419 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1420 } else { 1473 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1422 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1423 1476
1424 if ($req > $space) { 1477 if ($req > $space) {
1425 # ah well, not enough space 1478 # ah well, not enough space
1426 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1427 } else { 1480 } else {
1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1429 1482
1430 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1431 1484
1432 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1433 for 0 .. $#$children; 1486 for 0 .. $#children;
1434 } 1487 }
1435 } 1488 }
1436 1489
1437 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1438 1491
1439 my $pos = 0; 1492 my $pos = 0;
1440 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1441 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1443 1496
1444 $pos += $alloc; 1497 $pos += $alloc;
1445 } 1498 }
1446 1499
1447 1 1500 1
… …
1537 1590
1538 delete $self->{texture}; 1591 delete $self->{texture};
1539 $self->SUPER::update; 1592 $self->SUPER::update;
1540} 1593}
1541 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1542sub set_text { 1602sub set_text {
1543 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1544 1604
1545 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1547 1607
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1550 1609
1610 delete $self->{size_req};
1551 $self->realloc; 1611 $self->realloc;
1552 $self->update; 1612 $self->update;
1553} 1613}
1554 1614
1555sub set_markup { 1615sub set_markup {
… …
1558 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1559 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1560 1620
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1622
1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1564 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1565 1624
1625 delete $self->{size_req};
1566 $self->realloc; 1626 $self->realloc;
1567 $self->update; 1627 $self->update;
1568} 1628}
1569 1629
1570sub size_request { 1630sub size_request {
1571 my ($self) = @_; 1631 my ($self) = @_;
1572 1632
1633 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 1639
1579 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1580 1641
1581 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1582 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 1646
1585 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1586 1648
1587 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1589 } 1654 };
1590 1655
1591 ($w, $h) 1656 @{ $self->{size_req} }
1592} 1657}
1593 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1594sub size_allocate { 1663sub invoke_size_allocate {
1595 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1596 1665
1597 delete $self->{ox}; 1666 delete $self->{ox};
1598 1667
1599 delete $self->{texture} 1668 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1601} 1672}
1602 1673
1603sub set_fontsize { 1674sub set_fontsize {
1604 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1605 1676
1606 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1607 delete $self->{texture}; 1679 delete $self->{texture};
1608 1680
1609 $self->realloc; 1681 $self->realloc;
1610} 1682}
1611 1683
1684sub reconfigure {
1685 my ($self) = @_;
1686
1687 delete $self->{size_req};
1688 delete $self->{texture};
1689
1690 $self->SUPER::reconfigure;
1691}
1692
1612sub _draw { 1693sub _draw {
1613 my ($self) = @_; 1694 my ($self) = @_;
1614 1695
1615 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1616 1697
1617 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1618 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1619 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1620 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1621 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1624 1705
1625 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1626 }; 1707 };
1627 1708
1628 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1631 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1632 1713
1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1636 }; 1717 };
1637 1718
1638 glEnable GL_TEXTURE_2D; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1640 1721
1641 if ($tex->{format} == GL_ALPHA) { 1722 $self->{layout}->render ($self->{ox}, $self->{oy});
1642 glColor @{$self->{fg}};
1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1644 } else {
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646 }
1647
1648 glDisable GL_TEXTURE_2D;
1649} 1723}
1650 1724
1651############################################################################# 1725#############################################################################
1652 1726
1653package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1667 can_hover => 1, 1741 can_hover => 1,
1668 can_focus => 1, 1742 can_focus => 1,
1669 valign => 0, 1743 valign => 0,
1670 can_events => 1, 1744 can_events => 1,
1671 #text => ... 1745 #text => ...
1746 #hidden => "*",
1672 @_ 1747 @_
1673 ) 1748 )
1674} 1749}
1675 1750
1676sub _set_text { 1751sub _set_text {
… …
1683 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1759 $self->{text} = $text;
1685 1760
1686 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1688 1764
1689 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1690 $self->update; 1768 $self->update;
1691} 1769}
1692 1770
1693sub set_text { 1771sub set_text {
1694 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1695 1773
1696 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 1775 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 1776}
1701 1777
1702sub get_text { 1778sub get_text {
1703 $_[0]{text} 1779 $_[0]{text}
1704} 1780}
… …
1709 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1710 1786
1711 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1712} 1788}
1713 1789
1714sub key_down { 1790sub invoke_key_down {
1715 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1716 1792
1717 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1718 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1719 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1731 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1732 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1733 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1734 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1735 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1736 $self->_emit ('escape'); 1812 $self->emit ('escape');
1737 } elsif ($uni) { 1813 } elsif ($uni) {
1738 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else { 1815 } else {
1740 return 0; 1816 return 0;
1741 } 1817 }
… …
1745 $self->realloc; 1821 $self->realloc;
1746 1822
1747 1 1823 1
1748} 1824}
1749 1825
1750sub focus_in { 1826sub invoke_focus_in {
1751 my ($self) = @_; 1827 my ($self) = @_;
1752 1828
1753 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1754 1830
1755 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1756} 1832}
1757 1833
1758sub button_down { 1834sub invoke_button_down {
1759 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1760 1836
1761 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1762 1838
1763 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1764 1840
1765 # byte-index to char-index 1841 # byte-index to char-index
1766 my $text = $self->{text}; 1842 my $text = $self->{text};
1767 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1768 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1769 1845
1770 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1771 $self->update; 1847 $self->update;
1772 1848
1773 1 1849 1
1774} 1850}
1775 1851
1776sub mouse_motion { 1852sub invoke_mouse_motion {
1777 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1854# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779 1855
1780 0 1856 1
1781} 1857}
1782 1858
1783sub _draw { 1859sub _draw {
1784 my ($self) = @_; 1860 my ($self) = @_;
1785 1861
1786 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1787 1863
1788 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1791 } else { 1867 } else {
1792 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1793 } 1869 }
1794 1870
1795 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1798 glVertex 0 , 0; 1874 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1826 1902
1827our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1828 1904
1829use CFClient::OpenGL; 1905use CFClient::OpenGL;
1830 1906
1831sub key_down { 1907sub invoke_key_down {
1832 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1833 1909
1834 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1835 1911
1836 if ($sym == 13) { 1912 if ($sym == 13) {
1837 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1838 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1839 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1840 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1841 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1842 $self->update; 1919 $self->update;
1843 1920
1844 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1845 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1846 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1862 } else { 1939 } else {
1863 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1864 } 1941 }
1865 1942
1866 } else { 1943 } else {
1867 return $self->SUPER::key_down ($ev) 1944 return $self->SUPER::invoke_key_down ($ev)
1868 } 1945 }
1869 1946
1870 1 1947 1
1871} 1948}
1872 1949
… …
1896 can_events => 1, 1973 can_events => 1,
1897 @_ 1974 @_
1898 ) 1975 )
1899} 1976}
1900 1977
1901sub activate { }
1902
1903sub button_up { 1978sub invoke_button_up {
1904 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1905 1980
1906 $self->emit ("activate") 1981 $self->emit ("activate")
1907 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1908 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
… …
1911} 1986}
1912 1987
1913sub _draw { 1988sub _draw {
1914 my ($self) = @_; 1989 my ($self) = @_;
1915 1990
1916 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921 1992
1922 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1925 1996
1926 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1927 1998
1928 glDisable GL_TEXTURE_2D; 1999 glDisable GL_TEXTURE_2D;
1929 2000
1930 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
2002}
2003
2004#############################################################################
2005
2006package CFClient::UI::ImageButton;
2007
2008our @ISA = CFClient::UI::Image::;
2009
2010use CFClient::OpenGL;
2011
2012my %textures;
2013
2014sub new {
2015 my $class = shift;
2016
2017 my $self = $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1,
2023 align => 0,
2024 valign => 0,
2025 can_events => 1,
2026 @_
2027 );
2028}
2029
2030sub invoke_button_up {
2031 my ($self, $ev, $x, $y) = @_;
2032
2033 $self->emit ("activate")
2034 if $x >= 0 && $x < $self->{w}
2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1931} 2038}
1932 2039
1933############################################################################# 2040#############################################################################
1934 2041
1935package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
… …
1962 my ($self) = @_; 2069 my ($self) = @_;
1963 2070
1964 (6) x 2 2071 (6) x 2
1965} 2072}
1966 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1967sub button_down { 2082sub invoke_button_down {
1968 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1969 2084
1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1972 $self->{state} = !$self->{state}; 2087 $self->toggle;
1973 $self->_emit (changed => $self->{state});
1974 } else { 2088 } else {
1975 return 0 2089 return 0
1976 } 2090 }
1977 2091
1978 1 2092 1
… …
2003package CFClient::UI::Image; 2117package CFClient::UI::Image;
2004 2118
2005our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
2006 2120
2007use CFClient::OpenGL; 2121use CFClient::OpenGL;
2008use Carp qw/confess/;
2009 2122
2010our %loaded_images; 2123our %texture_cache;
2011 2124
2012sub new { 2125sub new {
2013 my $class = shift; 2126 my $class = shift;
2014 2127
2015 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2016 2132
2017 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
2018 2135
2019 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2020 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2021 2138
2022 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2023 2140
2024 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2025
2026 $self->{aspect} = $tex->{w} / $tex->{h};
2027 2142
2028 $self 2143 $self
2029} 2144}
2030 2145
2031sub size_request { 2146sub size_request {
2032 my ($self) = @_; 2147 my ($self) = @_;
2033 2148
2034 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
2035} 2150}
2036 2151
2037sub _draw { 2152sub _draw {
2038 my ($self) = @_; 2153 my ($self) = @_;
2039 2154
… …
2148 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2149 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2150 2265
2151 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2152 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2153 2271
2154 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2155 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2156 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2277
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
2175 2294
2176 if ($t3) { 2295 if ($t3) {
2177 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2178 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2179 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2180 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2181 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2182 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2183 glEnd; 2302 glEnd;
2184 } 2303 }
2185 2304
2186 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2274 $self->update; 2393 $self->update;
2275 2394
2276 $self 2395 $self
2277} 2396}
2278 2397
2279sub changed { }
2280
2281sub set_range { 2398sub set_range {
2282 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2283 2400
2284 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2285 2402
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}"; 2403 if ("@$range" ne "@{$self->{range}}") {
2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2288} 2407}
2289 2408
2290sub set_value { 2409sub set_value {
2291 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2292 2411
… …
2303 if $unit; 2422 if $unit;
2304 2423
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306 2425
2307 if ($value != $old_value) { 2426 if ($value != $old_value) {
2308 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2309 $self->update; 2428 $self->update;
2310 } 2429 }
2311} 2430}
2312 2431
2313sub size_request { 2432sub size_request {
2314 my ($self) = @_; 2433 my ($self) = @_;
2315 2434
2316 ($self->{req_w}, $self->{req_h}) 2435 ($self->{req_w}, $self->{req_h})
2317} 2436}
2318 2437
2319sub button_down { 2438sub invoke_button_down {
2320 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2321 2440
2322 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2323 2442
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325 2444
2326 $self->mouse_motion ($ev, $x, $y) 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2327} 2446}
2328 2447
2329sub mouse_motion { 2448sub invoke_mouse_motion {
2330 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2331 2450
2332 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334 2453
… …
2439sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2441 2560
2442############################################################################# 2561#############################################################################
2443 2562
2444package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2445 2564
2446our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2447 2566
2448use CFClient::OpenGL; 2567use CFClient::OpenGL;
2449 2568
… …
2451 my $class = shift; 2570 my $class = shift;
2452 2571
2453 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2454 fontsize => 1, 2573 fontsize => 1,
2455 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2456 #font => default_font 2576 #font => default_font
2457 @_, 2577 @_,
2458 2578
2459 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2460 par => [], 2580 par => [],
2461 height => 0, 2581 height => 0,
2462 children => [ 2582 children => [
2463 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2464 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2475 2595
2476 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2477 $self->reflow; 2597 $self->reflow;
2478} 2598}
2479 2599
2600sub size_request {
2601 my ($self) = @_;
2602
2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2607}
2608
2480sub size_allocate { 2609sub invoke_size_allocate {
2481 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2482 2611
2483 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2484 2614
2485 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 2619
2489 $self->reflow; 2620 $self->reflow;
2490}
2491 2621
2492sub text_size { 2622 local $self->{children} = [$empty, $slider];
2493 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2494 2628
2495 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2496 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 $layout->set_markup ($text); 2636 $layout->set_markup ($para->{markup});
2637
2638 $layout->set_shapes (
2639 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}}
2500 2642 );
2643
2501 $layout->size 2644 $layout
2502} 2645}
2503 2646
2504sub reflow { 2647sub reflow {
2505 my ($self) = @_; 2648 my ($self) = @_;
2506 2649
… …
2515 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2516} 2659}
2517 2660
2518sub clear { 2661sub clear {
2519 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2520 2666
2521 $self->{par} = []; 2667 $self->{par} = [];
2522 $self->{height} = 0; 2668 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524} 2670}
2525 2671
2526sub add_paragraph { 2672sub add_paragraph {
2527 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2528 2674
2529 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2530 my ($w, $h) = $self->text_size ($line); 2676
2531 $self->{height} += $h; 2677 $para = {
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2678 w => 1e10,
2679 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2533 } 2684 };
2534 2685
2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2686 $self->add (@w) if @w;
2687 push @{$self->{par}}, $para;
2688
2689 $self->{need_reflow}++;
2690 $self->update;
2691}
2692
2693sub scroll_to_bottom {
2694 my ($self) = @_;
2695
2696 $self->{scroll_to_bottom} = 1;
2697 $self->update;
2536} 2698}
2537 2699
2538sub update { 2700sub update {
2539 my ($self) = @_; 2701 my ($self) = @_;
2540 2702
… …
2542 2704
2543 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2544 2706
2545 delete $self->{texture}; 2707 delete $self->{texture};
2546 2708
2547 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549 2711
2550 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2551 my $height = 0; 2713 my $height = 0;
2552 2714
2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2557 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2559 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3]; 2719
2563 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2564 } 2723 }
2565 2724
2566 $height += $_->[1]; 2725 $height += $para->{h};
2567 } 2726 }
2568 2727
2569 $self->{height} = $height; 2728 $self->{height} = $height;
2570 2729
2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2572 2731
2573 delete $self->{texture}; 2732 delete $self->{texture};
2574 } 2733 }
2575 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2579 2742
2580 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2581 2744
2582 my $y0 = $top; 2745 my $y0 = $top;
2583 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2584 2747
2585 my $y = 0; 2748 my $y = 0;
2586 2749
2587 my $layout = $self->{layout};
2588
2589 $layout->set_font ($self->{font}) if $self->{font};
2590
2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594
2595 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2596 my $h = $par->[1]; 2751 my $h = $para->{h};
2597 2752
2598 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] });
2600 $layout->set_width ($W - $par->[3]);
2601 $layout->set_markup ($par->[4]);
2602 2754
2603 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2604 2756
2605 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2758
2759 if (my @w = @{ $para->{widget} }) {
2760 my @s = $layout->get_shapes;
2761
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 }
2607 } 2771 }
2608 2772
2609 $y += $h; 2773 $y += $h;
2610 } 2774 }
2611
2612 glDisable GL_BLEND;
2613 }; 2775 };
2614 }); 2776 });
2615} 2777}
2616 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2617sub _draw { 2788sub _draw {
2618 my ($self) = @_; 2789 my ($self) = @_;
2619 2790
2620 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2794 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2624 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2625 2796
2626 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2627
2628} 2798}
2629 2799
2630############################################################################# 2800#############################################################################
2631 2801
2632package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2719 $tooltip .= "\n\n" . (ref $widget) . "\n" 2889 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n" 2891 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}"; 2892 . "visible $widget->{visible}";
2723 } 2893 }
2894
2895 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//;
2724 2897
2725 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2726 markup => $tooltip, 2899 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8, 2901 fontsize => 0.8,
… …
2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2739 2912
2740 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2741} 2914}
2742 2915
2743sub size_allocate { 2916sub invoke_size_allocate {
2744 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2745 2918
2746 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2747} 2920}
2748 2921
2749sub visibility_change { 2922sub invoke_visibility_change {
2750 my ($self, $visible) = @_; 2923 my ($self, $visible) = @_;
2751 2924
2752 return unless $visible; 2925 return unless $visible;
2753 2926
2754 $self->{root}->on_post_alloc ("move_$self" => sub { 2927 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2756 or return; 2929 or return;
2757 2930
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759 2932
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH; 2934 if $x + $self->{w} > $self->{root}{w};
2762 2935
2763 $self->move_abs ($x, $y); 2936 $self->move_abs ($x, $y);
2764 }); 2937 });
2765} 2938}
2766 2939
… …
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2856 3029
2857 if ($tex) { 3030 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2863 } 3036 }
2864} 3037}
2865 3038
2866sub DESTROY { 3039sub destroy {
2867 my ($self) = @_; 3040 my ($self) = @_;
2868 3041
2869 $self->{timer}->cancel 3042 $self->{timer}->cancel
2870 if $self->{timer}; 3043 if $self->{timer};
2871 3044
2872 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2873} 3046}
2874 3047
2875############################################################################# 3048#############################################################################
2876 3049
2877package CFClient::UI::Buttonbar; 3050package CFClient::UI::Buttonbar;
… …
2898 ); 3071 );
2899 3072
2900 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2901 3074
2902 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2903 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2904 3077
2905 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2906 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
2907 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2908 can_hover => 1, 3095 can_hover => 1,
2909 can_events => 1, 3096 can_events => 1,
2910 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2911 } 3100 }
2912 3101
2913 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2914 3103
2915 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2920 3109
2921# popup given the event (must be a mouse button down event currently) 3110# popup given the event (must be a mouse button down event currently)
2922sub popup { 3111sub popup {
2923 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2924 3113
2925 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2926 3115
2927 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2928 $GRAB = $self; 3117 $GRAB = $self;
2929 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2930 3119
2931 $self->show; 3120 $self->show;
2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3121 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2933} 3122}
2934 3123
2935sub mouse_motion { 3124sub invoke_mouse_motion {
2936 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2937 3126
2938 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2940 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2941 3130
2942 0 3131 0
2943} 3132}
2944 3133
2945sub button_up { 3134sub invoke_button_up {
2946 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2947 3136
2948 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2949 undef $GRAB; 3138 undef $GRAB;
2950 $self->hide; 3139 $self->hide;
2951 3140
2952 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2953 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
2954 } else { 3143 } else {
2955 return 0 3144 return 0
2956 } 3145 }
2957 3146
… …
2984 3173
2985 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} }; 3175 if @{ $self->{children} };
2987} 3176}
2988 3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
2989sub set_current_page { 3184sub set_current_page {
2990 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
2991 3186
2992 my $widget = ref $page_or_widget 3187 my $widget = ref $page_or_widget
2993 ? $page_or_widget 3188 ? $page_or_widget
2994 : $self->{children}[$page_or_widget]; 3189 : $self->{children}[$page_or_widget];
2995 3190
2996 $self->{current} = $widget; 3191 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998 3193
2999 $self->_emit (page_changed => $self->{current}); 3194 $self->emit (page_changed => $self->{current});
3000 3195
3001 $self->realloc; 3196 $self->realloc;
3002} 3197}
3003 3198
3004sub visible_children { 3199sub visible_children {
… …
3009 my ($self) = @_; 3204 my ($self) = @_;
3010 3205
3011 $self->{current}->size_request 3206 $self->{current}->size_request
3012} 3207}
3013 3208
3014sub size_allocate { 3209sub invoke_size_allocate {
3015 my ($self, $w, $h) = @_; 3210 my ($self, $w, $h) = @_;
3016 3211
3017 $self->{current}->configure (0, 0, $w, $h); 3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3018} 3215}
3019 3216
3020sub _draw { 3217sub _draw {
3021 my ($self) = @_; 3218 my ($self) = @_;
3022 3219
… …
3057 ); 3254 );
3058 3255
3059 $self->{multiplexer}->add ($widget); 3256 $self->{multiplexer}->add ($widget);
3060} 3257}
3061 3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3062sub set_current_page { 3265sub set_current_page {
3063 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3064 3267
3065 $self->{multiplexer}->set_current_page ($page); 3268 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current}); 3269 $self->emit (page_changed => $self->{multiplexer}{current});
3067} 3270}
3068 3271
3069############################################################################# 3272#############################################################################
3070 3273
3071package CFClient::UI::Statusbox; 3274package CFClient::UI::Combobox;
3072 3275
3276use utf8;
3277
3073our @ISA = CFClient::UI::VBox::; 3278our @ISA = CFClient::UI::Button::;
3074 3279
3075sub new { 3280sub new {
3076 my $class = shift; 3281 my $class = shift;
3077 3282
3078 $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
3284 options => [], # [value, title, longdesc], ...
3285 value => undef,
3286 @_,
3287 );
3288
3289 $self->_set_value ($self->{value});
3290
3291 $self
3292}
3293
3294sub invoke_button_down {
3295 my ($self, $ev) = @_;
3296
3297 my @menu_items;
3298
3299 for (@{ $self->{options} }) {
3300 my ($value, $title, $tooltip) = @$_;
3301
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 }
3304
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306}
3307
3308sub _set_value {
3309 my ($self, $value) = @_;
3310
3311 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3312 or return;
3313
3314 $self->{value} = $item->[0];
3315 $self->set_markup ("$item->[1] ⇓");
3316 $self->set_tooltip ($item->[2]);
3317}
3318
3319sub set_value {
3320 my ($self, $value) = @_;
3321
3322 return unless $self->{value} ne $value;
3323
3324 $self->_set_value ($value);
3325 $self->emit (changed => $value);
3326}
3327
3328#############################################################################
3329
3330package CFClient::UI::Statusbox;
3331
3332our @ISA = CFClient::UI::VBox::;
3333
3334sub new {
3335 my $class = shift;
3336
3337 my $self = $class->SUPER::new (
3079 fontsize => 0.8, 3338 fontsize => 0.8,
3080 @_, 3339 @_,
3081 ) 3340 );
3341
3342 Scalar::Util::weaken (my $this = $self);
3343
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345
3346 $self
3082} 3347}
3083 3348
3084sub reorder { 3349sub reorder {
3085 my ($self) = @_; 3350 my ($self) = @_;
3086 my $NOW = time; 3351 my $NOW = Time::HiRes::time;
3352
3353 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} };
3087 3357
3088 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 3360 }
3091 3361
… …
3094 my @items = sort { 3364 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
3098 3368
3369 $self->{timer}->interval (1);
3370
3099 my $count = 10 + 1; 3371 my $count = 10 + 1;
3100 for my $item (@items) { 3372 for my $item (@items) {
3101 last unless --$count; 3373 last unless --$count;
3102 3374
3103 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 3379 : $item->{text};
3108 3380
… …
3116 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
3122 can_events => 1, 3394 can_events => 1,
3123 can_hover => 1 3395 can_hover => 1
3124 }; 3396 };
3397
3398 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3399 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3400 $label->update;
3401 $label->set_max_size (undef, $label->{req_h} * $diff)
3402 if $diff < 1;
3403 $self->{timer}->interval (1/30);
3404 } else {
3405 $label->{fg}[3] = $item->{fg}[3] || 1;
3406 }
3407
3408 push @widgets, $label;
3125 } 3409 }
3126 3410
3127 $self->clear; 3411 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
3129} 3413}
… …
3134 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
3136 3420
3137 return unless $text; 3421 return unless $text;
3138 3422
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 3424
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 3426
3143 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
3145 $item->{count}++; 3429 $item->{count}++;
3146 } else { 3430 } else {
3147 $item->{count} = 1; 3431 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
3149 } 3433 }
3150 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
3151 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
3152 delete $item->{label}; 3436 delete $item->{label};
3153 } else { 3437 } else {
3154 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
3155 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
3161 count => 1, 3445 count => 1,
3162 %arg, 3446 %arg,
3163 }; 3447 };
3164 } 3448 }
3165 3449
3450 $ROOT->on_refresh (reorder => sub {
3166 $self->reorder; 3451 $self->reorder;
3452 });
3167} 3453}
3168 3454
3169sub reconfigure { 3455sub reconfigure {
3170 my ($self) = @_; 3456 my ($self) = @_;
3171 3457
… …
3174 3460
3175 $self->reorder; 3461 $self->reorder;
3176 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
3177} 3463}
3178 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
3179############################################################################# 3473#############################################################################
3180 3474
3181package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3182 3476
3183our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3184 3478
3185sub new { 3479sub new {
3186 my $class = shift; 3480 my $class = shift;
3187 3481
3188 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3190 @_, 3484 @_,
3191 ); 3485 );
3192 3486
3193 $self 3487 $self
3194} 3488}
3195 3489
3196sub set_items { 3490sub set_items {
3197 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3198 3492
3199 $self->{child}->clear; 3493 $self->clear;
3200 return unless $items; 3494 return unless $items;
3201 3495
3202 my @items = sort { 3496 my @items = sort {
3203 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3205 } @$items; 3499 } values %$items;
3206 3500
3207 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3208 3502
3209 my $row = 0; 3503 my $row = 0;
3210 for my $item (@items) { 3504 for my $item (@items) {
3211 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3212 3506
3213 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3216 3510
3217 $row++; 3511 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 } 3512 }
3416} 3513}
3417 3514
3418############################################################################# 3515#############################################################################
3419 3516
… …
3429 commands => [], 3526 commands => [],
3430 @_, 3527 @_,
3431 ) 3528 )
3432} 3529}
3433 3530
3434# XXX: Do sorting? Argl... 3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544sub rebuild_spell_list {
3545 my ($self) = @_;
3546
3547 $CFClient::UI::ROOT->on_refresh ($self => sub {
3548 $self->clear;
3549
3550 return unless $::CONN;
3551
3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558 my $row = 0;
3559
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_};
3562
3563 $row++;
3564
3565 my $spell_cb = sub {
3566 my ($widget, $ev) = @_;
3567
3568 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu
3574 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ],
3578 )->popup ($ev);
3579 } else {
3580 return 0;
3581 }
3582
3583 1
3584 };
3585
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591 $self->add (0, $row, new CFClient::UI::Face
3592 face => $spell->{face},
3593 can_hover => 1,
3594 can_events => 1,
3595 tooltip => $tooltip,
3596 on_button_down => $spell_cb,
3597 );
3598
3599 $self->add (1, $row, new CFClient::UI::Label
3600 expand => 1,
3601 text => $spell->{name},
3602 can_hover => 1,
3603 can_events => 1,
3604 tooltip => $tooltip,
3605 on_button_down => $spell_cb,
3606 );
3607
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612 }
3613 });
3614}
3615
3435sub add_spell { 3616sub add_spell {
3436 my ($self, $spell) = @_; 3617 my ($self, $spell) = @_;
3618
3437 $self->{spells}->{$spell->{name}} = $spell; 3619 $self->{spell}->{$spell->{name}} = $spell;
3438 3620 $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} 3621}
3467 3622
3468sub remove_spell { 3623sub remove_spell {
3469 my ($self, $spell) = @_; 3624 my ($self, $spell) = @_;
3625
3470 delete $self->{spells}->{$spell->{name}}; 3626 delete $self->{spell}->{$spell->{name}};
3471 $self->rebuild_spell_list; 3627 $self->rebuild_spell_list;
3472} 3628}
3473 3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3474############################################################################# 3637#############################################################################
3475 3638
3476package CFClient::UI::Root; 3639package CFClient::UI::Root;
3477 3640
3478our @ISA = CFClient::UI::Container::; 3641our @ISA = CFClient::UI::Container::;
3642
3643use List::Util qw(min max);
3479 3644
3480use CFClient::OpenGL; 3645use CFClient::OpenGL;
3481 3646
3482sub new { 3647sub new {
3483 my $class = shift; 3648 my $class = shift;
… …
3510 $coord = $max - $size if $coord > $max - $size; 3675 $coord = $max - $size if $coord > $max - $size;
3511 3676
3512 int $coord + 0.5 3677 int $coord + 0.5
3513} 3678}
3514 3679
3515sub size_allocate { 3680sub invoke_size_allocate {
3516 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3517 3682
3518 for my $child ($self->children) { 3683 for my $child ($self->children) {
3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3684 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3520 3685
… …
3524 $X = _to_pixel $X, $W, $self->{w}; 3689 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3526 3691
3527 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3528 } 3693 }
3694
3695 1
3529} 3696}
3530 3697
3531sub coord2local { 3698sub coord2local {
3532 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3533 3700
… …
3618 3785
3619 delete $queue{$widget+0}; 3786 delete $queue{$widget+0};
3620 3787
3621 my ($w, $h) = $widget->size_request; 3788 my ($w, $h) = $widget->size_request;
3622 3789
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3790 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3791 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3792
3793 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3794 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3625 3795
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 3796 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 3797 $h = $widget->{force_h} if exists $widget->{force_h};
3628 3798
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3799 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3655 3825
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3657 3827
3658 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3659 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3660 3836
3661 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3662 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3663 3839
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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