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.276 by root, Sun Jun 4 00:16:01 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
… …
1160 my $dy = $ev->{y} - $oy; 1201 my $dy = $ev->{y} - $oy;
1161 1202
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1203 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1204 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1205
1206 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1207 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1208 };
1168 1209
1169 } elsif ($lr ^ $td) { 1210 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1212 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1215 my ($ev, $x, $y) = @_;
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);
1220 # HACK: the next line is required to enforce placement
1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1222 };
1180 } else { 1223 } else {
1181 return 0; 1224 return 0;
1182 } 1225 }
1183 1226
1184 1 1227 1
1185} 1228}
1186 1229
1187sub button_up { 1230sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1189 1232
1190 !!delete $self->{motion} 1233 ! ! delete $self->{motion}
1191} 1234}
1192 1235
1193sub mouse_motion { 1236sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1195 1238
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1240
1198 !!$self->{motion} 1241 ! ! $self->{motion}
1199} 1242}
1200 1243
1201sub _draw { 1244sub _draw {
1202 my ($self) = @_; 1245 my ($self) = @_;
1203 1246
… …
1229 1272
1230 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1231 1274
1232 $child->draw; 1275 $child->draw;
1233 1276
1234 if ($self->{title}) { 1277 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1278 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1237 } 1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1238} 1286}
1239 1287
1240############################################################################# 1288#############################################################################
1241 1289
1242package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1265 1313
1266 $child->set_parent ($self); 1314 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1268 1316
1269 $self->realloc; 1317 $self->realloc;
1318}
1319
1320sub remove {
1321 my ($self, $child) = @_;
1322
1323 # TODO: not yet implemented
1270} 1324}
1271 1325
1272# 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?
1273sub clear { 1327sub clear {
1274 my ($self) = @_; 1328 my ($self) = @_;
… …
1315 (sum @$ws), 1369 (sum @$ws),
1316 (sum @$hs), 1370 (sum @$hs),
1317 ) 1371 )
1318} 1372}
1319 1373
1320sub size_allocate { 1374sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1322 1376
1323 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1324 1378
1325 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1357 } 1411 }
1358 1412
1359 $y += $row_h; 1413 $y += $row_h;
1360 } 1414 }
1361 1415
1416 1
1362} 1417}
1363 1418
1364sub find_widget { 1419sub find_widget {
1365 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1366 1421
… …
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 ) 1460 )
1406} 1461}
1407 1462
1408sub size_allocate { 1463sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1464 my ($self, $w, $h) = @_;
1410 1465
1411 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1413 1468
1414 my @req; 1469 my @req;
1415 1470
1416 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1418 } else { 1473 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1421 1476
1422 if ($req > $space) { 1477 if ($req > $space) {
1423 # ah well, not enough space 1478 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1425 } else { 1480 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1482
1428 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1429 1484
1430 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1486 for 0 .. $#children;
1432 } 1487 }
1433 } 1488 }
1434 1489
1435 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1436 1491
1437 my $pos = 0; 1492 my $pos = 0;
1438 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1440 $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));
1441 1496
1442 $pos += $alloc; 1497 $pos += $alloc;
1443 } 1498 }
1444 1499
1445 1 1500 1
… …
1535 1590
1536 delete $self->{texture}; 1591 delete $self->{texture};
1537 $self->SUPER::update; 1592 $self->SUPER::update;
1538} 1593}
1539 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1540sub set_text { 1602sub set_text {
1541 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1542 1604
1543 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1545 1607
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1548 1609
1610 delete $self->{size_req};
1549 $self->realloc; 1611 $self->realloc;
1550 $self->update; 1612 $self->update;
1551} 1613}
1552 1614
1553sub set_markup { 1615sub set_markup {
… …
1556 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1558 1620
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1622
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1563 1624
1625 delete $self->{size_req};
1564 $self->realloc; 1626 $self->realloc;
1565 $self->update; 1627 $self->update;
1566} 1628}
1567 1629
1568sub size_request { 1630sub size_request {
1569 my ($self) = @_; 1631 my ($self) = @_;
1570 1632
1633 $self->{size_req} ||= do {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1639
1577 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1578 1641
1579 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1580 $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);
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1646
1583 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1584 1648
1585 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1587 } 1654 };
1588 1655
1589 ($w, $h) 1656 @{ $self->{size_req} }
1590} 1657}
1591 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1592sub size_allocate { 1663sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1594 1665
1595 delete $self->{ox}; 1666 delete $self->{ox};
1596 1667
1597 delete $self->{texture} 1668 delete $self->{texture}
1598 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
1599} 1672}
1600 1673
1601sub set_fontsize { 1674sub set_fontsize {
1602 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1603 1676
1604 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1605 delete $self->{texture}; 1679 delete $self->{texture};
1606 1680
1607 $self->realloc; 1681 $self->realloc;
1608} 1682}
1609 1683
1684sub reconfigure {
1685 my ($self) = @_;
1686
1687 delete $self->{size_req};
1688 delete $self->{texture};
1689
1690 $self->SUPER::reconfigure;
1691}
1692
1610sub _draw { 1693sub _draw {
1611 my ($self) = @_; 1694 my ($self) = @_;
1612 1695
1613 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1614 1697
1615 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1617 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1618 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1705
1623 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1624 }; 1707 };
1625 1708
1626 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1630 1713
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1634 }; 1717 };
1635 1718
1636 glEnable GL_TEXTURE_2D; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1638 1721
1639 if ($tex->{format} == GL_ALPHA) { 1722 $self->{layout}->render ($self->{ox}, $self->{oy});
1640 glColor @{$self->{fg}};
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645
1646 glDisable GL_TEXTURE_2D;
1647} 1723}
1648 1724
1649############################################################################# 1725#############################################################################
1650 1726
1651package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1665 can_hover => 1, 1741 can_hover => 1,
1666 can_focus => 1, 1742 can_focus => 1,
1667 valign => 0, 1743 valign => 0,
1668 can_events => 1, 1744 can_events => 1,
1669 #text => ... 1745 #text => ...
1746 #hidden => "*",
1670 @_ 1747 @_
1671 ) 1748 )
1672} 1749}
1673 1750
1674sub _set_text { 1751sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1759 $self->{text} = $text;
1683 1760
1684 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1686 1764
1687 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1688 $self->update; 1768 $self->update;
1689} 1769}
1690 1770
1691sub set_text { 1771sub set_text {
1692 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1693 1773
1694 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1775 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1776}
1699 1777
1700sub get_text { 1778sub get_text {
1701 $_[0]{text} 1779 $_[0]{text}
1702} 1780}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1708 1786
1709 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1710} 1788}
1711 1789
1712sub key_down { 1790sub invoke_key_down {
1713 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1714 1792
1715 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1729 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1730 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 1812 $self->emit ('escape');
1735 } elsif ($uni) { 1813 } elsif ($uni) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 1815 } else {
1738 return 0; 1816 return 0;
1739 } 1817 }
… …
1743 $self->realloc; 1821 $self->realloc;
1744 1822
1745 1 1823 1
1746} 1824}
1747 1825
1748sub focus_in { 1826sub invoke_focus_in {
1749 my ($self) = @_; 1827 my ($self) = @_;
1750 1828
1751 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1752 1830
1753 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1754} 1832}
1755 1833
1756sub button_down { 1834sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1758 1836
1759 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 1838
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 1840
1763 # byte-index to char-index 1841 # byte-index to char-index
1764 my $text = $self->{text}; 1842 my $text = $self->{text};
1765 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1767 1845
1768 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1769 $self->update; 1847 $self->update;
1770 1848
1771 1 1849 1
1772} 1850}
1773 1851
1774sub mouse_motion { 1852sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1776# 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#
1777 1855
1778 0 1856 1
1779} 1857}
1780 1858
1781sub _draw { 1859sub _draw {
1782 my ($self) = @_; 1860 my ($self) = @_;
1783 1861
1784 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1785 1863
1786 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1789 } else { 1867 } else {
1790 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1791 } 1869 }
1792 1870
1793 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1796 glVertex 0 , 0; 1874 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1824 1902
1825our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1826 1904
1827use CFClient::OpenGL; 1905use CFClient::OpenGL;
1828 1906
1829sub key_down { 1907sub invoke_key_down {
1830 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1831 1909
1832 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1833 1911
1834 if ($sym == 13) { 1912 if ($sym == 13) {
1835 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1837 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1840 $self->update; 1919 $self->update;
1841 1920
1842 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1860 } else { 1939 } else {
1861 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1862 } 1941 }
1863 1942
1864 } else { 1943 } else {
1865 return $self->SUPER::key_down ($ev) 1944 return $self->SUPER::invoke_key_down ($ev)
1866 } 1945 }
1867 1946
1868 1 1947 1
1869} 1948}
1870 1949
… …
1894 can_events => 1, 1973 can_events => 1,
1895 @_ 1974 @_
1896 ) 1975 )
1897} 1976}
1898 1977
1899sub activate { }
1900
1901sub button_up { 1978sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1903 1980
1904 $self->emit ("activate") 1981 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
… …
1909} 1986}
1910 1987
1911sub _draw { 1988sub _draw {
1912 my ($self) = @_; 1989 my ($self) = @_;
1913 1990
1914 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 1992
1920 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1923 1996
1924 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1925 1998
1926 glDisable GL_TEXTURE_2D; 1999 glDisable GL_TEXTURE_2D;
1927 2000
1928 $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
1929} 2038}
1930 2039
1931############################################################################# 2040#############################################################################
1932 2041
1933package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
… …
1960 my ($self) = @_; 2069 my ($self) = @_;
1961 2070
1962 (6) x 2 2071 (6) x 2
1963} 2072}
1964 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1965sub button_down { 2082sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1967 2084
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2087 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2088 } else {
1973 return 0 2089 return 0
1974 } 2090 }
1975 2091
1976 1 2092 1
… …
2001package CFClient::UI::Image; 2117package CFClient::UI::Image;
2002 2118
2003our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
2004 2120
2005use CFClient::OpenGL; 2121use CFClient::OpenGL;
2006use Carp qw/confess/;
2007 2122
2008our %loaded_images; 2123our %texture_cache;
2009 2124
2010sub new { 2125sub new {
2011 my $class = shift; 2126 my $class = shift;
2012 2127
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2014 2132
2015 $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";
2016 2135
2017 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 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;
2019 2138
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2021 2140
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2142
2026 $self 2143 $self
2027} 2144}
2028 2145
2029sub size_request { 2146sub size_request {
2030 my ($self) = @_; 2147 my ($self) = @_;
2031 2148
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
2033} 2150}
2034 2151
2035sub _draw { 2152sub _draw {
2036 my ($self) = @_; 2153 my ($self) = @_;
2037 2154
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2265
2149 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2150 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);
2151 2271
2152 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2153 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;
2154 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2277
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
2173 2294
2174 if ($t3) { 2295 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2302 glEnd;
2182 } 2303 }
2183 2304
2184 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2272 $self->update; 2393 $self->update;
2273 2394
2274 $self 2395 $self
2275} 2396}
2276 2397
2277sub changed { }
2278
2279sub set_range { 2398sub set_range {
2280 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2281 2400
2282 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2283 2402
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 2403 if ("@$range" ne "@{$self->{range}}") {
2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2286} 2407}
2287 2408
2288sub set_value { 2409sub set_value {
2289 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2290 2411
… …
2301 if $unit; 2422 if $unit;
2302 2423
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 2425
2305 if ($value != $old_value) { 2426 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2307 $self->update; 2428 $self->update;
2308 } 2429 }
2309} 2430}
2310 2431
2311sub size_request { 2432sub size_request {
2312 my ($self) = @_; 2433 my ($self) = @_;
2313 2434
2314 ($self->{req_w}, $self->{req_h}) 2435 ($self->{req_w}, $self->{req_h})
2315} 2436}
2316 2437
2317sub button_down { 2438sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2319 2440
2320 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 2442
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 2444
2324 $self->mouse_motion ($ev, $x, $y) 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2325} 2446}
2326 2447
2327sub mouse_motion { 2448sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2329 2450
2330 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 2453
… …
2437sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2439 2560
2440############################################################################# 2561#############################################################################
2441 2562
2442package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2443 2564
2444our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2445 2566
2446use CFClient::OpenGL; 2567use CFClient::OpenGL;
2447 2568
… …
2449 my $class = shift; 2570 my $class = shift;
2450 2571
2451 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2452 fontsize => 1, 2573 fontsize => 1,
2453 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2454 #font => default_font 2576 #font => default_font
2455 @_, 2577 @_,
2456 2578
2457 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2458 par => [], 2580 par => [],
2459 height => 0, 2581 height => 0,
2460 children => [ 2582 children => [
2461 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2473 2595
2474 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2475 $self->reflow; 2597 $self->reflow;
2476} 2598}
2477 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
2478sub size_allocate { 2609sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2480 2611
2481 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 2614
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $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});
2486 2619
2487 $self->reflow; 2620 $self->reflow;
2488}
2489 2621
2490sub text_size { 2622 local $self->{children} = [$empty, $slider];
2491 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2492 2628
2493 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2494 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $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});
2497 $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}}
2498 2642 );
2643
2499 $layout->size 2644 $layout
2500} 2645}
2501 2646
2502sub reflow { 2647sub reflow {
2503 my ($self) = @_; 2648 my ($self) = @_;
2504 2649
… …
2513 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2514} 2659}
2515 2660
2516sub clear { 2661sub clear {
2517 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2518 2666
2519 $self->{par} = []; 2667 $self->{par} = [];
2520 $self->{height} = 0; 2668 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 2670}
2523 2671
2524sub add_paragraph { 2672sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2526 2674
2527 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2528 my ($w, $h) = $self->text_size ($line); 2676
2529 $self->{height} += $h; 2677 $para = {
2530 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,
2531 } 2684 };
2532 2685
2533 $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;
2534} 2698}
2535 2699
2536sub update { 2700sub update {
2537 my ($self) = @_; 2701 my ($self) = @_;
2538 2702
… …
2540 2704
2541 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2542 2706
2543 delete $self->{texture}; 2707 delete $self->{texture};
2544 2708
2545 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 2711
2548 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2549 my $height = 0; 2713 my $height = 0;
2550 2714
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2557 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3]; 2719
2561 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2562 } 2723 }
2563 2724
2564 $height += $_->[1]; 2725 $height += $para->{h};
2565 } 2726 }
2566 2727
2567 $self->{height} = $height; 2728 $self->{height} = $height;
2568 2729
2569 $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]);
2570 2731
2571 delete $self->{texture}; 2732 delete $self->{texture};
2572 } 2733 }
2573 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2577 2742
2578 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2579 2744
2580 my $y0 = $top; 2745 my $y0 = $top;
2581 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2582 2747
2583 my $y = 0; 2748 my $y = 0;
2584 2749
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2593 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 2751 my $h = $para->{h};
2595 2752
2596 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] });
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 2754
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2602 2756
2603 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2604 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 }
2605 } 2771 }
2606 2772
2607 $y += $h; 2773 $y += $h;
2608 } 2774 }
2609
2610 glDisable GL_BLEND;
2611 }; 2775 };
2612 }); 2776 });
2613} 2777}
2614 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2615sub _draw { 2788sub _draw {
2616 my ($self) = @_; 2789 my ($self) = @_;
2617 2790
2618 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2621 $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});
2622 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2623 2796
2624 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2625
2626} 2798}
2627 2799
2628############################################################################# 2800#############################################################################
2629 2801
2630package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 2889 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 2891 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 2892 . "visible $widget->{visible}";
2721 } 2893 }
2894
2895 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//;
2722 2897
2723 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2724 markup => $tooltip, 2899 markup => $tooltip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 2901 fontsize => 0.8,
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 2912
2738 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2739} 2914}
2740 2915
2741sub size_allocate { 2916sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2743 2918
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 2920}
2746 2921
2747sub visibility_change { 2922sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 2923 my ($self, $visible) = @_;
2749 2924
2750 return unless $visible; 2925 return unless $visible;
2751 2926
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 2927 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2754 or return; 2929 or return;
2755 2930
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 2932
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 2934 if $x + $self->{w} > $self->{root}{w};
2760 2935
2761 $self->move_abs ($x, $y); 2936 $self->move_abs ($x, $y);
2762 }); 2937 });
2763} 2938}
2764 2939
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 3029
2855 if ($tex) { 3030 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2861 } 3036 }
2862} 3037}
2863 3038
2864sub DESTROY { 3039sub destroy {
2865 my ($self) = @_; 3040 my ($self) = @_;
2866 3041
2867 $self->{timer}->cancel 3042 $self->{timer}->cancel
2868 if $self->{timer}; 3043 if $self->{timer};
2869 3044
2870 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2871} 3046}
2872 3047
2873############################################################################# 3048#############################################################################
2874 3049
2875package CFClient::UI::Buttonbar; 3050package CFClient::UI::Buttonbar;
… …
2896 ); 3071 );
2897 3072
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2899 3074
2900 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2902 3077
2903 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2904 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 {
2905 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2906 can_hover => 1, 3095 can_hover => 1,
2907 can_events => 1, 3096 can_events => 1,
2908 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2909 } 3100 }
2910 3101
2911 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2912 3103
2913 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2918 3109
2919# 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)
2920sub popup { 3111sub popup {
2921 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2922 3113
2923 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2924 3115
2925 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3117 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2928 3119
2929 $self->show; 3120 $self->show;
2930 $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);
2931} 3122}
2932 3123
2933sub mouse_motion { 3124sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2935 3126
2936 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2939 3130
2940 0 3131 0
2941} 3132}
2942 3133
2943sub button_up { 3134sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2945 3136
2946 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3138 undef $GRAB;
2948 $self->hide; 3139 $self->hide;
2949 3140
2950 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3143 } else {
2953 return 0 3144 return 0
2954 } 3145 }
2955 3146
… …
2982 3173
2983 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3175 if @{ $self->{children} };
2985} 3176}
2986 3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
2987sub set_current_page { 3184sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
2989 3186
2990 my $widget = ref $page_or_widget 3187 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3188 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3189 : $self->{children}[$page_or_widget];
2993 3190
2994 $self->{current} = $widget; 3191 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3193
2997 $self->_emit (page_changed => $self->{current}); 3194 $self->emit (page_changed => $self->{current});
2998 3195
2999 $self->realloc; 3196 $self->realloc;
3000} 3197}
3001 3198
3002sub visible_children { 3199sub visible_children {
… …
3007 my ($self) = @_; 3204 my ($self) = @_;
3008 3205
3009 $self->{current}->size_request 3206 $self->{current}->size_request
3010} 3207}
3011 3208
3012sub size_allocate { 3209sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3210 my ($self, $w, $h) = @_;
3014 3211
3015 $self->{current}->configure (0, 0, $w, $h); 3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3016} 3215}
3017 3216
3018sub _draw { 3217sub _draw {
3019 my ($self) = @_; 3218 my ($self) = @_;
3020 3219
… …
3055 ); 3254 );
3056 3255
3057 $self->{multiplexer}->add ($widget); 3256 $self->{multiplexer}->add ($widget);
3058} 3257}
3059 3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3060sub set_current_page { 3265sub set_current_page {
3061 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3062 3267
3063 $self->{multiplexer}->set_current_page ($page); 3268 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 3269 $self->emit (page_changed => $self->{multiplexer}{current});
3065} 3270}
3066 3271
3067############################################################################# 3272#############################################################################
3068 3273
3069package CFClient::UI::Statusbox; 3274package CFClient::UI::Combobox;
3070 3275
3276use utf8;
3277
3071our @ISA = CFClient::UI::VBox::; 3278our @ISA = CFClient::UI::Button::;
3072 3279
3073sub new { 3280sub new {
3074 my $class = shift; 3281 my $class = shift;
3075 3282
3076 $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 (
3077 fontsize => 0.8, 3338 fontsize => 0.8,
3078 @_, 3339 @_,
3079 ) 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
3080} 3347}
3081 3348
3082sub reorder { 3349sub reorder {
3083 my ($self) = @_; 3350 my ($self) = @_;
3084 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} };
3085 3357
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3360 }
3089 3361
… …
3092 my @items = sort { 3364 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
3096 3368
3369 $self->{timer}->interval (1);
3370
3097 my $count = 10 + 1; 3371 my $count = 10 + 1;
3098 for my $item (@items) { 3372 for my $item (@items) {
3099 last unless --$count; 3373 last unless --$count;
3100 3374
3101 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3379 : $item->{text};
3106 3380
… …
3114 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3394 can_events => 1,
3121 can_hover => 1 3395 can_hover => 1
3122 }; 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;
3123 } 3409 }
3124 3410
3125 $self->clear; 3411 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
3127} 3413}
… …
3132 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
3134 3420
3135 return unless $text; 3421 return unless $text;
3136 3422
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3424
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3426
3141 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
3143 $item->{count}++; 3429 $item->{count}++;
3144 } else { 3430 } else {
3145 $item->{count} = 1; 3431 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
3147 } 3433 }
3148 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
3150 delete $item->{label}; 3436 delete $item->{label};
3151 } else { 3437 } else {
3152 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
3153 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
3159 count => 1, 3445 count => 1,
3160 %arg, 3446 %arg,
3161 }; 3447 };
3162 } 3448 }
3163 3449
3450 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 3451 $self->reorder;
3452 });
3165} 3453}
3166 3454
3167sub reconfigure { 3455sub reconfigure {
3168 my ($self) = @_; 3456 my ($self) = @_;
3169 3457
… …
3172 3460
3173 $self->reorder; 3461 $self->reorder;
3174 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
3175} 3463}
3176 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
3177############################################################################# 3473#############################################################################
3178 3474
3179package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3180 3476
3181our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3182 3478
3183sub new { 3479sub new {
3184 my $class = shift; 3480 my $class = shift;
3185 3481
3186 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3188 @_, 3484 @_,
3189 ); 3485 );
3190 3486
3191 $self 3487 $self
3192} 3488}
3193 3489
3194sub set_items { 3490sub set_items {
3195 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3196 3492
3197 $self->{child}->clear; 3493 $self->clear;
3198 return unless $items; 3494 return unless $items;
3199 3495
3200 my @items = sort { 3496 my @items = sort {
3201 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3203 } @$items; 3499 } values %$items;
3204 3500
3205 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3206 3502
3207 my $row = 0; 3503 my $row = 0;
3208 for my $item (@items) { 3504 for my $item (@items) {
3209 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3210 3506
3211 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3214 3510
3215 $row++; 3511 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 } 3512 }
3414} 3513}
3415 3514
3416############################################################################# 3515#############################################################################
3417 3516
… …
3427 commands => [], 3526 commands => [],
3428 @_, 3527 @_,
3429 ) 3528 )
3430} 3529}
3431 3530
3432# 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
3433sub add_spell { 3616sub add_spell {
3434 my ($self, $spell) = @_; 3617 my ($self, $spell) = @_;
3618
3435 $self->{spells}->{$spell->{name}} = $spell; 3619 $self->{spell}->{$spell->{name}} = $spell;
3436 3620 $self->rebuild_spell_list;
3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464} 3621}
3465 3622
3466sub remove_spell { 3623sub remove_spell {
3467 my ($self, $spell) = @_; 3624 my ($self, $spell) = @_;
3625
3468 delete $self->{spells}->{$spell->{name}}; 3626 delete $self->{spell}->{$spell->{name}};
3469 $self->rebuild_spell_list; 3627 $self->rebuild_spell_list;
3470} 3628}
3471 3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3472############################################################################# 3637#############################################################################
3473 3638
3474package CFClient::UI::Root; 3639package CFClient::UI::Root;
3475 3640
3476our @ISA = CFClient::UI::Container::; 3641our @ISA = CFClient::UI::Container::;
3642
3643use List::Util qw(min max);
3477 3644
3478use CFClient::OpenGL; 3645use CFClient::OpenGL;
3479 3646
3480sub new { 3647sub new {
3481 my $class = shift; 3648 my $class = shift;
… …
3508 $coord = $max - $size if $coord > $max - $size; 3675 $coord = $max - $size if $coord > $max - $size;
3509 3676
3510 int $coord + 0.5 3677 int $coord + 0.5
3511} 3678}
3512 3679
3513sub size_allocate { 3680sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3515 3682
3516 for my $child ($self->children) { 3683 for my $child ($self->children) {
3517 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)};
3518 3685
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 3689 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3524 3691
3525 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3526 } 3693 }
3694
3695 1
3527} 3696}
3528 3697
3529sub coord2local { 3698sub coord2local {
3530 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3531 3700
… …
3616 3785
3617 delete $queue{$widget+0}; 3786 delete $queue{$widget+0};
3618 3787
3619 my ($w, $h) = $widget->size_request; 3788 my ($w, $h) = $widget->size_request;
3620 3789
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3790 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $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};
3623 3795
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 3796 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 3797 $h = $widget->{force_h} if exists $widget->{force_h};
3626 3798
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3799 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3653 3825
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 3827
3656 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3657 $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};
3658 3836
3659 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3661 3839
3662 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